use Android 5 as target framework

set notification visibility for Android 5 lock screen
fix wrong permission in debug manifest
This commit is contained in:
Philipp Crocoll 2014-12-28 06:44:22 +01:00
parent ecd78ffbaf
commit e7a0393ddd
5 changed files with 6942 additions and 5653 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="46" android:versionName="0.9.3-release-3" package="keepass2android.keepass2android_debug" android:installLocation="auto"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="46" android:versionName="0.9.3-release-3" package="keepass2android.keepass2android_debug" android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
<permission android:description="@string/permission_desc" android:icon="@drawable/ic_launcher" android:label="KP2A internal file browsing" android:name="keepass2android.keepass2android.permission.KP2aInternalFileBrowsing" android:protectionLevel="signature" /> <permission android:description="@string/permission_desc" android:icon="@drawable/ic_launcher" android:label="KP2A internal file browsing" android:name="keepass2android.keepass2android_debug.permission.KP2aInternalFileBrowsing" android:protectionLevel="signature" />
<application android:label="keepass2android" android:icon="@drawable/ic_launcher"> <application android:label="keepass2android" android:icon="@drawable/ic_launcher">
<activity android:name="com.dropbox.client2.android.AuthActivity" android:launchMode="singleTask" android:configChanges="orientation|keyboard"> <activity android:name="com.dropbox.client2.android.AuthActivity" android:launchMode="singleTask" android:configChanges="orientation|keyboard">
@ -91,5 +91,5 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="keepass2android.keepass2android.permission.KP2aInternalFileBrowsing" /> <uses-permission android:name="keepass2android.keepass2android_debug.permission.KP2aInternalFileBrowsing" />
</manifest> </manifest>

File diff suppressed because it is too large Load Diff

View File

@ -15,10 +15,11 @@
<AssemblyName>keepass2android</AssemblyName> <AssemblyName>keepass2android</AssemblyName>
<newfilesearch>OnLoad</newfilesearch> <newfilesearch>OnLoad</newfilesearch>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v4.4</TargetFrameworkVersion> <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<MandroidI18n /> <MandroidI18n />
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize> <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis> <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
<AndroidUseLatestPlatformSdk />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
@ -81,21 +82,25 @@
</JavaOptions> </JavaOptions>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="GooglePlayServicesLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Xamarin.GooglePlayServices.22.0.0.0\lib\MonoAndroid41\GooglePlayServicesLib.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />
<Reference Include="GooglePlayServicesLib"> <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\Components\googleplayservices-19.0.0\lib\android\GooglePlayServicesLib.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Android.Support.v4"> <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\Components\googleplayservices-19.0.0\lib\android\Xamarin.Android.Support.v4.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat"> <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\Components\googleplayservices-19.0.0\lib\android\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> <SpecificVersion>False</SpecificVersion>
</Reference> <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
<HintPath>..\Components\googleplayservices-19.0.0\lib\android\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -216,6 +221,7 @@
<AndroidAsset Include="Assets\fontawesome-webfont.ttf" /> <AndroidAsset Include="Assets\fontawesome-webfont.ttf" />
<AndroidAsset Include="Assets\DejaVuSansMono.ttf" /> <AndroidAsset Include="Assets\DejaVuSansMono.ttf" />
<AndroidAsset Include="Assets\LICENSE_dejavu" /> <AndroidAsset Include="Assets\LICENSE_dejavu" />
<None Include="packages.config" />
<None Include="Resources\AboutResources.txt" /> <None Include="Resources\AboutResources.txt" />
<None Include="filelist.txt"> <None Include="filelist.txt">
<Visible>False</Visible> <Visible>False</Visible>
@ -1074,8 +1080,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<XamarinComponentReference Include="googleplayservices"> <XamarinComponentReference Include="googleplayservices">
<Version>19.0.0</Version>
<Visible>False</Visible> <Visible>False</Visible>
<Version>22.0.0.0</Version>
</XamarinComponentReference> </XamarinComponentReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -202,7 +202,7 @@ namespace keepass2android
.SetContentTitle(entryName) .SetContentTitle(entryName)
.SetWhen(Java.Lang.JavaSystem.CurrentTimeMillis()) .SetWhen(Java.Lang.JavaSystem.CurrentTimeMillis())
.SetTicker(entryName + ": " + desc) .SetTicker(entryName + ": " + desc)
//Android 5 .SetVisibility((int)Android.App.NotificationVisibility.Secret) .SetVisibility((int)Android.App.NotificationVisibility.Secret)
.SetContentIntent(pending); .SetContentIntent(pending);
return builder; return builder;
} }

View File

@ -142,7 +142,7 @@ namespace keepass2android
new NotificationCompat.Builder(this) new NotificationCompat.Builder(this)
.SetSmallIcon(grayIconResouceId) .SetSmallIcon(grayIconResouceId)
.SetLargeIcon(BitmapFactory.DecodeResource(Resources, AppNames.LauncherIcon)) .SetLargeIcon(BitmapFactory.DecodeResource(Resources, AppNames.LauncherIcon))
//Android 5 .SetVisibility((int)Android.App.NotificationVisibility.Secret) .SetVisibility((int)Android.App.NotificationVisibility.Secret)
.SetContentTitle(GetString(Resource.String.app_name)) .SetContentTitle(GetString(Resource.String.app_name))
.SetContentText(GetString(Resource.String.database_loaded_quickunlock_enabled, GetDatabaseName())); .SetContentText(GetString(Resource.String.database_loaded_quickunlock_enabled, GetDatabaseName()));
@ -180,6 +180,7 @@ namespace keepass2android
.SetOngoing(true) .SetOngoing(true)
.SetSmallIcon(Resource.Drawable.ic_notify) .SetSmallIcon(Resource.Drawable.ic_notify)
.SetLargeIcon(BitmapFactory.DecodeResource(Resources, Resource.Drawable.ic_launcher_red)) .SetLargeIcon(BitmapFactory.DecodeResource(Resources, Resource.Drawable.ic_launcher_red))
.SetVisibility((int)Android.App.NotificationVisibility.Public)
.SetContentTitle(GetString(Resource.String.app_name)) .SetContentTitle(GetString(Resource.String.app_name))
.SetContentText(GetString(Resource.String.database_loaded_unlocked, GetDatabaseName())); .SetContentText(GetString(Resource.String.database_loaded_unlocked, GetDatabaseName()));