diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-02-15 19:10:45 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-02-15 19:10:45 +0100 |
commit | 34425f2bd30e73027329dd51d32822382d889acd (patch) | |
tree | 3a402dfea0291b2748c429cfca1b3808614d7fb0 /src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java | |
parent | b5a498fd1f9749166012b90b204772e129bda002 (diff) |
integrate intent integrator to finish activity when needed
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java b/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java index ad289658a..f636907cf 100644 --- a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java +++ b/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java @@ -4,14 +4,13 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; -import com.google.zxing.integration.android.IntentIntegrator; -import com.google.zxing.integration.android.IntentResult; - import java.util.Arrays; import java.util.List; import de.pixart.messenger.persistance.DatabaseBackend; import de.pixart.messenger.utils.XmppUri; +import de.pixart.messenger.utils.zxing.IntentIntegrator; +import de.pixart.messenger.utils.zxing.IntentResult; import de.pixart.messenger.xmpp.jid.Jid; public class UriHandlerActivity extends Activity { @@ -91,8 +90,7 @@ public class UriHandlerActivity extends Activity { @Override public void onActivityResult(int requestCode, int resultCode, Intent intent) { if ((requestCode & 0xFFFF) == IntentIntegrator.REQUEST_CODE) { - IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, - intent); + IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent); if (scanResult != null && scanResult.getFormatName() != null) { String data = scanResult.getContents(); |