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

Merge pull request #481 from alexbakker/no-singletask

Browse source 
Unset "singleTask" as the launchMode for MainActivity
This commit is contained in:
Michael Schättgen 2020-07-04 12:02:49 +02:00 • committed by GitHub
commit 32c145b02d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/beemdevelopment/aegis/AegisApplication.java
View file

@ -141,6 +141,7 @@ public class AegisApplication extends Application {
Intent intent = new Intent(this, MainActivity.class);
intent.putExtra("action", "scan");
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
intent.setAction(Intent.ACTION_MAIN);
ShortcutInfo shortcut = new ShortcutInfo.Builder(this, "shortcut_new")

2
app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
View file

@ -35,7 +35,7 @@ public abstract class AegisActivity extends AppCompatActivity implements AegisAp
// if the app was killed, relaunch MainActivity and close everything else
if (savedInstanceState != null && isOrphan()) {
Intent intent = new Intent(this, MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent);
return;
}

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

@ -160,21 +160,8 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
return super.dispatchTouchEvent(event);
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
setIntent(intent);
doShortcutActions();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
// don't process any activity results if the vault is locked
if (requestCode != CODE_DECRYPT && requestCode != CODE_DO_INTRO && _app.isVaultLocked()) {
return;
}
if (resultCode != RESULT_OK) {
return;
}