diff options
| author | Dominik <dominik@dominikschuermann.de> | 2012-03-09 12:13:28 +0100 |
|---|---|---|
| committer | Dominik <dominik@dominikschuermann.de> | 2012-03-09 12:13:28 +0100 |
| commit | 7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9 (patch) | |
| tree | 1e85e6dfd94259656e5c03513f3089e76185b262 /src/org | |
| parent | 781f089ee1730f596015145706f2302218efeaed (diff) | |
| download | open-keychain-7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9.tar.gz open-keychain-7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9.tar.bz2 open-keychain-7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9.zip | |
fixing qrcode integration
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/thialfihar/android/apg/Apg.java | 2 | ||||
| -rw-r--r-- | src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java | 2 | ||||
| -rw-r--r-- | src/org/thialfihar/android/apg/SecretKeyListActivity.java | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java index 4d898ab5e..5b9ba6241 100644 --- a/src/org/thialfihar/android/apg/Apg.java +++ b/src/org/thialfihar/android/apg/Apg.java @@ -32,6 +32,7 @@ import org.spongycastle.openpgp.PGPEncryptedDataGenerator; import org.spongycastle.openpgp.PGPEncryptedDataList; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPKeyPair; +import org.spongycastle.openpgp.PGPKeyRing; import org.spongycastle.openpgp.PGPKeyRingGenerator; import org.spongycastle.openpgp.PGPLiteralData; import org.spongycastle.openpgp.PGPLiteralDataGenerator; @@ -52,6 +53,7 @@ import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; import org.spongycastle.openpgp.PGPSignatureSubpacketVector; import org.spongycastle.openpgp.PGPUtil; import org.spongycastle.openpgp.PGPV3SignatureGenerator; +import org.thialfihar.android.apg.KeyServer.AddKeyException; import org.thialfihar.android.apg.provider.DataProvider; import org.thialfihar.android.apg.provider.Database; import org.thialfihar.android.apg.provider.KeyRings; diff --git a/src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java b/src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java index b875f2eef..773a5b727 100644 --- a/src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java +++ b/src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java @@ -26,7 +26,7 @@ public class ImportFromQRCodeActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntentIntegrator.initiateScan(this); + new IntentIntegrator(this).initiateScan(); } private void importAndSign(final long keyId, final String expectedFingerprint) { diff --git a/src/org/thialfihar/android/apg/SecretKeyListActivity.java b/src/org/thialfihar/android/apg/SecretKeyListActivity.java index 87005510a..d160042fc 100644 --- a/src/org/thialfihar/android/apg/SecretKeyListActivity.java +++ b/src/org/thialfihar/android/apg/SecretKeyListActivity.java @@ -108,7 +108,8 @@ public class SecretKeyListActivity extends KeyListActivity implements OnChildCli long keyId = ((KeyListAdapter) mList.getExpandableListAdapter()).getGroupId(mSelectedItem); String msg = keyId + "," + Apg.getFingerPrint(keyId);; - IntentIntegrator.shareText(this, msg); + + new IntentIntegrator(this).shareText(msg); } default: { |