Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
<activity
android:name=".itemdetails.ItemDetailsActivity" />

<activity
android:name=".UnlockActivity"
android:exported="false"
android:label="@string/app_name" />

<activity
android:name=".share.NoteShareDetailActivity" />

Expand Down
41 changes: 2 additions & 39 deletions app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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() {
Expand All @@ -56,10 +44,7 @@ public void handleOnBackPressed() {
@Override
protected void onResume() {
super.onResume();

if (!isTaskRoot()) {
askToUnlock();
}
askToUnlock();
}

@Override
Expand Down Expand Up @@ -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));
}
}
}
98 changes: 98 additions & 0 deletions app/src/main/java/it/niedermann/owncloud/notes/UnlockActivity.kt
Original file line number Diff line number Diff line change
@@ -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)
}
}
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
<string name="thirtyMinutes">30 Minuten</string>
<string name="thisWeek">Diese Woche</string>
<string name="today">Heute</string>
<string name="unlock_notes">Notiz entsperren</string>
<string name="unlock_notes">Notizen entsperren</string>
<string name="username">Kontenname</string>
<string name="users_and_groups_search_provider_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
<string name="users_and_groups_search_provider_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
Expand Down