aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-03-01 12:22:20 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-03-01 12:22:20 +0100
commitfd246f7e5aa6fa1012c22fa33cd87915260a10cb (patch)
tree46d10d5f0500432baac7f20855278aefd96b5b4c /src/main/java/eu/siacs
parentab4d86dde7271bef6dac5b9b5609f039bae97c27 (diff)
properly persist accepted crypto targets
Diffstat (limited to 'src/main/java/eu/siacs')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
index 9bccca78..cc4ba7b2 100644
--- a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
@@ -10,8 +10,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
-import android.util.Log;
-
import org.whispersystems.libaxolotl.IdentityKey;
import java.util.ArrayList;
@@ -20,7 +18,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
@@ -301,9 +298,8 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
}
}
if (mConversation != null && mConversation.getMode() == Conversation.MODE_MULTI) {
- Log.d(Config.LOGTAG,"commiting accepted crypto targets: "+acceptedTargets);
mConversation.setAcceptedCryptoTargets(acceptedTargets);
- //xmppConnectionService.updateConversation(mConversation);
+ xmppConnectionService.updateConversation(mConversation);
}
}