aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-12-16 17:12:26 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-12-16 17:12:26 +0100
commit87746ca2ba62bc5e2893e4e6626e92ce87d6b15a (patch)
tree094ff0dfaaebe575c76fcc69082dc48d318b3a9e /src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
parentda914ba09c95d4a66c06ff244d27035351001054 (diff)
remove own fetch errors from device announcement
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/OmemoActivity.java (renamed from src/main/java/eu/siacs/conversations/OmemoActivity.java)4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/OmemoActivity.java b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
index c0c7b298..8ce8c14d 100644
--- a/src/main/java/eu/siacs/conversations/OmemoActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations;
+package eu.siacs.conversations.ui;
import android.app.AlertDialog;
import android.content.DialogInterface;
@@ -19,6 +19,8 @@ import com.google.zxing.integration.android.IntentResult;
import java.security.cert.X509Certificate;
import java.util.Arrays;
+import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
import eu.siacs.conversations.entities.Account;