diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index be434731c..bc9f9cff8 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -1022,8 +1022,7 @@ JNIEXPORT jint Java_com_b44t_messenger_DcChat_getId(JNIEnv *env, jobject obj) JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isGroup(JNIEnv *env, jobject obj) { - int chat_type = dc_chat_get_type(get_dc_chat(env, obj)); - return (chat_type==DC_CHAT_TYPE_GROUP || chat_type==DC_CHAT_TYPE_VERIFIED_GROUP); + return dc_chat_get_type(get_dc_chat(env, obj)) == DC_CHAT_TYPE_GROUP; } @@ -1081,9 +1080,9 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_canSend(JNIEnv *env, jobject o } -JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isVerified(JNIEnv *env, jobject obj) +JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isProtected(JNIEnv *env, jobject obj) { - return dc_chat_is_verified(get_dc_chat(env, obj))!=0; + return dc_chat_is_protected(get_dc_chat(env, obj))!=0; } diff --git a/src/com/b44t/messenger/DcChat.java b/src/com/b44t/messenger/DcChat.java index 326d51277..cc1325e6d 100644 --- a/src/com/b44t/messenger/DcChat.java +++ b/src/com/b44t/messenger/DcChat.java @@ -32,7 +32,7 @@ public class DcChat { public native boolean isSelfTalk (); public native boolean isDeviceTalk (); public native boolean canSend (); - public native boolean isVerified (); + public native boolean isProtected (); public native boolean isSendingLocations(); public native boolean isMuted (); diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java index 794a149c5..f6f3999bc 100644 --- a/src/org/thoughtcrime/securesms/ConversationListItem.java +++ b/src/org/thoughtcrime/securesms/ConversationListItem.java @@ -190,7 +190,7 @@ public class ConversationListItem extends RelativeLayout fromView.setCompoundDrawablesWithIntrinsicBounds( thread.isMuted()? R.drawable.ic_volume_off_grey600_18dp : 0, 0, - thread.isVerified()? R.drawable.ic_verified : 0, + thread.isProtected()? R.drawable.ic_verified : 0, 0); } diff --git a/src/org/thoughtcrime/securesms/ConversationTitleView.java b/src/org/thoughtcrime/securesms/ConversationTitleView.java index 321ce9012..1aed7be7b 100644 --- a/src/org/thoughtcrime/securesms/ConversationTitleView.java +++ b/src/org/thoughtcrime/securesms/ConversationTitleView.java @@ -97,7 +97,7 @@ public class ConversationTitleView extends RelativeLayout { if (Prefs.isChatMuted(dcChat)) { imgLeft = R.drawable.ic_volume_off_white_18dp; } - if (dcChat.isVerified()) { + if (dcChat.isProtected()) { imgRight = R.drawable.ic_verified; } diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java index 544089c77..40d38704f 100644 --- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -259,7 +259,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity private void editAvatar() { Intent intent = new Intent(this, GroupCreateActivity.class); intent.putExtra(GroupCreateActivity.EDIT_GROUP_CHAT_ID, editAvatarChatId); - if (dcContext.getChat(editAvatarChatId).isVerified()) { + if (dcContext.getChat(editAvatarChatId).isProtected()) { intent.putExtra(GroupCreateActivity.GROUP_CREATE_VERIFIED_EXTRA, true); } startActivity(intent); diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java index 6c92c31dd..6c7f5f36d 100644 --- a/src/org/thoughtcrime/securesms/ProfileActivity.java +++ b/src/org/thoughtcrime/securesms/ProfileActivity.java @@ -425,7 +425,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity if (chatIsGroup) { Intent intent = new Intent(this, GroupCreateActivity.class); intent.putExtra(GroupCreateActivity.EDIT_GROUP_CHAT_ID, chatId); - if (dcContext.getChat(chatId).isVerified()) { + if (dcContext.getChat(chatId).isProtected()) { intent.putExtra(GroupCreateActivity.GROUP_CREATE_VERIFIED_EXTRA, true); } startActivity(intent); diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java index 959feef5a..849a0cde5 100644 --- a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java @@ -205,7 +205,7 @@ public class ProfileSettingsFragment extends Fragment public void onAddMember() { DcChat dcChat = dcContext.getChat(chatId); Intent intent = new Intent(getContext(), ContactMultiSelectionActivity.class); - intent.putExtra(ContactSelectionListFragment.SELECT_VERIFIED_EXTRA, dcChat.isVerified()); + intent.putExtra(ContactSelectionListFragment.SELECT_VERIFIED_EXTRA, dcChat.isProtected()); ArrayList preselectedContacts = new ArrayList<>(); int[] memberIds = dcContext.getChatContacts(chatId); for (int memberId : memberIds) { diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java index abefcc03c..f7c549f85 100644 --- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java +++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java @@ -324,11 +324,10 @@ public class ApplicationDcContext extends DcContext { Recipient recipient = getRecipient(chat); long date = summary.getTimestamp(); int unreadCount = getFreshMsgCount(chatId); - boolean verified = chat.isVerified(); return new ThreadRecord(body, recipient, date, unreadCount, chatId, - chat.getVisibility(), verified, chat.isSendingLocations(), chat.isMuted(), summary); + chat.getVisibility(), chat.isProtected(), chat.isSendingLocations(), chat.isMuted(), summary); } /*********************************************************************************************** diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java index 51d253a5b..da23a0efe 100644 --- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java @@ -44,7 +44,7 @@ public class ThreadRecord { private final int unreadCount; private final int visibility; - private final boolean verified; + private final boolean isProtected; private final boolean isSendingLocations; private final boolean isMuted; private @Nullable final DcLot dcSummary; @@ -53,7 +53,7 @@ public class ThreadRecord { @NonNull Recipient recipient, long dateReceived, int unreadCount, long threadId, int visibility, - boolean verified, + boolean isProtected, boolean isSendingLocations, boolean isMuted, @Nullable DcLot dcSummary) @@ -64,7 +64,7 @@ public class ThreadRecord { this.body = body; this.unreadCount = unreadCount; this.visibility = visibility; - this.verified = verified; + this.isProtected = isProtected; this.isSendingLocations = isSendingLocations; this.isMuted = isMuted; this.dcSummary = dcSummary; @@ -114,8 +114,8 @@ public class ThreadRecord { return visibility; } - public boolean isVerified() { - return verified; + public boolean isProtected() { + return isProtected; } public boolean isSendingLocations() {