aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-09-07 17:13:10 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-09-07 17:13:10 +0200
commit5fe3f207d407543b13652c4a3c31bf8f9f9690a5 (patch)
treefcc6f60fbb916c1191cb7f93c5c1736f6d416ac3 /src/eu/siacs/conversations
parent90947597e5a89e2adc6c75d52c8458ee153ee163 (diff)
parentf4d86ecff38b4c9d8df97999fe3e252eb9a165af (diff)
Merge pull request #426 from betheg/remove_strings
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
Diffstat (limited to 'src/eu/siacs/conversations')
-rw-r--r--src/eu/siacs/conversations/crypto/OtrEngine.java2
-rw-r--r--src/eu/siacs/conversations/ui/XmppActivity.java1
2 files changed, 0 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/crypto/OtrEngine.java b/src/eu/siacs/conversations/crypto/OtrEngine.java
index b23b31fe..07430140 100644
--- a/src/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/eu/siacs/conversations/crypto/OtrEngine.java
@@ -14,14 +14,12 @@ import java.security.spec.InvalidKeySpecException;
import org.json.JSONException;
import org.json.JSONObject;
-import android.content.Context;
import android.util.Log;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.persistance.DatabaseBackend;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
diff --git a/src/eu/siacs/conversations/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java
index 6ff83357..a2567176 100644
--- a/src/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/eu/siacs/conversations/ui/XmppActivity.java
@@ -36,7 +36,6 @@ import android.os.IBinder;
import android.text.InputType;
import android.util.DisplayMetrics;
import android.util.Log;
-import android.view.Gravity;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.InputMethodManager;