Merge branch 'master' of https://git01.codeplex.com/keepass2android

src/JavaFileStorageBindings/JavaFileStorageBindings.csproj

@@ -76,11 +76,6 @@
       <Link>Jars\javafilestorage.jar</Link>
     </EmbeddedJar>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="..\java\JavaFileStorage\libs\dropbox-android-sdk-1.5.4.jar">
-      <Link>Jars\dropbox-android-sdk-1.5.4.jar</Link>
-    </EmbeddedReferenceJar>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="..\java\JavaFileStorage\libs\json_simple-1.1.jar">
       <Link>Jars\json_simple-1.1.jar</Link>
@@ -170,4 +165,24 @@
       <Visible>False</Visible>
     </XamarinComponentReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="..\java\JavaFileStorage\libs\commons-logging-1.1.1.jar">
+      <Link>Jars\commons-logging-1.1.1.jar</Link>
+    </EmbeddedReferenceJar>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="..\java\JavaFileStorage\libs\dropbox-android-sdk-1.6.2.jar">
+      <Link>Jars\dropbox-android-sdk-1.6.2.jar</Link>
+    </EmbeddedReferenceJar>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="..\java\JavaFileStorage\libs\httpclient-4.0.3.jar">
+      <Link>Jars\httpclient-4.0.3.jar</Link>
+    </EmbeddedReferenceJar>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="..\java\JavaFileStorage\libs\httpcore-4.0.1.jar">
+      <Link>Jars\httpcore-4.0.1.jar</Link>
+    </EmbeddedReferenceJar>
+  </ItemGroup>
 </Project>

src/JavaFileStorageBindings/Transforms/Metadata.xml

@@ -11,4 +11,10 @@
 	<remove-node path="/api/package[@name='com.jcraft.jsch.jcraft']" />
 	<remove-node path="/api/package[@name='com.jcraft.jzlib']" />
 	<remove-node path="/api/package[@name='com.microsoft.live']" />
+	<remove-node path="/api/package[@name='com.dropbox.client']" />
+	<remove-node path="/api/package[@name='com.dropbox.client2']" />
+	<remove-node path="/api/package[@name='com.dropbox.client2.session']" />
+	<remove-node path="/api/package[@name='com.dropbox.client2.android']" />
+	<remove-node path="/api/package[@name='com.dropbox.client2.jsonextract']" />
+	<remove-node path="/api/package[@name='com.dropbox.client2.exception']" />
 </metadata>

src/java/JavaFileStorageTest/src/com/example/javafilestoragetest/MainActivity.java

@@ -517,9 +517,9 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
 
 	static JavaFileStorage createStorageToTest(Context ctx, Context appContext) {
 		//storageToTest = new SftpStorage();
-		storageToTest = new SkyDriveFileStorage("000000004010C234", appContext);
+		//storageToTest = new SkyDriveFileStorage("000000004010C234", appContext);
 		//storageToTest = new GoogleDriveFileStorage();
-		//storageToTest =  new DropboxFileStorage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", true);
+		storageToTest =  new DropboxFileStorage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", true);
 		//storageToTest = new DropboxAppFolderFileStorage(ctx,"ax0268uydp1ya57", "3s86datjhkihwyc", true);
 		return storageToTest;
 

src/keepass2android/Properties/AndroidManifest_net.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="48" android:versionName="0.9.5" package="keepass2android.keepass2android" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="49" android:versionName="0.9.5b" package="keepass2android.keepass2android" android:installLocation="auto">
 	<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" />
 	<application android:label="keepass2android" android:icon="@drawable/ic_launcher">

src/keepass2android/Resources/values-de/strings.xml

@@ -437,6 +437,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
 		* Option hinzugefügt, um Screenshots und Darstellungen in der Liste der letzten Apps zu verhindern (standardmäßig aktiviert)\n
 		* Problem mit Google Drive behoben \n
 		* Schlüsseldateien können auf beliebigen Speicherorten abgelegt werden\n
+		* Dropbox-SDK aktualisiert, um offiziellen Sicherheitspatch zu integrieren\n
 		* Build-Tools aktualisiert -> APK-Größe leider gewachsen, sorry :-(\n
 		Ich hatte noch weitere Änderungen versprochen. Diese kommen mit dem nächsten Release, dieses muss wegen aktueller Probleme so früh wie möglich veröffentlicht werden.
 	</string>

src/keepass2android/Resources/values/strings.xml

@@ -499,6 +499,7 @@
 		* Added option to prevent taking screenshots/displaying app in recent apps list\n
 		* Fixed issue with Google Drive file storage\n
 		* Allow key files on deliberate storage types\n
+		* Updated Dropbox SDK to include an official security patch\n
 		* Updated build tools --> apk size increased :-(\n
 		I have promised some more changes. They will come with the next release - sorry. I wanted to publish these hot fixes as soon as possible.
 	</string>