diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 8764132f3..246c3550b 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -1272,11 +1272,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isProtected(JNIEnv *env, jobje return dc_chat_is_protected(get_dc_chat(env, obj))!=0; } -JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isProtectionBroken(JNIEnv *env, jobject obj) -{ - return dc_chat_is_protection_broken(get_dc_chat(env, obj))!=0; -} - JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isSendingLocations(JNIEnv *env, jobject obj) { diff --git a/src/main/java/com/b44t/messenger/DcChat.java b/src/main/java/com/b44t/messenger/DcChat.java index b98d49879..b4db76c5c 100644 --- a/src/main/java/com/b44t/messenger/DcChat.java +++ b/src/main/java/com/b44t/messenger/DcChat.java @@ -45,7 +45,6 @@ public class DcChat { public native boolean isDeviceTalk (); public native boolean canSend (); public native boolean isProtected (); - public native boolean isProtectionBroken(); public native boolean isSendingLocations(); public native boolean isMuted (); public native boolean isContactRequest (); @@ -70,7 +69,7 @@ public class DcChat { } public boolean isHalfBlocked() { - return isProtectionBroken() || isContactRequest(); + return isContactRequest(); } // working with raw c-data diff --git a/src/main/java/com/b44t/messenger/DcMsg.java b/src/main/java/com/b44t/messenger/DcMsg.java index dc7c700b8..ebea2f682 100644 --- a/src/main/java/com/b44t/messenger/DcMsg.java +++ b/src/main/java/com/b44t/messenger/DcMsg.java @@ -33,9 +33,9 @@ public class DcMsg { public final static int DC_INFO_LOCATION_ONLY = 9; public final static int DC_INFO_EPHEMERAL_TIMER_CHANGED = 10; public final static int DC_INFO_PROTECTION_ENABLED = 11; - public final static int DC_INFO_PROTECTION_DISABLED = 12; public final static int DC_INFO_INVALID_UNENCRYPTED_MAIL = 13; public final static int DC_INFO_WEBXDC_INFO_MESSAGE = 32; + public final static int DC_INFO_CHAT_E2EE = 50; public final static int DC_STATE_UNDEFINED = 0; public final static int DC_STATE_IN_FRESH = 10; diff --git a/src/main/java/org/thoughtcrime/securesms/BaseConversationItem.java b/src/main/java/org/thoughtcrime/securesms/BaseConversationItem.java index 6c14bc3c8..8ead4bed5 100644 --- a/src/main/java/org/thoughtcrime/securesms/BaseConversationItem.java +++ b/src/main/java/org/thoughtcrime/securesms/BaseConversationItem.java @@ -81,7 +81,7 @@ public abstract class BaseConversationItem extends LinearLayout protected boolean shouldInterceptClicks(DcMsg messageRecord) { return batchSelected.isEmpty() && (messageRecord.isFailed() - || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_DISABLED + || messageRecord.getInfoType() == DcMsg.DC_INFO_CHAT_E2EE || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED || messageRecord.getInfoType() == DcMsg.DC_INFO_INVALID_UNENCRYPTED_MAIL); } @@ -129,9 +129,7 @@ public abstract class BaseConversationItem extends LinearLayout .setPositiveButton(R.string.ok, null) .create(); d.show(); - } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_DISABLED) { - DcHelper.showVerificationBrokenDialog(context, conversationRecipient.getName()); - } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED) { + } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_CHAT_E2EE || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED) { DcHelper.showProtectionEnabledDialog(context); } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_INVALID_UNENCRYPTED_MAIL) { DcHelper.showInvalidUnencryptedDialog(context); diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 0208e06b0..74500bad9 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -1623,15 +1623,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity }); - if (dcChat.isProtectionBroken()) { - messageRequestBottomView.setBlockText(R.string.more_info_desktop); - String name = dcContext.getContact(recipient.getDcContact().getId()).getDisplayName(); - messageRequestBottomView.setBlockOnClickListener(v -> DcHelper.showVerificationBrokenDialog(this, name)); - - messageRequestBottomView.setQuestion(getString(R.string.chat_protection_broken, name)); - messageRequestBottomView.setAcceptText(R.string.ok); - - } else if (dcChat.getType() == DcChat.DC_CHAT_TYPE_GROUP) { + if (dcChat.getType() == DcChat.DC_CHAT_TYPE_GROUP) { // We don't support blocking groups yet, so offer to delete it instead messageRequestBottomView.setBlockText(R.string.delete); messageRequestBottomView.setBlockOnClickListener(v -> handleDeleteChat()); diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationUpdateItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationUpdateItem.java index afe25dc8b..858e21eb7 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationUpdateItem.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationUpdateItem.java @@ -116,9 +116,6 @@ public class ConversationUpdateItem extends BaseConversationItem if (infoType == DcMsg.DC_INFO_PROTECTION_ENABLED) { verifiedIcon.setVisibility(VISIBLE); verifiedIcon.setImageResource(R.drawable.ic_verified); - } else if (infoType == DcMsg.DC_INFO_PROTECTION_DISABLED) { - verifiedIcon.setVisibility(VISIBLE); - verifiedIcon.setImageResource(R.drawable.ic_verified_broken); } else { verifiedIcon.setVisibility(GONE); } diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index 54f7b1316..12c2646ba 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -464,16 +464,6 @@ public class DcHelper { } } - public static void showVerificationBrokenDialog(Context context, String name) { - new AlertDialog.Builder(context) - .setMessage(context.getString(R.string.chat_protection_broken_explanation, name)) - .setNeutralButton(R.string.learn_more, (d, w) -> openHelp(context, "#nocryptanymore")) - .setNegativeButton(R.string.qrscan_title, (d, w) -> context.startActivity(new Intent(context, QrActivity.class))) - .setPositiveButton(R.string.ok, null) - .setCancelable(true) - .show(); - } - public static void showProtectionEnabledDialog(Context context) { new AlertDialog.Builder(context) .setMessage(context.getString(R.string.chat_protection_enabled_explanation)) diff --git a/src/main/res/drawable/ic_verified_broken.xml b/src/main/res/drawable/ic_verified_broken.xml deleted file mode 100644 index 170164366..000000000 --- a/src/main/res/drawable/ic_verified_broken.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1c55836f3..bcda0cd13 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -972,7 +972,7 @@ You set disappearing messages timer to %1$s weeks. Disappearing messages timer set to %1$s weeks by %2$s. - + %1$s sent a message from another device. Messages are end-to-end encrypted. Tap to learn more. All messages in this chat are end-to-end encrypted.\n\nEnd-to-end encryption keeps messages private between you and your chat partners. Not even servers, providers or relays can read them.