diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:24:27 +0300 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:24:27 +0300 |
commit | 9306b5ce325d0c3a968a4a0e64468163666addb7 (patch) | |
tree | 6e8c312917f65b7a3f8a68d38124cc6024cd1675 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java | |
parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
parent | c8b112c70d9f45b00bfd30e2ac746bfbbb31671e (diff) | |
download | open-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.tar.gz open-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.tar.bz2 open-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.zip |
Merge branch 'backup-api'
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java index 001fa9dc8..4107167b5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.os.Build; import org.sufficientlysecure.keychain.provider.KeychainContract; +import org.sufficientlysecure.keychain.remote.ui.RemoteBackupActivity; import org.sufficientlysecure.keychain.remote.ui.RemoteCreateAccountActivity; import org.sufficientlysecure.keychain.remote.ui.RemoteErrorActivity; import org.sufficientlysecure.keychain.remote.ui.RemoteImportKeysActivity; @@ -124,6 +125,14 @@ public class ApiPendingIntentFactory { return createInternal(data, intent); } + PendingIntent createBackupPendingIntent(Intent data, long[] masterKeyIds, boolean backupSecret) { + Intent intent = new Intent(mContext, RemoteBackupActivity.class); + intent.putExtra(RemoteBackupActivity.EXTRA_MASTER_KEY_IDS, masterKeyIds); + intent.putExtra(RemoteBackupActivity.EXTRA_SECRET, backupSecret); + + return createInternal(data, intent); + } + @Deprecated PendingIntent createAccountCreationPendingIntent(Intent data, String packageName, String accountName) { Intent intent = new Intent(mContext, RemoteCreateAccountActivity.class); |