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/TrustKeysActivity.java | |
parent | b5a498fd1f9749166012b90b204772e129bda002 (diff) |
integrate intent integrator to finish activity when needed
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java index 40b67d12f..853b1b2a4 100644 --- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java +++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java @@ -15,8 +15,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import com.google.zxing.integration.android.IntentIntegrator; - import org.whispersystems.libsignal.IdentityKey; import java.util.ArrayList; @@ -35,6 +33,7 @@ import de.pixart.messenger.entities.Account; import de.pixart.messenger.entities.Conversation; import de.pixart.messenger.utils.CryptoHelper; import de.pixart.messenger.utils.XmppUri; +import de.pixart.messenger.utils.zxing.IntentIntegrator; import de.pixart.messenger.xmpp.OnKeyStatusUpdated; import de.pixart.messenger.xmpp.jid.InvalidJidException; import de.pixart.messenger.xmpp.jid.Jid; |