Merge remote-tracking branch 'upstream/main'

AndroidManifest.xml

@@ -152,6 +152,14 @@
                 tools:ignore="AppLinkUrlError" />
         </intent-filter>
 
+        <intent-filter android:autoVerify="true">
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https"
+                  android:host="i.delta.chat" />
+        </intent-filter>
+
         <meta-data android:name="com.sec.minimode.icon.portrait.normal"
                    android:resource="@mipmap/ic_launcher" />
         <meta-data android:name="com.sec.minimode.icon.landscape.normal"

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/ubuntu:18.04
+FROM docker.io/debian:12.4
 
 # Install Android Studio requirements
 # See https://developer.android.com/studio/install#linux
@@ -7,7 +7,7 @@ RUN apt-get update -y \
 wget \
 curl \
 unzip \
-openjdk-11-jre \
+openjdk-17-jre \
 file \
 build-essential \
 && rm -rf /var/lib/apt/lists/*

src/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -80,6 +80,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 {
   private static final String TAG = ConversationListActivity.class.getSimpleName();
   private static final String OPENPGP4FPR = "openpgp4fpr";
+  private static final String INVITE_PAGE = "i.delta.chat";
   private static final String NDK_ARCH_WARNED = "ndk_arch_warned";
   public static final String CLEAR_NOTIFICATIONS = "clear_notifications";
   public static final String ACCOUNT_ID_EXTRA = "account_id";
@@ -389,11 +390,18 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     if (getIntent() != null &&
             Intent.ACTION_VIEW.equals(getIntent().getAction())) {
       Uri uri = getIntent().getData();
-      if (uri != null && uri.getScheme().equalsIgnoreCase(OPENPGP4FPR)) {
-        String uriString = uri.toString();
-        uriString = uriString.replaceFirst(OPENPGP4FPR, OPENPGP4FPR.toUpperCase());
+      if (uri == null) {
+        return;
+      }
+
+      if (uri.getScheme().equalsIgnoreCase(OPENPGP4FPR)) {
+        String uriString = uri.toString().replaceFirst(OPENPGP4FPR, OPENPGP4FPR.toUpperCase());
         QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
         qrCodeHandler.handleQrData(uriString);
+      } else if (INVITE_PAGE.equals(uri.getHost()) && uri.getEncodedFragment() != null) {
+        String data = OPENPGP4FPR.toUpperCase() + ":" + uri.getEncodedFragment().replaceFirst("&", "#");
+        QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
+        qrCodeHandler.handleQrData(data);
       }
     }
   }

src/org/thoughtcrime/securesms/reactions/AddReactionView.java

@@ -59,10 +59,6 @@ public class AddReactionView extends LinearLayout {
     public void show(DcMsg msgToReactTo, View parentView, AddReactionListener listener) {
         init(); // init delayed as needed
 
-        if (!Prefs.getBooleanPreference(context, "pref_send_reactions", true)) {
-            return;
-        }
-
         if ( msgToReactTo.isInfo()
           || msgToReactTo.getType() == DcMsg.DC_MSG_VIDEOCHAT_INVITATION
           || !dcContext.getChat(msgToReactTo.getChatId()).canSend()) {