diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj index 8b9f64f8..12bf66f1 100644 --- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj +++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj @@ -76,11 +76,6 @@ Jars\javafilestorage.jar - - - Jars\dropbox-android-sdk-1.5.4.jar - - Jars\json_simple-1.1.jar @@ -170,4 +165,24 @@ False + + + Jars\commons-logging-1.1.1.jar + + + + + Jars\dropbox-android-sdk-1.6.2.jar + + + + + Jars\httpclient-4.0.3.jar + + + + + Jars\httpcore-4.0.1.jar + + \ No newline at end of file diff --git a/src/JavaFileStorageBindings/Transforms/Metadata.xml b/src/JavaFileStorageBindings/Transforms/Metadata.xml index be431ec6..0e721477 100644 --- a/src/JavaFileStorageBindings/Transforms/Metadata.xml +++ b/src/JavaFileStorageBindings/Transforms/Metadata.xml @@ -11,4 +11,10 @@ + + + + + + diff --git a/src/java/JavaFileStorage/bin/javafilestorage.jar b/src/java/JavaFileStorage/bin/javafilestorage.jar index dbc7fb54..9143516d 100644 Binary files a/src/java/JavaFileStorage/bin/javafilestorage.jar and b/src/java/JavaFileStorage/bin/javafilestorage.jar differ diff --git a/src/java/JavaFileStorage/libs/commons-logging-1.1.1.jar b/src/java/JavaFileStorage/libs/commons-logging-1.1.1.jar new file mode 100644 index 00000000..8758a96b Binary files /dev/null and b/src/java/JavaFileStorage/libs/commons-logging-1.1.1.jar differ diff --git a/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.5.4.jar b/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.5.4.jar deleted file mode 100644 index 38a3602f..00000000 Binary files a/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.5.4.jar and /dev/null differ diff --git a/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.6.2.jar b/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.6.2.jar new file mode 100644 index 00000000..997663e8 Binary files /dev/null and b/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.6.2.jar differ diff --git a/src/java/JavaFileStorage/libs/httpclient-4.0.3.jar b/src/java/JavaFileStorage/libs/httpclient-4.0.3.jar new file mode 100644 index 00000000..fd0d3774 Binary files /dev/null and b/src/java/JavaFileStorage/libs/httpclient-4.0.3.jar differ diff --git a/src/java/JavaFileStorage/libs/httpcore-4.0.1.jar b/src/java/JavaFileStorage/libs/httpcore-4.0.1.jar new file mode 100644 index 00000000..4638daa5 Binary files /dev/null and b/src/java/JavaFileStorage/libs/httpcore-4.0.1.jar differ diff --git a/src/java/JavaFileStorageTest/src/com/example/javafilestoragetest/MainActivity.java b/src/java/JavaFileStorageTest/src/com/example/javafilestoragetest/MainActivity.java index 5226a8d1..9d868811 100644 --- a/src/java/JavaFileStorageTest/src/com/example/javafilestoragetest/MainActivity.java +++ b/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; diff --git a/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar b/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar index 771adfc5..5be5b59a 100644 Binary files a/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar and b/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar differ diff --git a/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar b/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar index c289228c..d2e80167 100644 Binary files a/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar and b/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar differ diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml index b82e007d..b5d636ac 100644 --- a/src/keepass2android/Properties/AndroidManifest_net.xml +++ b/src/keepass2android/Properties/AndroidManifest_net.xml @@ -1,5 +1,5 @@  - + diff --git a/src/keepass2android/Resources/values-de/strings.xml b/src/keepass2android/Resources/values-de/strings.xml index 138b3c40..b49453af 100644 --- a/src/keepass2android/Resources/values-de/strings.xml +++ b/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. diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml index 97a3085d..8405167e 100644 --- a/src/keepass2android/Resources/values/strings.xml +++ b/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.