diff --git a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar index c757fa38..2678769e 100644 Binary files a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar and b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar differ diff --git a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar index d98fc5cc..5ff3e4d6 100644 Binary files a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar and b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar differ diff --git a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java index 3b5bb317..a02d26f6 100644 --- a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java +++ b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java @@ -83,21 +83,23 @@ public class OneDriveStorage extends JavaFileStorageBase private boolean isConnected(Activity activity) { if (oneDriveClient == null) { - Log.d("KP2AJ", "trying silent login"); - if (msaAuthenticator.loginSilent() != null) + try { - Log.d("KP2AJ", "ok: silent login"); - try + Log.d("KP2AJ", "trying silent login"); + if (msaAuthenticator.loginSilent() != null) { - oneDriveClient = buildClient(activity); - } - catch (Exception e) - { - e.printStackTrace(); - } + Log.d("KP2AJ", "ok: silent login"); + oneDriveClient = buildClient(activity); + + + } + else Log.d("KP2AJ", "trying silent login failed."); + } + catch (Exception e) + { + e.printStackTrace(); } - else Log.d("KP2AJ", "trying silent login failed."); } return oneDriveClient != null; } diff --git a/src/keepass2android/AppKilledInfo.cs b/src/keepass2android/AppKilledInfo.cs index 73581d94..2b411eca 100644 --- a/src/keepass2android/AppKilledInfo.cs +++ b/src/keepass2android/AppKilledInfo.cs @@ -33,8 +33,9 @@ namespace keepass2android }); b.SetNegativeButton(Resource.String.cancel, delegate { }); b.SetTitle(GetString(AppNames.AppNameResource)); - b.SetOnDismissListener(this); + var dialog = b.Create(); + dialog.SetOnDismissListener(this); dialog.Show(); } diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs index 78de25ca..6f48044b 100644 --- a/src/keepass2android/ChangeLog.cs +++ b/src/keepass2android/ChangeLog.cs @@ -26,7 +26,7 @@ namespace keepass2android AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog)); builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title)); List changeLog = new List{ - ctx.GetString(Resource.String.ChangeLog_1_01e), + ctx.GetString(Resource.String.ChangeLog_1_01f), ctx.GetString(Resource.String.ChangeLog_1_01d), ctx.GetString(Resource.String.ChangeLog_1_01), ctx.GetString(Resource.String.ChangeLog_1_0_0e), diff --git a/src/keepass2android/KeePass.cs b/src/keepass2android/KeePass.cs index 2f62e5e7..027f6c0a 100644 --- a/src/keepass2android/KeePass.cs +++ b/src/keepass2android/KeePass.cs @@ -218,9 +218,10 @@ namespace keepass2android App.SetErrorReportMode(this, App.ErrorReportMode.Disabled); launchNextActivity(); }); - b.SetOnDismissListener(this); + var dialog = b.Create(); + dialog.SetOnDismissListener(this); - b.Show(); + dialog.Show(); } diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml index bc18262f..a33be397 100644 --- a/src/keepass2android/Properties/AndroidManifest_net.xml +++ b/src/keepass2android/Properties/AndroidManifest_net.xml @@ -1,7 +1,7 @@  diff --git a/src/keepass2android/QuickUnlock.cs b/src/keepass2android/QuickUnlock.cs index 12fdd1a6..ee5c789e 100644 --- a/src/keepass2android/QuickUnlock.cs +++ b/src/keepass2android/QuickUnlock.cs @@ -158,12 +158,12 @@ namespace keepass2android } - public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults) + public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults) { Kp2aLog.Log("OnRequestPermissionsResult " + (requestCode == FingerprintPermissionRequestCode) + ((grantResults.Length > 0) && (grantResults[0] == Permission.Granted))); - if (requestCode == FingerprintPermissionRequestCode && grantResults[0] == Permission.Granted) + if ((requestCode == FingerprintPermissionRequestCode) && (grantResults.Length > 0) && (grantResults[0] == Permission.Granted)) { var btn = FindViewById(Resource.Id.fingerprintbtn); btn.Click += (sender, args) => diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml index 60938d81..3c03c1f8 100644 --- a/src/keepass2android/Resources/values/strings.xml +++ b/src/keepass2android/Resources/values/strings.xml @@ -680,10 +680,11 @@ Use AutoFill service Please enable the Keepass2Android service. Show soft keyboard for password input when fingerprint scan is active. - - Version 1.01-e\n + + Version 1.01-f\n * Fix for crash when trying to work offline\n * Fix for incorrect encoding of FTP(S) credentials\n + * Fix for crashes when using OneDrive and on older Android versions\n * Display times as local time in entry screen\n diff --git a/src/keepass2android/app/App.cs b/src/keepass2android/app/App.cs index c8f32559..462af816 100644 --- a/src/keepass2android/app/App.cs +++ b/src/keepass2android/app/App.cs @@ -316,6 +316,8 @@ namespace keepass2android } public Drawable GetResourceDrawable(string key) { + if (key == "ic_storage_skydrive") + key = "ic_storage_onedrive"; //resource was renamed. do this to avoid crashes with legacy file entries. var field = typeof(Resource.Drawable).GetField(key); if (field == null) throw new Exception("Invalid key " + key);