luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-20 13:59:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent double launches of the intro and auth activities

Browse source 
Since API level 33: When opening Aegis right after installing it,
Android will send a configuration change event (CONFIG_ASSETS_PATHS),
causing MainActivity to restart almost immediately. This would also
cause two IntroActivity's to be started on top of eachother.
This commit is contained in:
Alexander Bakker 2022-10-09 14:35:51 +02:00
parent 35d3675561
commit 80c37556c7
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file

@ -29,6 +29,7 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.view.ActionMode; import androidx.appcompat.view.ActionMode;
import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.SearchView;
@ -76,6 +77,8 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
private boolean _loaded; private boolean _loaded;
private boolean _isRecreated; private boolean _isRecreated;
private boolean _isDPadPressed; private boolean _isDPadPressed;
private boolean _isDoingIntro;
private boolean _isAuthenticating;
private String _submittedSearchSubtitle; private String _submittedSearchSubtitle;
private String _searchQueryInputText; private String _searchQueryInputText;
@ -101,13 +104,16 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
setSupportActionBar(findViewById(R.id.toolbar)); setSupportActionBar(findViewById(R.id.toolbar));
_loaded = false; _loaded = false;
_isDPadPressed = false; _isDPadPressed = false;
_isDoingIntro = false;
_isAuthenticating = false;
if (savedInstanceState != null) { if (savedInstanceState != null) {
_isRecreated = true; _isRecreated = true;
_searchQueryInputText = savedInstanceState.getString("searchQueryInputText"); _searchQueryInputText = savedInstanceState.getString("searchQueryInputText");
_activeSearchFilter = savedInstanceState.getString("activeSearchFilter"); _activeSearchFilter = savedInstanceState.getString("activeSearchFilter");
_submittedSearchSubtitle = savedInstanceState.getString("submittedSearchSubtitle"); _submittedSearchSubtitle = savedInstanceState.getString("submittedSearchSubtitle");
_isDoingIntro = savedInstanceState.getBoolean("isDoingIntro");
_isAuthenticating = savedInstanceState.getBoolean("isAuthenticating");
} }
_entryListView = (EntryListView) getSupportFragmentManager().findFragmentById(R.id.key_profiles); _entryListView = (EntryListView) getSupportFragmentManager().findFragmentById(R.id.key_profiles);
@ -169,15 +175,23 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} }
@Override @Override
protected void onSaveInstanceState(Bundle instance) { protected void onSaveInstanceState(@NonNull Bundle instance) {
super.onSaveInstanceState(instance); super.onSaveInstanceState(instance);
instance.putString("activeSearchFilter", _activeSearchFilter); instance.putString("activeSearchFilter", _activeSearchFilter);
instance.putString("submittedSearchSubtitle", _submittedSearchSubtitle); instance.putString("submittedSearchSubtitle", _submittedSearchSubtitle);
instance.putString("searchQueryInputText", _searchQueryInputText); instance.putString("searchQueryInputText", _searchQueryInputText);
instance.putBoolean("isDoingIntro", _isDoingIntro);
instance.putBoolean("isAuthenticating", _isAuthenticating);
} }
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == CODE_DECRYPT) {
_isAuthenticating = false;
}
if (requestCode == CODE_DO_INTRO) {
_isDoingIntro = false;
}
if (resultCode != RESULT_OK) { if (resultCode != RESULT_OK) {
return; return;
} }
@ -289,6 +303,14 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
startActivityForResult(intent, requestCode); startActivityForResult(intent, requestCode);
} }
private void startIntroActivity() {
if (!_isDoingIntro) {
Intent intro = new Intent(this, IntroActivity.class);
startActivityForResult(intro, CODE_DO_INTRO);
_isDoingIntro = true;
}
}
private void onScanResult(Intent data) { private void onScanResult(Intent data) {
List<VaultEntry> entries = (ArrayList<VaultEntry>) data.getSerializableExtra("entries"); List<VaultEntry> entries = (ArrayList<VaultEntry>) data.getSerializableExtra("entries");
if (entries != null) { if (entries != null) {
@ -571,8 +593,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
if (_prefs.isIntroDone()) { if (_prefs.isIntroDone()) {
Toast.makeText(this, getString(R.string.vault_not_found), Toast.LENGTH_SHORT).show(); Toast.makeText(this, getString(R.string.vault_not_found), Toast.LENGTH_SHORT).show();
} }
Intent intro = new Intent(this, IntroActivity.class); startIntroActivity();
startActivityForResult(intro, CODE_DO_INTRO);
return; return;
} }
@ -766,9 +787,12 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} }
private void startAuthActivity(boolean inhibitBioPrompt) { private void startAuthActivity(boolean inhibitBioPrompt) {
Intent intent = new Intent(this, AuthActivity.class); if (!_isAuthenticating) {
intent.putExtra("inhibitBioPrompt", inhibitBioPrompt); Intent intent = new Intent(this, AuthActivity.class);
startActivityForResult(intent, CODE_DECRYPT); intent.putExtra("inhibitBioPrompt", inhibitBioPrompt);
startActivityForResult(intent, CODE_DECRYPT);
_isAuthenticating = true;
}
} }
private void updateLockIcon() { private void updateLockIcon() {