aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-02-16 00:36:27 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-03-01 00:22:19 +0100
commita2dcb579ff5d3565e7e6c6afe37878855361595b (patch)
tree6cc96edef8783154ba1c1eab90c20b693f7b1e72 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java
parent067d5fd0b0b9d1889f3052b05b680168f29825b6 (diff)
downloadopen-keychain-a2dcb579ff5d3565e7e6c6afe37878855361595b.tar.gz
open-keychain-a2dcb579ff5d3565e7e6c6afe37878855361595b.tar.bz2
open-keychain-a2dcb579ff5d3565e7e6c6afe37878855361595b.zip
Add backup API
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.java10
1 files changed, 9 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 ff120c9b5..94abf9e47 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java
@@ -24,6 +24,7 @@ import android.support.v4.app.FragmentManager;
import android.view.MenuItem;
import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
@@ -49,7 +50,7 @@ public class BackupActivity extends BaseActivity {
boolean exportSecret = intent.getBooleanExtra(EXTRA_SECRET, false);
long[] masterKeyIds = intent.getLongArrayExtra(EXTRA_MASTER_KEY_IDS);
- Fragment frag = BackupCodeFragment.newInstance(masterKeyIds, exportSecret);
+ Fragment frag = BackupCodeFragment.newInstance(masterKeyIds, exportSecret, true);
FragmentManager fragMan = getSupportFragmentManager();
fragMan.beginTransaction()
@@ -74,4 +75,11 @@ public class BackupActivity extends BaseActivity {
return super.onOptionsItemSelected(item);
}
+ /**
+ * Overridden in RemoteBackupActivity
+ */
+ public void handleBackupOperation(CryptoInputParcel inputParcel) {
+ // only used for RemoteBackupActivity
+ }
+
}