diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-09-06 18:21:31 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-09-06 18:21:31 +0200 |
commit | 0e5a0a07fd32d185d2d4c43df9494fafcace9208 (patch) | |
tree | e51be0fc1b2cf156327274a66589f2709c9f1e09 /src/eu/siacs/conversations/entities/Account.java | |
parent | dc0213710640911a796880fcd68a75d2b576918d (diff) |
made otr a little bit more solid when there is no presence subscription
Diffstat (limited to 'src/eu/siacs/conversations/entities/Account.java')
-rw-r--r-- | src/eu/siacs/conversations/entities/Account.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java index 272cf3797..eacd172c6 100644 --- a/src/eu/siacs/conversations/entities/Account.java +++ b/src/eu/siacs/conversations/entities/Account.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import eu.siacs.conversations.R; import eu.siacs.conversations.crypto.OtrEngine; import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.utils.UIHelper; import eu.siacs.conversations.xmpp.XmppConnection; import android.content.ContentValues; @@ -230,7 +231,7 @@ public class Account extends AbstractEntity { cursor.getString(cursor.getColumnIndex(AVATAR))); } - public OtrEngine getOtrEngine(Context context) { + public OtrEngine getOtrEngine(XmppConnectionService context) { if (otrEngine == null) { otrEngine = new OtrEngine(context, this); } @@ -283,8 +284,8 @@ public class Account extends AbstractEntity { this.rosterVersion = version; } - public String getOtrFingerprint(Context applicationContext) { - this.getOtrEngine(applicationContext); + public String getOtrFingerprint(XmppConnectionService service) { + this.getOtrEngine(service); return this.getOtrFingerprint(); } |