aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-10-05 20:43:42 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2013-10-05 20:43:42 +0200
commit05cc2023daa57bfdb813e478ddb61c1b2f3156c4 (patch)
treeda2d163c9bf75ea95edd023ff6a842534b2851e2 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java
parentbef6977aade3a901ac17ed1e31de22c8de066921 (diff)
downloadopen-keychain-05cc2023daa57bfdb813e478ddb61c1b2f3156c4.tar.gz
open-keychain-05cc2023daa57bfdb813e478ddb61c1b2f3156c4.tar.bz2
open-keychain-05cc2023daa57bfdb813e478ddb61c1b2f3156c4.zip
Add parts of zxing library to generate qr codes
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java
index c6fb728bc..02d2e09da 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java
@@ -25,6 +25,7 @@ import org.sufficientlysecure.keychain.R;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentIntegratorSupportV4;
import android.content.Intent;
import android.os.Bundle;
@@ -70,7 +71,8 @@ public class ShareActivity extends SherlockFragmentActivity {
getResources().getText(R.string.shareKeyringWith)));
} else if (ACTION_SHARE_KEYRING_WITH_QR_CODE.equals(action)) {
// use barcode scanner integration library
- new IntentIntegrator(this).shareText(keyringArmored.get(0));
+// new IntentIntegrator(this).shareText(keyringArmored.get(0));
+// new IntentIntegratorSupportV4(this).shareText(activity, text);
}
}
}