From 1a9c2b32c352ef38dce1dfcbf427d99d8efab03e Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 11 Feb 2025 09:49:32 +0100 Subject: [PATCH 1/2] add check Signed-off-by: alperozturk --- .../java/com/owncloud/android/authentication/PassCodeManager.kt | 2 +- .../java/com/owncloud/android/utils/DeviceCredentialUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt index 01514bcae7c5..394da8052141 100644 --- a/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt +++ b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt @@ -133,7 +133,7 @@ class PassCodeManager(private val preferences: AppPreferences, private val clock } private fun deviceCredentialsAreEnabled(activity: Activity): Boolean { - return SettingsActivity.LOCK_DEVICE_CREDENTIALS == preferences.lockPreference || + return SettingsActivity.LOCK_DEVICE_CREDENTIALS == preferences.lockPreference && (preferences.isFingerprintUnlockEnabled && DeviceCredentialUtils.areCredentialsAvailable(activity)) } diff --git a/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java b/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java index d43153e611de..07868ffb39b1 100644 --- a/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java +++ b/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java @@ -27,7 +27,7 @@ public static boolean areCredentialsAvailable(Context context) { KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); if (keyguardManager != null) { - return keyguardManager.isKeyguardSecure(); + return keyguardManager.isDeviceSecure(); } else { Log_OC.e(TAG, "Keyguard manager is null"); return false; From fde6aee8b2c39f33e8060be9258079f87795db45 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 11 Feb 2025 10:28:25 +0100 Subject: [PATCH 2/2] remove unnecessary checks Signed-off-by: alperozturk --- .../nextcloud/client/preferences/AppPreferences.java | 12 ++---------- .../client/preferences/AppPreferencesImpl.java | 5 ----- .../android/authentication/PassCodeManager.kt | 4 ++-- .../android/ui/activity/SettingsActivity.java | 1 - .../android/utils/DeviceCredentialUtils.java | 2 +- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java index 16f6fb404980..867fb365e765 100644 --- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java +++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java @@ -167,14 +167,6 @@ default void onDarkThemeModeChanged(DarkMode mode) { */ String[] getPassCode(); - /** - * Gets the unlock via fingerprint preference configured by the user. - * - * @implNote this is always false - * @return useFingerprint is unlock with fingerprint enabled - */ - boolean isFingerprintUnlockEnabled(); - /** * Gets the auto upload paths flag last set. * @@ -210,7 +202,7 @@ default void onDarkThemeModeChanged(DarkMode mode) { * Get preferred folder sort order. * * @param folder Folder whoch order is being retrieved or null for root folder - * @return sort order the sort order, default is {@link FileSortOrder#sort_a_to_z} (sort by name) + * @return sort order the sort order, default is {@link FileSortOrder# sort_a_to_z} (sort by name) */ FileSortOrder getSortOrderByFolder(@Nullable OCFile folder); @@ -232,7 +224,7 @@ default void onDarkThemeModeChanged(DarkMode mode) { /** * Get preferred folder sort order. * - * @return sort order the sort order, default is {@link FileSortOrder#sort_a_to_z} (sort by name) + * @return sort order the sort order, default is {@link FileSortOrder# sort_a_to_z} (sort by name) */ FileSortOrder getSortOrderByType(FileSortOrder.Type type, FileSortOrder defaultOrder); FileSortOrder getSortOrderByType(FileSortOrder.Type type); diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java index 75d50b9b4a2e..4c89bcbbdc0e 100644 --- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java +++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java @@ -312,11 +312,6 @@ public String[] getPassCode() { }; } - @Override - public boolean isFingerprintUnlockEnabled() { - return preferences.getBoolean(SettingsActivity.PREFERENCE_USE_FINGERPRINT, false); - } - @Override public String getFolderLayout(OCFile folder) { return getFolderPreference(context, diff --git a/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt index 394da8052141..dacd85c5863a 100644 --- a/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt +++ b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt @@ -133,8 +133,8 @@ class PassCodeManager(private val preferences: AppPreferences, private val clock } private fun deviceCredentialsAreEnabled(activity: Activity): Boolean { - return SettingsActivity.LOCK_DEVICE_CREDENTIALS == preferences.lockPreference && - (preferences.isFingerprintUnlockEnabled && DeviceCredentialUtils.areCredentialsAvailable(activity)) + return (preferences.lockPreference == SettingsActivity.LOCK_DEVICE_CREDENTIALS) && + DeviceCredentialUtils.areCredentialsAvailable(activity) } private fun getActivityRootView(activity: Activity): View? { diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java index bde331c722a3..bf26c1202232 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java @@ -109,7 +109,6 @@ public class SettingsActivity extends PreferenceActivity public static final String LOCK_DEVICE_CREDENTIALS = "device_credentials"; - public final static String PREFERENCE_USE_FINGERPRINT = "use_fingerprint"; public static final String PREFERENCE_SHOW_MEDIA_SCAN_NOTIFICATIONS = "show_media_scan_notifications"; private static final int ACTION_REQUEST_PASSCODE = 5; diff --git a/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java b/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java index 07868ffb39b1..d43153e611de 100644 --- a/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java +++ b/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java @@ -27,7 +27,7 @@ public static boolean areCredentialsAvailable(Context context) { KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); if (keyguardManager != null) { - return keyguardManager.isDeviceSecure(); + return keyguardManager.isKeyguardSecure(); } else { Log_OC.e(TAG, "Keyguard manager is null"); return false;