- 0.9.3 pre 3 -

Switched back to linking but with disabled System.Core (problems with Certificate validation)
Added catch when Unregistering receivers (could throw after recreate?)

src/Kp2aUnitTests/Kp2aUnitTests.csproj

@@ -43,8 +43,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-    <AndroidLinkSkip />
+    <AndroidLinkSkip>System.Core%3b</AndroidLinkSkip>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
     <BundleAssemblies>False</BundleAssemblies>
   </PropertyGroup>

src/keepass2android/LockCloseActivity.cs

@@ -15,6 +15,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
   */
 
+using System;
 using Android.Content;
 using Android.OS;
 using KeePassLib.Serialization;
@@ -60,7 +61,15 @@ namespace keepass2android
 		{
 			if (Intent.GetBooleanExtra(NoLockCheck, false) == false)
 			{
-				UnregisterReceiver(_intentReceiver);
+				try
+				{
+					UnregisterReceiver(_intentReceiver);
+				}
+				catch (Exception ex)
+				{
+					Kp2aLog.Log(ex.ToString());
+				}
+				
 			}
 			
 

src/keepass2android/LockCloseListActivity.cs

@@ -73,7 +73,14 @@ namespace keepass2android
 
 		protected override void OnDestroy()
 		{
-			UnregisterReceiver(_intentReceiver);
+			try
+			{
+				UnregisterReceiver(_intentReceiver);
+			}
+			catch (Exception ex)
+			{
+				Kp2aLog.Log(ex.ToString());
+			}
 
 			base.OnDestroy();
 		}

src/keepass2android/LockingClosePreferenceActivity.cs

@@ -15,6 +15,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
   */
 
+using System;
 using Android.Content;
 using Android.OS;
 using KeePassLib.Serialization;
@@ -49,7 +50,14 @@ namespace keepass2android
 
 		protected override void OnDestroy()
 		{
-			UnregisterReceiver(_intentReceiver);
+			try
+			{
+				UnregisterReceiver(_intentReceiver);
+			}
+			catch (Exception ex)
+			{
+				Kp2aLog.Log(ex.ToString());
+			}
 
 			base.OnDestroy();
 		}

src/keepass2android/Properties/AndroidManifest_net.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="35" android:versionName="0.9.3-pre2" package="keepass2android.keepass2android" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="36" android:versionName="0.9.3-pre3" package="keepass2android.keepass2android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />
+	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17" />
 	<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" />
 	<application android:label="keepass2android" android:icon="@drawable/ic_launcher">
 		<activity android:name="com.dropbox.client2.android.AuthActivity" android:launchMode="singleTask" android:configChanges="orientation|keyboard">
@@ -18,6 +18,7 @@
             </intent-filter>
 
 		</activity>
+
 		<provider android:name="group.pals.android.lib.ui.filechooser.providers.localfile.LocalFileProvider" android:authorities="keepass2android.keepass2android.android-filechooser.localfile" android:exported="false" />
 		<provider android:name="group.pals.android.lib.ui.filechooser.providers.history.HistoryProvider" android:authorities="keepass2android.keepass2android.android-filechooser.history" android:exported="false" />
 		<activity android:name="group.pals.android.lib.ui.filechooser.FileChooserActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:screenOrientation="user" android:theme="@style/Afc.Theme.Light">
@@ -35,18 +36,14 @@
 			<meta-data android:name="android.view.im" android:resource="@xml/method" />
 		</service>
 		<activity android:name="keepass2android.softkeyboard.LatinIMESettings" android:label="@string/english_ime_settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-            </intent-filter>
 			<intent-filter>
-				<action android:name="keepass2android.softkeyboard.LatinIMESettings"/>
+				<action android:name="android.intent.action.MAIN" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="keepass2android.softkeyboard.LatinIMESettings" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
-        </activity>
+		</activity>
-
-		
-		
-		
 		<activity android:configChanges="keyboardHidden|orientation" android:label="@string/app_name" android:theme="@style/Base" android:name="keepass2android.PasswordActivity">
 			<intent-filter android:label="@string/app_name">
 				<action android:name="android.intent.action.VIEW" />

src/keepass2android/QuickUnlock.cs

@@ -147,7 +147,15 @@ namespace keepass2android
 		protected override void OnDestroy()
 		{
 			base.OnDestroy();
-			UnregisterReceiver(_intentReceiver);
+			try
+			{
+				UnregisterReceiver(_intentReceiver);
+			}
+			catch (Exception e)
+			{
+				Kp2aLog.Log(e.ToString());
+			}
+			
 		}
 
 		private void CheckIfUnloaded()

src/keepass2android/keepass2android.csproj

@@ -50,7 +50,7 @@
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidSupportedAbis>armeabi,armeabi-v7a</AndroidSupportedAbis>
     <CustomCommands>
       <CustomCommands>
@@ -59,7 +59,7 @@
     </CustomCommands>
     <DeployExternal>True</DeployExternal>
     <DefineConstants>RELEASE</DefineConstants>
-    <AndroidLinkSkip />
+    <AndroidLinkSkip>System.Core%3b</AndroidLinkSkip>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
     <BundleAssemblies>False</BundleAssemblies>
   </PropertyGroup>
@@ -85,6 +85,9 @@
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
     <Reference Include="Mono.Android.Support.v4" />
+    <Reference Include="GooglePlayServicesFroyoLib">
+      <HintPath>..\Components\googleplayservicesfroyo-9.0\lib\android\GooglePlayServicesFroyoLib.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="addons\OtpKeyProv\EncodingUtil.cs" />