diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-25 03:38:53 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-25 03:38:53 +0200 |
commit | 35ef8372866877d92971228b6c56270112238ce9 (patch) | |
tree | 94a2c332936e48e45a128b657a3e8e32c074267b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java | |
parent | edd1e45db7c773feb6dd9e6cdb064f692a63c2ac (diff) | |
download | open-keychain-35ef8372866877d92971228b6c56270112238ce9.tar.gz open-keychain-35ef8372866877d92971228b6c56270112238ce9.tar.bz2 open-keychain-35ef8372866877d92971228b6c56270112238ce9.zip |
enc-backup: use only one fragment after all
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java index cc80f8910..8c1555232 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java @@ -20,7 +20,9 @@ package org.sufficientlysecure.keychain.ui; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; +import android.view.MenuItem; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.base.BaseActivity; @@ -39,8 +41,10 @@ public class BackupActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + if (savedInstanceState == null) { - BackupCodeDisplayFragment frag = BackupCodeDisplayFragment.newInstance(); + Fragment frag = BackupCodeEntryFragment.newInstance(); FragmentManager fragMan = getSupportFragmentManager(); fragMan.beginTransaction() @@ -50,4 +54,19 @@ public class BackupActivity extends BaseActivity { } } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + FragmentManager fragMan = getSupportFragmentManager(); + // pop from back stack, or if nothing was on there finish activity + if ( ! fragMan.popBackStackImmediate()) { + finish(); + } + return true; + } + return super.onOptionsItemSelected(item); + } + } |