From 7a2e1e42d960f53a30c9b0ed2a050d1378c14cd9 Mon Sep 17 00:00:00 2001
From: Dominik <dominik@dominikschuermann.de>
Date: Fri, 9 Mar 2012 12:13:28 +0100
Subject: fixing qrcode integration

---
 src/org/thialfihar/android/apg/Apg.java                      | 2 ++
 src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java | 2 +-
 src/org/thialfihar/android/apg/SecretKeyListActivity.java    | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/org/thialfihar')

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: {
-- 
cgit v1.2.3