Replace the deprecated Fragment calls using androidx

astonbitecode · astonbitecode · commit 3601e37a52a9 · 2025-11-17T09:55:43.000+02:00
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/MainActivity.java b/App/src/main/java/org/astonbitecode/rustkeylock/MainActivity.java
@@ -15,13 +15,13 @@
 // along with rust-keylock.  If not, see <http://www.gnu.org/licenses/>.
 package org.astonbitecode.rustkeylock;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.util.Log;
+import androidx.fragment.app.FragmentActivity;
 import org.astonbitecode.rustkeylock.handlers.back.BackButtonHandlable;
 import org.astonbitecode.rustkeylock.handlers.back.BackButtonHandler;
 
-public class MainActivity extends Activity implements BackButtonHandlable {
+public class MainActivity extends FragmentActivity implements BackButtonHandlable {
     private static MainActivity ACTIVE_ACTIVITY;
 
     public static MainActivity getActiveActivity() {
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/api/InterfaceWithRust.java b/App/src/main/java/org/astonbitecode/rustkeylock/api/InterfaceWithRust.java
@@ -15,7 +15,7 @@
 // along with rust-keylock.  If not, see <http://www.gnu.org/licenses/>.
 package org.astonbitecode.rustkeylock.api;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import org.astonbitecode.rustkeylock.api.stubs.GuiResponse;
 
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/EditConfigurationCb.java b/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/EditConfigurationCb.java
@@ -50,7 +50,7 @@ public UiThreadRunnable(List<String> strings, MainActivity mainActivity) {
         public void run() {
             EditConfiguration ec = new EditConfiguration(strings);
             mainActivity.setBackButtonHandler(ec);
-            mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, ec).commitAllowingStateLoss();
+            mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, ec).commitAllowingStateLoss();
             InterfaceWithRust.INSTANCE.updateState(ec);
         }
     }
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowEntriesSetCb.java b/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowEntriesSetCb.java
@@ -55,7 +55,7 @@ public UiThreadRunnable(List<JavaEntry> entries, String filter, MainActivity mai
         public void run() {
             ListEntries le = new ListEntries(entries, filter);
             mainActivity.setBackButtonHandler(le);
-            mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, le).commitAllowingStateLoss();
+            mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, le).commitAllowingStateLoss();
             InterfaceWithRust.INSTANCE.updateState(le);
         }
     }
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowEntryCb.java b/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowEntryCb.java
@@ -36,12 +36,12 @@ public CompletableFuture<Object> apply(JavaEntry anEntry, Integer entryIndex, Bo
         return f;
     }
 
-    private class UiThreadRunnable implements Runnable {
-        private MainActivity mainActivity = null;
-        private JavaEntry entry = null;
-        private int entryIndex;
-        private boolean edit = false;
-        private boolean delete = false;
+    private static class UiThreadRunnable implements Runnable {
+        private final MainActivity mainActivity;
+        private final JavaEntry entry;
+        private final int entryIndex;
+        private final boolean edit;
+        private final boolean delete;
 
         public UiThreadRunnable(JavaEntry entry, int entryIndex, boolean edit, boolean delete, MainActivity mainActivity) {
             this.entry = entry;
@@ -55,7 +55,7 @@ public UiThreadRunnable(JavaEntry entry, int entryIndex, boolean edit, boolean d
         public void run() {
             ShowEntry se = new ShowEntry(entry, entryIndex, edit, delete);
             mainActivity.setBackButtonHandler(se);
-            mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, se).commitAllowingStateLoss();
+            mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, se).commitAllowingStateLoss();
             InterfaceWithRust.INSTANCE.updateState(se);
         }
     }
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowMenuCb.java b/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowMenuCb.java
@@ -15,7 +15,7 @@
 // along with rust-keylock.  If not, see <http://www.gnu.org/licenses/>.
 package org.astonbitecode.rustkeylock.callbacks;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import org.astonbitecode.rustkeylock.MainActivity;
 import org.astonbitecode.rustkeylock.R;
@@ -71,7 +71,7 @@ public void run() {
             if (fragment instanceof BackButtonHandler) {
                 mainActivity.setBackButtonHandler((BackButtonHandler) fragment);
             }
-            mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, fragment)
+            mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment)
                     .commitAllowingStateLoss();
 
             InterfaceWithRust.INSTANCE.updateState(fragment);
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowMessageCb.java b/App/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowMessageCb.java
@@ -56,7 +56,7 @@ public UiThreadRunnable(List<JavaUserOption> optionsList, String message, String
         public void run() {
             ShowMessage sm = new ShowMessage(severity, message, optionsList);
             mainActivity.setBackButtonHandler(sm);
-            mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, sm).commitAllowingStateLoss();
+            mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, sm).commitAllowingStateLoss();
         }
     }
 
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ChangePassword.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ChangePassword.java
@@ -15,7 +15,7 @@
 // along with rust-keylock.  If not, see <http://www.gnu.org/licenses/>.
 package org.astonbitecode.rustkeylock.fragments;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -44,16 +44,16 @@ public ChangePassword() {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_change_password, container, false);
 
-        EditText passwordText1 = (EditText) rootView.findViewById(R.id.editPasswordChangePassword1);
+        EditText passwordText1 = rootView.findViewById(R.id.editPasswordChangePassword1);
         this.passwordText1 = passwordText1;
-        EditText numberText1 = (EditText) rootView.findViewById(R.id.editFavoriteNumberChangePassword1);
+        EditText numberText1 = rootView.findViewById(R.id.editFavoriteNumberChangePassword1);
         this.numberText1 = numberText1;
-        EditText passwordText2 = (EditText) rootView.findViewById(R.id.editPasswordChangePassword2);
+        EditText passwordText2 = rootView.findViewById(R.id.editPasswordChangePassword2);
         this.passwordText2 = passwordText2;
-        EditText numberText2 = (EditText) rootView.findViewById(R.id.editFavoriteNumberChangePassword2);
+        EditText numberText2 = rootView.findViewById(R.id.editFavoriteNumberChangePassword2);
         this.numberText2 = numberText2;
 
-        Button b = (Button) rootView.findViewById(R.id.buttonApplyChanges);
+        Button b = rootView.findViewById(R.id.buttonApplyChanges);
         b.setOnClickListener(this);
 
         restore(savedInstanceState);
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/DirectorySelector.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/DirectorySelector.java
@@ -24,7 +24,7 @@
 import org.astonbitecode.rustkeylock.adapters.DirectoriesAdapter;
 import org.astonbitecode.rustkeylock.handlers.back.BackButtonHandler;
 
-import android.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -39,6 +39,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
+import org.jetbrains.annotations.NotNull;
 
 public class DirectorySelector extends ListFragment implements OnClickListener, BackButtonHandler {
     private static final long serialVersionUID = 1382314701594691684L;
@@ -51,16 +52,15 @@ public class DirectorySelector extends ListFragment implements OnClickListener,
     private TextView currentDirectoryTextView;
 
     public DirectorySelector() {
-        File downloads = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-        currentDirectory = downloads;
+        currentDirectory = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_directory_selector, container, false);
-        Button sdb = (Button) rootView.findViewById(R.id.selectDirectoryButton);
+        Button sdb = rootView.findViewById(R.id.selectDirectoryButton);
         sdb.setOnClickListener(this);
-        TextView cdtv = (TextView) rootView.findViewById(R.id.directorySelectorCurrent);
+        TextView cdtv = rootView.findViewById(R.id.directorySelectorCurrent);
         currentDirectoryTextView = cdtv;
 
         // Hide the soft keyboard
@@ -75,7 +75,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         directoriesAdapter = new DirectoriesAdapter(getActivity(), R.layout.directory_element,
-                new ArrayList<DirectoryEntry>());
+                new ArrayList<>());
         setListAdapter(directoriesAdapter);
         currentDirectoryTextView.setText(CURR_DIR_PREFIX + currentDirectory.getAbsolutePath());
         applyCurrentDirectory();
@@ -94,7 +94,7 @@ private void applyCurrentDirectory() {
     }
 
     @Override
-    public void onListItemClick(ListView l, View v, int pos, long id) {
+    public void onListItemClick(@NotNull ListView l, @NotNull View v, int pos, long id) {
         Log.d(TAG, "Clicked directory with index " + pos + " in the list of directories");
         super.onListItemClick(l, v, pos, id);
 
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/EditConfiguration.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/EditConfiguration.java
@@ -16,7 +16,7 @@
 package org.astonbitecode.rustkeylock.fragments;
 
 import android.annotation.SuppressLint;
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -131,7 +131,7 @@ private void prepareUiElements(View v) {
         passwordText.setText(strings.get(2));
         this.nextcloudPasswordText = passwordText;
         CheckBox useSsc = (CheckBox) v.findViewById(R.id.editNextcloudUseSelfSignedCert);
-        useSsc.setChecked(Boolean.valueOf(strings.get(3)));
+        useSsc.setChecked(Boolean.parseBoolean(strings.get(3)));
         this.useSelfSignedCert = useSsc;
 
         TextView dbxTokenLabel = (TextView) v.findViewById(R.id.editConfigurationTokenLabel);
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/EnterPassword.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/EnterPassword.java
@@ -19,7 +19,7 @@
 import org.astonbitecode.rustkeylock.api.InterfaceWithRust;
 import org.astonbitecode.rustkeylock.handlers.back.BackButtonHandler;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -57,9 +57,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 			image.setImageResource(R.drawable.unmbrella);
 		}
 		*/
-        EditText passwordText = (EditText) rootView.findViewById(R.id.editPassword);
+        EditText passwordText = rootView.findViewById(R.id.editPassword);
         this.passwordText = passwordText;
-        EditText numberText = (EditText) rootView.findViewById(R.id.editFavoriteNumber);
+        EditText numberText = rootView.findViewById(R.id.editFavoriteNumber);
         this.numberText = numberText;
         Button b = (Button) rootView.findViewById(R.id.buttonDecrypt);
         b.setOnClickListener(this);
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ExitMenu.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ExitMenu.java
@@ -19,9 +19,8 @@
 import org.astonbitecode.rustkeylock.api.InterfaceWithRust;
 import org.astonbitecode.rustkeylock.api.stubs.JavaMenu;
 import org.astonbitecode.rustkeylock.handlers.back.BackButtonHandler;
-import org.astonbitecode.rustkeylock.utils.Defs;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/FileSelector.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/FileSelector.java
@@ -16,7 +16,6 @@
 package org.astonbitecode.rustkeylock.fragments;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,7 +24,7 @@
 import org.astonbitecode.rustkeylock.adapters.FilesAdapter;
 import org.astonbitecode.rustkeylock.handlers.back.BackButtonHandler;
 
-import android.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -61,12 +60,12 @@ public FileSelector() {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_file_selector, container, false);
-        Button sdb = (Button) rootView.findViewById(R.id.selectFileButton);
+        Button sdb = rootView.findViewById(R.id.selectFileButton);
         sdb.setOnClickListener(this);
-        TextView cdtv = (TextView) rootView.findViewById(R.id.fileSelectorCurrent);
+        TextView cdtv = rootView.findViewById(R.id.fileSelectorCurrent);
         cdtv.setText("Showing files in \"" + currentDirectory.getName() + "\"");
         currentDirectoryTextView = cdtv;
-        TextView sftv = (TextView) rootView.findViewById(R.id.fileSelectorSelectedFile);
+        TextView sftv = rootView.findViewById(R.id.fileSelectorSelectedFile);
         sftv.setText(NO_FILE_SELECTED);
         selectedFileTextView = sftv;
 
@@ -115,12 +114,7 @@ public void onBackButton() {
     }
 
     private List<FileEntry> getFilesOfDirectory() {
-        String[] files = currentDirectory.list(new FilenameFilter() {
-            @Override
-            public boolean accept(File current, String name) {
-                return new File(current, name).isFile();
-            }
-        });
+        String[] files = currentDirectory.list((current, name) -> new File(current, name).isFile());
 
         List<FileEntry> fileEntries = new ArrayList<>();
         if (currentDirectory != null) {
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ListEntries.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ListEntries.java
@@ -16,7 +16,7 @@
 package org.astonbitecode.rustkeylock.fragments;
 
 import android.annotation.SuppressLint;
-import android.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
@@ -35,15 +35,15 @@
 import org.astonbitecode.rustkeylock.api.JavaEntry;
 import org.astonbitecode.rustkeylock.api.stubs.JavaMenu;
 import org.astonbitecode.rustkeylock.handlers.back.BackButtonHandler;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class ListEntries extends ListFragment implements OnClickListener, BackButtonHandler {
     private static final long serialVersionUID = 8765819759487480794L;
     private final String TAG = getClass().getName();
-    private List<JavaEntry> entries;
-    private transient EntriesAdapter entriesAdapter;
+    private final List<JavaEntry> entries;
     private String filter;
     private transient EditText filterEditText;
 
@@ -58,24 +58,24 @@ public ListEntries(List<JavaEntry> entries, String filter) {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NotNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         restore(savedInstanceState);
         if (savedInstanceState != null) {
             InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.EntriesList(filter));
         }
         View rootView = inflater.inflate(R.layout.fragment_list_entries, container, false);
-        Button nb = (Button) rootView.findViewById(R.id.addNewButton);
+        Button nb = rootView.findViewById(R.id.addNewButton);
         nb.setOnClickListener(this);
-        Button mmb = (Button) rootView.findViewById(R.id.mainMenuButton);
+        Button mmb = rootView.findViewById(R.id.mainMenuButton);
         mmb.setOnClickListener(this);
-        Button cp = (Button) rootView.findViewById(R.id.checkPasswordsButton);
+        Button cp = rootView.findViewById(R.id.checkPasswordsButton);
         cp.setOnClickListener(this);
-        Button fb = (Button) rootView.findViewById(R.id.filterButton);
+        Button fb = rootView.findViewById(R.id.filterButton);
         fb.setOnClickListener(this);
 
-        filterEditText = (EditText) rootView.findViewById(R.id.editFilter);
+        filterEditText = rootView.findViewById(R.id.editFilter);
         filterEditText.setText(filter);
-        if (filter.length() > 0) {
+        if (!filter.isEmpty()) {
             filterEditText.setFocusableInTouchMode(true);
             filterEditText.requestFocus();
         } else {
@@ -91,12 +91,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        entriesAdapter = new EntriesAdapter(getActivity(), R.layout.entry_element, entries);
+        EntriesAdapter entriesAdapter = new EntriesAdapter(getActivity(), R.layout.entry_element, entries);
         setListAdapter(entriesAdapter);
     }
 
     @Override
-    public void onListItemClick(ListView l, View v, int pos, long id) {
+    public void onListItemClick(@NotNull ListView l, @NotNull View v, int pos, long id) {
         Log.d(TAG, "Clicked entry with index " + pos + " in the list of entries");
         super.onListItemClick(l, v, pos, id);
         InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.ShowEntry(pos));
@@ -137,8 +137,8 @@ private void restore(Bundle state) {
         }
     }
 
-    private class PleaseWaitRunnable implements Runnable {
-        private MainActivity mainActivity = null;
+    private static class PleaseWaitRunnable implements Runnable {
+        private final MainActivity mainActivity;
 
         public PleaseWaitRunnable() {
             this.mainActivity = MainActivity.getActiveActivity();
@@ -148,7 +148,7 @@ public PleaseWaitRunnable() {
         public void run() {
             PleaseWait pw = new PleaseWait();
             mainActivity.setBackButtonHandler(null);
-            mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, pw).commitAllowingStateLoss();
+            mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, pw).commitAllowingStateLoss();
         }
     }
 }
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/MainMenu.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/MainMenu.java
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/PleaseWait.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/PleaseWait.java
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/SelectPath.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/SelectPath.java
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ShowEntry.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ShowEntry.java
diff --git a/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ShowMessage.java b/App/src/main/java/org/astonbitecode/rustkeylock/fragments/ShowMessage.java

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public UiThreadRunnable(List<String> strings, MainActivity mainActivity) {`
`50`	`50`	`public void run() {`
`51`	`51`	`EditConfiguration ec = new EditConfiguration(strings);`
`52`	`52`	`mainActivity.setBackButtonHandler(ec);`
`53`		`- mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, ec).commitAllowingStateLoss();`
	`53`	`+ mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, ec).commitAllowingStateLoss();`
`54`	`54`	`InterfaceWithRust.INSTANCE.updateState(ec);`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public UiThreadRunnable(List<JavaEntry> entries, String filter, MainActivity mai`
`55`	`55`	`public void run() {`
`56`	`56`	`ListEntries le = new ListEntries(entries, filter);`
`57`	`57`	`mainActivity.setBackButtonHandler(le);`
`58`		`- mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, le).commitAllowingStateLoss();`
	`58`	`+ mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, le).commitAllowingStateLoss();`
`59`	`59`	`InterfaceWithRust.INSTANCE.updateState(le);`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public UiThreadRunnable(List<JavaUserOption> optionsList, String message, String`
`56`	`56`	`public void run() {`
`57`	`57`	`ShowMessage sm = new ShowMessage(severity, message, optionsList);`
`58`	`58`	`mainActivity.setBackButtonHandler(sm);`
`59`		`- mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, sm).commitAllowingStateLoss();`
	`59`	`+ mainActivity.getSupportFragmentManager().beginTransaction().replace(R.id.container, sm).commitAllowingStateLoss();`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`