Refactor security activities and improve key handling

app/src/main/AndroidManifest.xml

@@ -34,7 +34,7 @@
             android:name=".activity.security.SetupKeyActivity"
             android:exported="false"
             android:screenOrientation="locked"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".activity.security.AuthActivity"
             android:exported="false"

app/src/main/java/app/notesr/activity/note/list/NotesListActivity.java

@@ -14,6 +14,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
+import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -36,9 +37,11 @@
 import app.notesr.activity.exporter.ExportActivity;
 import app.notesr.activity.importer.ImportActivity;
 import app.notesr.activity.note.editor.OpenNoteActivity;
-import app.notesr.activity.security.ChangePasswordOnClick;
-import app.notesr.activity.security.GenerateNewKeyOnClick;
-import app.notesr.activity.security.LockOnClick;
+import app.notesr.activity.security.AuthActivity;
+import app.notesr.activity.security.GenerateNewKeyAction;
+import app.notesr.activity.security.LockAction;
+import app.notesr.core.security.crypto.CryptoManager;
+import app.notesr.core.security.crypto.CryptoManagerProvider;
 import app.notesr.data.AppDatabase;
 import app.notesr.data.DatabaseProvider;
 import app.notesr.data.model.Note;
@@ -47,17 +50,18 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 
 public final class NotesListActivity extends ActivityBase {
 
     private static final int SEARCH_DELAY = 300;
 
-    private final Map<Integer, Consumer<ActivityBase>> menuItemsMap = new HashMap<>();
+    private final SparseArray<Runnable> menuActions = new SparseArray<>();
     private final Map<Long, String> notesIdsMap = new HashMap<>();
     private final Handler searchHandler = new Handler(Looper.getMainLooper());
 
     private ActivityResultLauncher<Intent> noteEditorLauncher;
+    private LockAction lockAction;
+    private GenerateNewKeyAction generateNewKeyAction;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -70,18 +74,16 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_note_list);
         applyInsets(findViewById(R.id.main));
 
-        getOnBackPressedDispatcher()
-                .addCallback(this, new OnBackPressedCallback(true) {
-                    @Override
-                    public void handleOnBackPressed() {
-                        LockOnClick lock = new LockOnClick();
-                        lock.accept(NotesListActivity.this);
-                    }
-                });
+        CryptoManager cryptoManager = CryptoManagerProvider.getInstance(getApplicationContext());
+
+        lockAction = new LockAction(this, cryptoManager);
+        generateNewKeyAction = new GenerateNewKeyAction(this, cryptoManager);
 
         noteEditorLauncher = registerForActivityResult(
                 new ActivityResultContracts.StartActivityForResult(), getOpenNoteResultCallback());
 
+        getOnBackPressedDispatcher().addCallback(this, getOnBackPressedCallback());
+
         ListView notesView = findViewById(R.id.notesListView);
         FloatingActionButton newNoteButton = findViewById(R.id.addNoteButton);
 
@@ -100,20 +102,15 @@ public void handleOnBackPressed() {
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
 
-        Intent importActivityIntent = new Intent(this, ImportActivity.class);
-        Intent exportActivityIntent = new Intent(this, ExportActivity.class);
-
         getMenuInflater().inflate(R.menu.menu_notes_list, menu);
 
-        menuItemsMap.put(R.id.lockAppButton, new LockOnClick());
-        menuItemsMap.put(R.id.changePasswordMenuItem, new ChangePasswordOnClick());
-        menuItemsMap.put(R.id.generateNewKeyMenuItem, new GenerateNewKeyOnClick());
-
-        menuItemsMap.put(R.id.exportMenuItem, action ->
-                startActivity(exportActivityIntent));
-
-        menuItemsMap.put(R.id.importMenuItem, action ->
-                startActivity(importActivityIntent));
+        menuActions.put(R.id.lockAppButton, lockAction::lock);
+        menuActions.put(R.id.changePasswordMenuItem, this::startChangePasswordActivity);
+        menuActions.put(R.id.generateNewKeyMenuItem, generateNewKeyAction::startActivity);
+        menuActions.put(R.id.exportMenuItem,
+                () -> startActivity(new Intent(this, ExportActivity.class)));
+        menuActions.put(R.id.importMenuItem,
+                () -> startActivity(new Intent(this, ImportActivity.class)));
 
         SearchView searchView = (SearchView) menu.findItem(R.id.searchNotesButton).getActionView();
         requireNonNull(searchView, "SearchView is null");
@@ -131,7 +128,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
 
         if (itemId != R.id.searchNotesButton) {
-            requireNonNull(menuItemsMap.get(itemId)).accept(this);
+            requireNonNull(menuActions.get(itemId)).run();
         }
 
         return true;
@@ -250,4 +247,19 @@ private void openNote(String noteId) {
 
         noteEditorLauncher.launch(intent);
     }
+
+    private void startChangePasswordActivity() {
+        Intent intent = new Intent(getApplicationContext(), AuthActivity.class)
+                .putExtra(AuthActivity.EXTRA_MODE, AuthActivity.Mode.CHANGE_PASSWORD.toString());
+        startActivity(intent);
+    }
+
+    private OnBackPressedCallback getOnBackPressedCallback() {
+        return new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                lockAction.lock();
+            }
+        };
+    }
 }

app/src/main/java/app/notesr/activity/security/AuthActivityExtension.java

@@ -71,7 +71,7 @@ public void authorize() {
     }
 
     public void createPassword() {
-        var password = proceedPasswordSetting();
+        char[] password = proceedPasswordSetting();
 
         if (password != null) {
             var context = activity.getApplicationContext();
@@ -80,7 +80,7 @@ public void createPassword() {
 
             try {
                 var passwordBytes = charsToBytes(password, StandardCharsets.UTF_8);
-                SecretCache.put(SetupKeyActivity.PASSWORD, passwordBytes);
+                SecretCache.put(SetupKeyActivity.CACHE_KEY_PASSWORD, passwordBytes);
             } catch (CharacterCodingException e) {
                 throw new RuntimeException(e);
             }
@@ -90,11 +90,11 @@ public void createPassword() {
     }
 
     public void recoverKey() {
-        var password = proceedPasswordSetting();
+        char[] password = proceedPasswordSetting();
 
         if (password != null) {
             try {
-                var hexKey = bytesToChars(SecretCache.take(HEX_KEY),
+                char[] hexKey = bytesToChars(SecretCache.take(HEX_KEY),
                         StandardCharsets.UTF_8);
 
                 if (hexKey == null) {
@@ -118,19 +118,19 @@ public void recoverKey() {
     }
 
     public void changePassword() {
-        var password = proceedPasswordSetting();
+        char[] password = proceedPasswordSetting();
 
         if (password != null) {
             try {
-                var context = activity.getApplicationContext();
-                var secrets = cryptoManager.getSecrets();
+                Context context = activity.getApplicationContext();
+                CryptoSecrets secrets = cryptoManager.getSecrets();
                 secrets.setPassword(password);
 
                 cryptoManager.setSecrets(context, secrets);
                 secrets.destroy();
 
                 showToastMessage(R.string.updated);
-                activity.startActivity(new Intent(context,  NotesListActivity.class));
+                activity.startActivity(new Intent(context, NotesListActivity.class));
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

app/src/main/java/app/notesr/activity/security/GenerateNewKeyAction.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2026 zHd4
+ * SPDX-License-Identifier: MIT
+ */
+
+package app.notesr.activity.security;
+
+import static app.notesr.core.util.CharUtils.charsToBytes;
+
+import android.content.Context;
+import android.content.Intent;
+
+import app.notesr.activity.ActivityBase;
+import app.notesr.core.security.SecretCache;
+import app.notesr.core.security.crypto.CryptoManager;
+import app.notesr.core.security.dto.CryptoSecrets;
+import lombok.RequiredArgsConstructor;
+
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+@RequiredArgsConstructor
+public final class GenerateNewKeyAction {
+
+    private final ActivityBase activity;
+    private final CryptoManager cryptoManager;
+
+    public void startActivity() {
+        CryptoSecrets secrets = cryptoManager.getSecrets();
+        char[] passwordChars = Arrays.copyOf(secrets.getPassword(), secrets.getPassword().length);
+
+        try {
+            byte[] passwordBytes = charsToBytes(passwordChars, StandardCharsets.UTF_8);
+            SecretCache.put(SetupKeyActivity.CACHE_KEY_PASSWORD, passwordBytes);
+        } catch (CharacterCodingException e) {
+            throw new RuntimeException(e);
+        }
+
+        secrets.destroy();
+
+        Context context = activity.getApplicationContext();
+        var intent = new Intent(context, SetupKeyActivity.class)
+                .putExtra(SetupKeyActivity.EXTRA_MODE, KeySetupMode.REGENERATION.toString());
+        activity.startActivity(intent);
+    }
+}