From 1396882c73b293abd775ffd8e896d0254480cc46 Mon Sep 17 00:00:00 2001 From: Eiron Rabbit Date: Sat, 21 Jul 2018 01:14:30 -0400 Subject: [PATCH] turn encryption off by default for groups --- .../messenger/service/adapters/ChatSessionAdapter.java | 3 +-- .../main/java/org/awesomeapp/messenger/ui/MessageListItem.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/awesomeapp/messenger/service/adapters/ChatSessionAdapter.java b/app/src/main/java/org/awesomeapp/messenger/service/adapters/ChatSessionAdapter.java index 42054ecdb..d98e00f50 100644 --- a/app/src/main/java/org/awesomeapp/messenger/service/adapters/ChatSessionAdapter.java +++ b/app/src/main/java/org/awesomeapp/messenger/service/adapters/ChatSessionAdapter.java @@ -140,10 +140,9 @@ public class ChatSessionAdapter extends org.awesomeapp.messenger.service.IChatSe private boolean mAcceptAllTransfer = true;//TODO set this via preference, but default true private String mLastFileUrl = null; - private long mContactId; private boolean mIsMuted = false; - private boolean mEnableOmemoGroups = true; + private boolean mEnableOmemoGroups = false; private String mNickname = null; public ChatSessionAdapter(ChatSession chatSession, ImEntity participant, ImConnectionAdapter connection, boolean isNewSession) { diff --git a/app/src/main/java/org/awesomeapp/messenger/ui/MessageListItem.java b/app/src/main/java/org/awesomeapp/messenger/ui/MessageListItem.java index cf8aabeda..66b72582f 100644 --- a/app/src/main/java/org/awesomeapp/messenger/ui/MessageListItem.java +++ b/app/src/main/java/org/awesomeapp/messenger/ui/MessageListItem.java @@ -362,6 +362,7 @@ else if (!TextUtils.isEmpty(lastMessage)) mHolder.mTextViewForTimestamp.setText(""); } + if (linkify) LinkifyHelper.addLinks(mHolder.mTextViewForMessages, new URLSpanConverter());