qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dropbox sdk and gson jars, upgrade to TargetFramework Android 9

Browse Source
This commit is contained in:
Philipp Crocoll
2019-09-25 19:17:08 +02:00
parent a630543ecc
commit 8d065255d6
14 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/JavaFileStorageBindings/Jars/dropbox-core-sdk-3.0.3.jar
View File

Binary file not shown.

BIN
src/JavaFileStorageBindings/Jars/dropbox-core-sdk-3.1.1.jar Normal file
View File

Binary file not shown.

BIN
src/JavaFileStorageBindings/Jars/gson-2.3.1.jar
View File

Binary file not shown.

BIN
src/JavaFileStorageBindings/Jars/gson-2.8.1.jar Normal file
View File

Binary file not shown.

13
src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
View File

@@ -12,6 +12,7 @@
<FileAlignment>512</FileAlignment>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
<AndroidClassParser>class-parse</AndroidClassParser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -86,9 +87,6 @@
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\okhttp-digest-1.7.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\gson-2.3.1.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\msa-auth-0.8.6\classes-msa-auth.jar" />
</ItemGroup>
@@ -143,13 +141,16 @@
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\jackson-core-2.7.4.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedJar Include="Jars\dropbox-core-sdk-3.0.3.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\okhttp-3.9.0.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\okio-1.13.0.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedJar Include="Jars\dropbox-core-sdk-3.1.1.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\gson-2.8.1.jar" />
</ItemGroup>
</Project>

4
src/java/JavaFileStorage/app/build.gradle
View File

@@ -21,6 +21,10 @@ android {
}
}
/*
NOTE: If you change dependencies here, don't forget to update the jar files in JavaFileStorageBindings as well!
*/
dependencies {
compile 'com.squareup.okhttp3:okhttp:3.9.0'
compile 'com.burgstaller:okhttp-digest:1.7'

2
src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage2.java
View File

@@ -50,7 +50,7 @@ public class OneDriveStorage2 extends JavaFileStorageBase
private static final String[] scopes = {"openid","offline_access", "https://graph.microsoft.com/Files.ReadWrite","https://graph.microsoft.com/User.Read"};
public OneDriveStorage2(final Activity context, final String clientId) {
public OneDriveStorage2(final Context context, final String clientId) {
mPublicClientApp = new PublicClientApplication(context, clientId);

BIN
src/java/JavaFileStorage/libs/dropbox-android-sdk-1.6.2.jar
View File

Binary file not shown.

4
src/keepass2android/Properties/AndroidManifest_debug.xml
View File

@@ -9,6 +9,10 @@
android:networkSecurityConfig="@xml/network_security_config"
>
<uses-library
android:name="org.apache.http.legacy"
android:required="false"/>
<activity android:name="com.dropbox.core.android.AuthActivity" android:launchMode="singleTask" android:configChanges="orientation|keyboard">
<intent-filter>
<data android:scheme="db-2gormiq7iq1jls1" />

5
src/keepass2android/Properties/AndroidManifest_net.xml
View File

@@ -14,6 +14,11 @@
android:networkSecurityConfig="@xml/network_security_config"
>
<uses-library
android:name="org.apache.http.legacy"
android:required="false"/>
<activity android:name="com.dropbox.core.android.AuthActivity" android:launchMode="singleTask" android:configChanges="orientation|keyboard">
<intent-filter>
<data android:scheme="db-i8shu7v1hgh7ynt" />

4
src/keepass2android/Properties/AndroidManifest_nonet.xml
View File

@@ -12,6 +12,10 @@
android:icon="@mipmap/ic_launcher_offline"
android:networkSecurityConfig="@xml/network_security_config"
>
<uses-library
android:name="org.apache.http.legacy"
android:required="false"/>
<provider android:name="group.pals.android.lib.ui.filechooser.providers.localfile.LocalFileProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.localfile" android:exported="false" />
<provider android:name="group.pals.android.lib.ui.filechooser.providers.history.HistoryProvider" android:authorities="keepass2android.keepass2android_nonet.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">

4
src/keepass2android/app/App.cs
View File

@@ -688,12 +688,12 @@ namespace keepass2android
new DropboxAppFolderFileStorage(Application.Context, this),
new GoogleDriveFileStorage(Application.Context, this),
new OneDriveFileStorage(Application.Context, this),
new SftpFileStorage(Application.Context, this),
new SftpFileStorage(Application.Context, this),
new NetFtpFileStorage(Application.Context, this),
new WebDavFileStorage(this),
new PCloudFileStorage(Application.Context, this),
//new LegacyWebDavStorage(this),
//new LegacyFtpStorage(this),
//new LegacyFtpStorage(this),
#endif
#endif
new LocalFileStorage(this)

13
src/keepass2android/keepass2android.csproj
View File

@@ -16,7 +16,7 @@
<AssemblyName>keepass2android</AssemblyName>
<newfilesearch>OnLoad</newfilesearch>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<MandroidI18n />
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
@@ -44,11 +44,12 @@
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<BundleAssemblies>false</BundleAssemblies>
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
<AndroidEnableMultiDex>false</AndroidEnableMultiDex>
<AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
<AndroidEnableMultiDex>true</AndroidEnableMultiDex>
<EnableProguard>true</EnableProguard>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
@@ -1926,6 +1927,12 @@
<AndroidNativeLibrary Include="..\java\argon2\libs\x86\libargon2.so" />
<AndroidNativeLibrary Include="..\java\argon2\libs\x86_64\libargon2.so" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\ic_storage_onedrive2.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\ic_storage_onedrive2.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">

2
src/netftpandroid

Submodule src/netftpandroid updated: 23df4cf135...099c7b6dd2