switch to DropboxSDK 3.0.3 to ensure future compatability

enable proguard on the main app in order not to hit the DEX limit 64k

src/JavaFileStorageBindings/JavaFileStorageBindings.csproj

@@ -20,7 +20,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>0</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -95,9 +95,6 @@
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\okhttp-digest-1.7.jar" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\dropbox-core-sdk-2.1.1.jar" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gson-2.3.1.jar" />
   </ItemGroup>
@@ -161,4 +158,7 @@
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\okio-1.9.0.jar" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedJar Include="Jars\dropbox-core-sdk-3.0.3.jar" />
+  </ItemGroup>
 </Project>

src/JavaFileStorageBindings/Transforms/Metadata.xml

@@ -11,6 +11,12 @@
 	<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.dropbox.core']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.util']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.http']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.sharing']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.team']" />
+
 <remove-node path="/api/package[@name='keepass2android.javafilestorage.webdav']" />
 <remove-node path="/api/package[@name='keepass2android.javafilestorage.onedrive']" />
 </metadata>

src/java/JavaFileStorage/app/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     compile 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc'
     //compile 'com.dropbox.core:dropbox-core-sdk:2.0.1'
     //compile group: 'com.dropbox.core', name: 'dropbox-core-sdk', version: '0-SNAPSHOT', changing: true
-    compile 'com.dropbox.core:dropbox-core-sdk:2.1.1'
+    compile 'com.dropbox.core:dropbox-core-sdk:3.0.3'
     //onedrive:
     compile('com.onedrive.sdk:onedrive-sdk-android:1.2+') {
         transitive = false

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/DropboxV2Storage.java

@@ -51,7 +51,7 @@ public class DropboxV2Storage extends JavaFileStorageBase
 
     }
     DbxRequestConfig requestConfig = DbxRequestConfig.newBuilder("kp2a")
-            .withHttpRequestor(OkHttp3Requestor.INSTANCE)
+            .withHttpRequestor(new OkHttp3Requestor(OkHttp3Requestor.defaultOkHttpClient()))
             .build();
 
     final static private String TAG = "KP2AJ";

src/java/JavaFileStorageTest-AS/app/build.gradle

@@ -29,6 +29,8 @@ android {
     }
 }
 
+apply plugin: 'com.getkeepsafe.dexcount'
+
 dependencies {
     compile project(':android-filechooser')
     compile project(':JavaFileStorage')

src/java/JavaFileStorageTest-AS/build.gradle

@@ -9,7 +9,9 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1'
     }
+
 }
 
 allprojects {

src/keepass2android/keepass2android.csproj

@@ -35,15 +35,16 @@
         <Command type="BeforeBuild" command="UseManifestDebug.bat" />
       </CustomCommands>
     </CustomCommands>
-    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <Debugger>Xamarin</Debugger>
     <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
     <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <BundleAssemblies>False</BundleAssemblies>
     <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
     <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
+    <EnableProguard>true</EnableProguard>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -70,7 +71,7 @@
     <AotAssemblies>False</AotAssemblies>
     <EnableLLVM>False</EnableLLVM>
     <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
-    <EnableProguard>False</EnableProguard>
+    <EnableProguard>true</EnableProguard>
     <DevInstrumentationEnabled>False</DevInstrumentationEnabled>
     <DebugSymbols>False</DebugSymbols>
   </PropertyGroup>
@@ -253,6 +254,7 @@
     </AndroidResource>
     <AndroidAsset Include="Assets\fontawesome-webfont.ttf" />
     <AndroidAsset Include="Assets\SourceCodePro-Regular.ttf" />
+    <ProguardConfiguration Include="proguard.cfg" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="filelist.txt">
       <Visible>False</Visible>

src/keepass2android/proguard.cfg

@@ -0,0 +1,15 @@
+-dontobfuscate
+-dontwarn
+-ignorewarnings
+
+-keep public class keepass2android.kp2afilechooser.* {*; }
+
+-keep public class group.pals.android.lib.ui.filechooser.** {*; }
+-keep public class group.pals.android.lib.ui.filechooser.providers.** {*; }
+
+
+-keepclassmembers class * extends android.view.View {
+   *** set*(***);
+}
+
+-keep class com.squareup.okhttp.**