diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2f8eb23ce..b46226f96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -60,6 +60,11 @@ + + diff --git a/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java index 53115a184..307a13398 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java @@ -8,11 +8,8 @@ */ package it.niedermann.owncloud.notes; -import android.app.KeyguardManager; -import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.WindowManager; import androidx.activity.OnBackPressedCallback; @@ -24,11 +21,6 @@ public abstract class LockedActivity extends BrandedActivity { - private static final String TAG = LockedActivity.class.getSimpleName(); - - private static final int REQUEST_CODE_UNLOCK = 100; - - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -39,10 +31,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } - if (isTaskRoot()) { - askToUnlock(); - } - getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) { @Override public void handleOnBackPressed() { @@ -56,10 +44,7 @@ public void handleOnBackPressed() { @Override protected void onResume() { super.onResume(); - - if (!isTaskRoot()) { - askToUnlock(); - } + askToUnlock(); } @Override @@ -94,31 +79,9 @@ public void startActivity(Intent intent, @Nullable Bundle options) { super.startActivity(intent, options); } - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - if (requestCode == REQUEST_CODE_UNLOCK) { - if (resultCode == RESULT_OK) { - Log.v(TAG, "Successfully unlocked device"); - NotesApplication.unlock(); - } else { - Log.e(TAG, "Result code of unlocking was " + resultCode); - finish(); - } - } - } - private void askToUnlock() { if (NotesApplication.isLocked()) { - final var keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE); - if (keyguardManager != null) { - final var intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.unlock_notes), null); - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); - startActivityForResult(intent, REQUEST_CODE_UNLOCK); - } else { - Log.e(TAG, "Keyguard manager is null"); - } + startActivity(new Intent(this, UnlockActivity.class)); } } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/UnlockActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/UnlockActivity.kt new file mode 100644 index 000000000..8ad23c72f --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/UnlockActivity.kt @@ -0,0 +1,98 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package it.niedermann.owncloud.notes + +import android.app.KeyguardManager +import android.os.Bundle +import android.view.Gravity +import android.view.ViewGroup +import android.view.WindowManager +import android.widget.FrameLayout +import androidx.activity.OnBackPressedCallback +import androidx.activity.result.contract.ActivityResultContracts +import androidx.preference.PreferenceManager +import com.google.android.material.button.MaterialButton +import it.niedermann.owncloud.notes.branding.BrandingUtil +import it.niedermann.owncloud.notes.branding.BrandedActivity + +class UnlockActivity : BrandedActivity() { + + private lateinit var contentView: FrameLayout + private lateinit var unlockButton: MaterialButton + + private val credentialLauncher = registerForActivityResult( + ActivityResultContracts.StartActivityForResult() + ) { result -> + if (result.resultCode == RESULT_OK) { + NotesApplication.updateLastInteraction() + NotesApplication.unlock() + finish() + } else { + moveTaskToBack(true) + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + contentView = createContentView() + setContentView(contentView) + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + moveTaskToBack(true) + } + }) + + if (PreferenceManager.getDefaultSharedPreferences(this) + .getBoolean(getString(R.string.pref_key_prevent_screen_capture), false) + ) { + window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE) + } + + if (NotesApplication.isLocked()) { + requestDeviceCredentials() + } else { + finish() + } + } + + override fun applyBrand(color: Int) { + val brandingUtil = BrandingUtil.of(color, this) + brandingUtil.platform.themeStatusBar(this) + brandingUtil.platform.colorViewBackground(window.decorView) + brandingUtil.platform.colorViewBackground(contentView) + brandingUtil.material.colorMaterialButtonPrimaryFilled(unlockButton) + } + + private fun createContentView(): FrameLayout = FrameLayout(this).apply { + val padding = resources.getDimensionPixelSize(R.dimen.spacer_activity_sides) + setPadding(padding, padding, padding, padding) + + unlockButton = MaterialButton(this@UnlockActivity).apply { + text = getString(R.string.unlock_notes) + setIconResource(R.drawable.ic_lock_grey600_24dp) + setOnClickListener { requestDeviceCredentials() } + } + addView( + unlockButton, + FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER) + ) + } + + private fun requestDeviceCredentials() { + val keyguardManager = getSystemService(KeyguardManager::class.java) + if (keyguardManager?.isKeyguardSecure != true) { + NotesApplication.updateLastInteraction() + NotesApplication.unlock() + finish() + return + } + + val intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.unlock_notes), null) + ?: return + credentialLauncher.launch(intent) + } +} \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d0b4ffcc1..c5ed93bc0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -393,7 +393,7 @@ 30 Minuten Diese Woche Heute - Notiz entsperren + Notizen entsperren Kontenname com.nextcloud.android.providers.UsersAndGroupsSearchProvider com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH