diff --git a/res/values/strings.xml b/res/values/strings.xml
index b5c279867..bb7e660a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -864,6 +864,8 @@
It is now guaranteed that 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 your email provider can read them.
%1$s sent a message from another device. Tap to learn more.
End-to-end encryption cannot be guaranteed anymore, likely because %1$s reinstalled Delta Chat or sent a message from another device.\n\nYou may meet them in person and scan their QR code again to reestablish guaranteed end-to-end encryption.
+ ⚠️ %1$s requires end-to-end encryption which is not setup for this chat yet. Tap to learn more.
+ To establish end-to-end-encryption, you may meet contacts in person and scan their QR Code to introduce them.
Learn More
You deleted the \"Saved messages\" chat.\n\nℹ️ To use the \"Saved messages\" feature again, create a new chat with yourself.
diff --git a/src/com/b44t/messenger/DcMsg.java b/src/com/b44t/messenger/DcMsg.java
index 7f783441b..31999c1c6 100644
--- a/src/com/b44t/messenger/DcMsg.java
+++ b/src/com/b44t/messenger/DcMsg.java
@@ -33,6 +33,7 @@ public class DcMsg {
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_STATE_UNDEFINED = 0;
diff --git a/src/org/thoughtcrime/securesms/BaseConversationItem.java b/src/org/thoughtcrime/securesms/BaseConversationItem.java
index 415184597..986e4ba9f 100644
--- a/src/org/thoughtcrime/securesms/BaseConversationItem.java
+++ b/src/org/thoughtcrime/securesms/BaseConversationItem.java
@@ -82,7 +82,8 @@ public abstract class BaseConversationItem extends LinearLayout
return batchSelected.isEmpty()
&& (messageRecord.isFailed()
|| messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_DISABLED
- || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED);
+ || messageRecord.getInfoType() == DcMsg.DC_INFO_PROTECTION_ENABLED
+ || messageRecord.getInfoType() == DcMsg.DC_INFO_INVALID_UNENCRYPTED_MAIL);
}
protected void onAccessibilityClick() {}
@@ -132,6 +133,8 @@ public abstract class BaseConversationItem extends LinearLayout
DcHelper.showVerificationBrokenDialog(context, conversationRecipient.getName());
} else if (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/org/thoughtcrime/securesms/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java
index 6025336e3..55997db08 100644
--- a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java
@@ -53,6 +53,9 @@ public class ConversationUpdateItem extends BaseConversationItem
bodyText.setOnLongClickListener(passthroughClickListener);
bodyText.setOnClickListener(passthroughClickListener);
+ // info messages do not contain links but domains (eg. invalid_unencrypted_tap_to_learn_more),
+ // however, they should not be linkified to not disturb eg. "Tap to learn more".
+ bodyText.setAutoLinkMask(0);
}
@Override
diff --git a/src/org/thoughtcrime/securesms/connect/DcHelper.java b/src/org/thoughtcrime/securesms/connect/DcHelper.java
index 9ee61a6a3..6e7aa3368 100644
--- a/src/org/thoughtcrime/securesms/connect/DcHelper.java
+++ b/src/org/thoughtcrime/securesms/connect/DcHelper.java
@@ -255,6 +255,7 @@ public class DcHelper {
dcContext.setStockTranslation(172, context.getString(R.string.chat_new_group_hint));
dcContext.setStockTranslation(173, context.getString(R.string.member_x_added));
+ dcContext.setStockTranslation(174, context.getString(R.string.invalid_unencrypted_tap_to_learn_more));
}
public static File getImexDir() {
@@ -469,6 +470,16 @@ public class DcHelper {
.show();
}
+ public static void showInvalidUnencryptedDialog(Context context) {
+ new AlertDialog.Builder(context)
+ .setMessage(context.getString(R.string.invalid_unencrypted_explanation))
+ .setNeutralButton(R.string.learn_more, (d, w) -> openHelp(context, "#howtoe2ee"))
+ .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 openHelp(Context context, String section) {
Intent intent = new Intent(context, LocalHelpActivity.class);
if (section != null) { intent.putExtra(LocalHelpActivity.SECTION_EXTRA, section); }