Skip to content

Commit afad96f

Browse files
committed
Show please wait until check passwords finish.
1 parent 13c893e commit afad96f

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

java/src/main/java/org/astonbitecode/rustkeylock/fragments/ListEntries.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import android.widget.Button;
2828
import android.widget.EditText;
2929
import android.widget.ListView;
30+
import org.astonbitecode.rustkeylock.MainActivity;
3031
import org.astonbitecode.rustkeylock.R;
3132
import org.astonbitecode.rustkeylock.adapters.EntriesAdapter;
3233
import org.astonbitecode.rustkeylock.api.InterfaceWithRust;
@@ -109,6 +110,7 @@ public void onClick(View view) {
109110
InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.NewEntry());
110111
} else if (view.getId() == R.id.checkPasswordsButton) {
111112
Log.d(TAG, "Clicked check passwords");
113+
new Thread(new PleaseWaitRunnable()).start();
112114
InterfaceWithRust.INSTANCE.check_passwords();
113115
} else if (view.getId() == R.id.filterButton) {
114116
Log.d(TAG, "Applying filter");
@@ -133,4 +135,18 @@ private void restore(Bundle state) {
133135
}
134136
}
135137

138+
private class PleaseWaitRunnable implements Runnable {
139+
private MainActivity mainActivity = null;
140+
141+
public PleaseWaitRunnable() {
142+
this.mainActivity = MainActivity.getActiveActivity();
143+
}
144+
145+
@Override
146+
public void run() {
147+
PleaseWait pw = new PleaseWait();
148+
mainActivity.setBackButtonHandler(null);
149+
mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, pw).commitAllowingStateLoss();
150+
}
151+
}
136152
}

java/src/main/java/org/astonbitecode/rustkeylock/fragments/MainMenu.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,4 @@ public void onBackButton() {
9898
Log.d(TAG, "Back button pressed");
9999
InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.Exit());
100100
}
101-
102-
private class UiThreadRunnable implements Runnable {
103-
private MainActivity mainActivity = null;
104-
105-
public UiThreadRunnable(MainActivity mainActivity) {
106-
this.mainActivity = mainActivity;
107-
}
108-
109-
@Override
110-
public void run() {
111-
PleaseWait pw = new PleaseWait();
112-
mainActivity.setBackButtonHandler(null);
113-
mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, pw).commitAllowingStateLoss();
114-
}
115-
}
116101
}

0 commit comments

Comments
 (0)