aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-10-15 19:10:06 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-10-15 19:10:06 +0200
commit8279f84eb88a80e197514f2ab94e0e91416a19e7 (patch)
tree7cf1533e1a57af50e65341aea6bb7f1db900e20b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
parentcad89f12e21568255d8892b8a3004ce85353d657 (diff)
downloadopen-keychain-8279f84eb88a80e197514f2ab94e0e91416a19e7.tar.gz
open-keychain-8279f84eb88a80e197514f2ab94e0e91416a19e7.tar.bz2
open-keychain-8279f84eb88a80e197514f2ab94e0e91416a19e7.zip
Add restore to backup fragment, cleanup, renamings
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index 51bc99ea3..7e9b4953c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -190,7 +190,7 @@ public class MainActivity extends BaseNfcActivity implements FabContainer, OnBac
private void onEnDecryptSelected() {
mToolbar.setTitle(R.string.nav_encrypt_decrypt);
mDrawer.setSelectionByIdentifier(ID_ENCRYPT_DECRYPT, false);
- Fragment frag = new EncryptDecryptOverviewFragment();
+ Fragment frag = new EncryptDecryptFragment();
setFragment(frag, true);
}
@@ -259,7 +259,7 @@ public class MainActivity extends BaseNfcActivity implements FabContainer, OnBac
if (frag instanceof KeyListFragment) {
mToolbar.setTitle(R.string.app_name);
mDrawer.setSelection(mDrawer.getPositionFromIdentifier(ID_KEYS), false);
- } else if (frag instanceof EncryptDecryptOverviewFragment) {
+ } else if (frag instanceof EncryptDecryptFragment) {
mToolbar.setTitle(R.string.nav_encrypt_decrypt);
mDrawer.setSelection(mDrawer.getPositionFromIdentifier(ID_ENCRYPT_DECRYPT), false);
} else if (frag instanceof AppsListFragment) {