aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-25 02:57:33 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-25 02:57:33 +0200
commit339b283df5b75e19a3a22313476f9e91b6def6ae (patch)
tree83d19a6dbdda4e6141f77886d9bb87940cd127a4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
parent49b237d6095234053227f6cd4ee50a27c2e6fa61 (diff)
downloadopen-keychain-339b283df5b75e19a3a22313476f9e91b6def6ae.tar.gz
open-keychain-339b283df5b75e19a3a22313476f9e91b6def6ae.tar.bz2
open-keychain-339b283df5b75e19a3a22313476f9e91b6def6ae.zip
Safeslinger fixesÄ
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
index 9d4bfbda5..a3ce65501 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
@@ -64,7 +64,7 @@ public class SafeSlingerActivity extends ActionBarActivity {
public static final String EXTRA_MASTER_KEY_ID = "master_key_id";
private long mMasterKeyId;
- private int mSelectedNumber;
+ private int mSelectedNumber = 2;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -124,12 +124,13 @@ public class SafeSlingerActivity extends ActionBarActivity {
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startExchange(mMasterKeyId);
+ startExchange(mMasterKeyId, mSelectedNumber);
}
});
}
- private void startExchange(long masterKeyId) {
+ private void startExchange(long masterKeyId, int number) {
+ Log.d(Constants.TAG, "number: " + number);
// retrieve public key blob and start SafeSlinger
Uri uri = KeychainContract.KeyRingData.buildPublicKeyRingUri(masterKeyId);
try {
@@ -137,7 +138,8 @@ public class SafeSlingerActivity extends ActionBarActivity {
uri, KeychainContract.KeyRingData.KEY_RING_DATA, ProviderHelper.FIELD_TYPE_BLOB);
Intent slingerIntent = new Intent(this, ExchangeActivity.class);
- slingerIntent.putExtra(ExchangeConfig.extra.NUM_USERS, mSelectedNumber);
+
+ slingerIntent.putExtra(ExchangeConfig.extra.NUM_USERS, number);
slingerIntent.putExtra(ExchangeConfig.extra.USER_DATA, keyBlob);
slingerIntent.putExtra(ExchangeConfig.extra.HOST_NAME, Constants.SAFESLINGER_SERVER);
startActivityForResult(slingerIntent, REQUEST_CODE_SAFE_SLINGER);