diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
| commit | 409fdd8596f217e6f4101064342273268425edfb (patch) | |
| tree | f3a50eb54c0e88bce33e34347f6dfe325917e089 /src/eu/siacs/conversations/crypto/OtrEngine.java | |
| parent | 449c2a544b48a2b9adf0df094eb1ac0d49531ebe (diff) | |
| parent | 5fe3f207d407543b13652c4a3c31bf8f9f9690a5 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/crypto/OtrEngine.java')
| -rw-r--r-- | src/eu/siacs/conversations/crypto/OtrEngine.java | 2 |
1 files changed, 0 insertions, 2 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; |