update build.gradle

try to avoid FILL500 getting stuck in some devices

.github/workflows/preview-apk.yml

@@ -35,7 +35,7 @@ jobs:
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r23c
+          ndk-version: r27
 
       - name: Compile core
         env:

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r23c
+          ndk-version: r27
 
       - name: Compile core
         env:

CHANGELOG.md

@@ -1,6 +1,51 @@
 # ArcaneChat Android Changelog
 
-## v1.48.1
+## v1.50.3
+2024-12
+
+* Add in-chat apps picker to attachments options
+* Notify replies and reactions to your messages in muted chats (can be disabled in settings)
+* Cache HTTP GET requests (ex. when loading images from HTML messages)
+* update to core 1.152.0
+
+## v1.50.2
+2024-12
+
+* Encrypt notification tokens
+* update to core 1.151.5
+
+## v1.50.0
+2024-12
+
+* New emoji picker with support for more emojis
+* Webxdc apps can now trigger notifications
+* Webxdc apps can now deep-link to internal sections when you click their info-messages in chat
+* Add "Show in Chat" to the menu of opened Webxdc apps
+* Reverse order of messages in the notification group
+* Notify reactions to own messages
+* Improve the button to start Webxdc apps
+* Make account deletion confirmation dialog faster
+* Rename "Back up Chats to External Storage" to "Export Backup"
+* Improve compatibility with classic email clients in the outgoing messages
+* Removed internal font scaling setting in favor of the better system settings
+* Use privacy-preserving webxdc addresses
+* Use Rustls for connections with strict TLS
+* QR codes for adding contacts and joining groups provide help when opened in a normal browser
+* Mark Saved Messages chat as protected
+* Allow the user to replace maps integration
+* fix: Trim whitespace from scanned QR codes
+* fix quotes: Line-before-quote may be up to 120 character long instead of 80
+* fix: Prevent accidental wrong-password-notifications
+* fix: Remove footers from "Show Full Message..."
+* fix: Only add "member added/removed" messages if they actually do that
+* fix: Update state of message when fully downloading it
+* fix: send message: Do not fail if the message does not exist anymore
+* fix: Do not percent-encode dot when passing to autoconfig server (so, fix handling of some servers)
+* fix displaynames not being updated when intially scanned by a QR code
+* several bug fixes
+* update to core 1.151.3
+
+## v1.48.3
 2024-10
 
 * new Proxy settings screen available at "Advanced / Proxy"
@@ -10,6 +55,8 @@
 * scan Proxies' QR code and use them
 * make Proxy URLs inside Delta Chat tappable
 * open Delta Chat when tapping Proxy URLs in other apps
+* support for realtime webxdc apps moved out of experimental and enabled by default
+* realtime webxdc apps can be disabled at "Settings / Advanced"
 * "New Contact / Link" button to view, share or copy the invite line
 * "New Contact / Scan" button to easier access the scanner functionality
 * open "New Contact" scan/show activities directly, do not try to be too smart and open the last active tab
@@ -44,8 +91,10 @@
 * assign messages to ad-hoc group with matching name and members
 * use stricter TLS checks for HTTPS downloads (images in HTML mails, Autoconfig)
 * improve logging for failed QR code scans, AEAP, Autocrypt, notification permissions and sending errors
+* improve logging of multi account setup (log account ID)
 * show more context for the "Cannot establish guaranteed..." info message
-* show original file name in "Message Info"
+* show file name in "Message Info"
+* show root SMTP connection failure in connectivity view
 * fix: Sort received outgoing message down if it's fresher than all non fresh messages
 * fix: avoid app being killed when processing a PUSH notification
 * fix crash when refreshing avatar
@@ -65,8 +114,12 @@
 * fix: normalize proxy URLs
 * fix connections getting stuck in "Updating..." sometimes
 * fix scanning "add second device" QR code from scanner above chatlist
+* fix warning about wrong password
+* fix app getting stale when receiving a PUSH notifications takes longer
+* fix app getting stale on network changes
+* fix: skip IDLE if we got unsolicited FETCH
 * update translations and local help
-* update to core 1.148.4
+* update to core 1.148.6
 
 
 ## v1.46.14

Dockerfile

@@ -34,10 +34,10 @@ ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/bin
 # Install NDK manually. Other SDK parts are installed automatically by gradle.
 #
 # If you change the NDK version here, also change it in `flake.nix`.
-# NDK version r23c LTS aka 23.2.8568313
-RUN sdkmanager --sdk_root=${ANDROID_SDK_ROOT} 'ndk;23.2.8568313'
+# NDK version r27 LTS aka 27.0.11902837
+RUN sdkmanager --sdk_root=${ANDROID_SDK_ROOT} 'ndk;27.0.11902837'
 
-ENV ANDROID_NDK_ROOT ${ANDROID_SDK_ROOT}/ndk/23.2.8568313
+ENV ANDROID_NDK_ROOT ${ANDROID_SDK_ROOT}/ndk/27.0.11902837
 ENV PATH ${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none

RELEASE.md

@@ -48,7 +48,8 @@ the following steps are done in a PR called `prep-VERSION` (no leading "v"):
 6. build APKs:
    a) generate debug APK at "Build / Build Bundle(s)/APK / Build APK(s)"  
    b) generate release APK at "Build / Generate Signed Bundle or APK",
-      select "APK", add keys, flavor `gplayRelease`
+      select "APK", add keys, flavor `gplayRelease`.
+      this APK will go to the stores and is located at `gplay/release`
 
 
 ## Push Test Releases
@@ -79,16 +80,21 @@ only afterwards, push the APK to stores. **consider a blog post.**
 
 on <https://play.google.com/apps/publish/>:
 
-9. a) open "Delta Chat/Release/Production"
-      then "Create new release" and upload APK from above  
+9. a) open "Delta Chat / Test and release / Production"
+      then "Create new release" and upload APK from above
    b) fill out "Release details/Release notes" (500 chars), add the line
       "These features will roll out over the coming days. Thanks for using Delta Chat!";
       release name should be default ("123 (1.2.3)")  
-   c) click "Next", set "Rollout Percentage" to 1% (later 2%, 5%, 10%, 20%, 50%, 100%),
-      click "Save"
+   c) click "Next", set "Rollout Percentage" to 50%, click "Save"
    d) Go to "Publishing Overview", "Managed publishing" is usually off;
       click "Send change for review", confirm
 
+2 days later, change "Rollout Percentage" to 99%. Two more days later to 100%.
+Rollout is anyways slower in practise, however,
+only as long as we do not enter 100%, we can retract the version
+(Once we reach 100%, we have to submit a new version for approval.
+During these up to 4 days, sometimes longer, we cannot do anything on existing rollout)
+
 
 ## Tag for F-Droid and create Github release
 
@@ -111,9 +117,8 @@ on <https://developer.amazon.com/dashboard>:
 12. a) for "Delta Chat", select "Add upcoming version" on the left
     b) at "Step 1 / Existing file(s)" hit "Replace", upload the APK from above
     c) on the "Step 1" page, add "Release notes" from CHANGELOG.md, hit "Next"
-    d) on "Step 2" page: "Does your app collect or transfer user data to third parties?" -> No, then "Next"
-    e) on "Step 3" page: "Next"
-    f) on "Step 4" page: "Submit app"
+    d) on "Step 2" and "Step 3" pages, hit "Next"
+    e) on "Step 4" page: "Submit app"
 
 
 ## Release on Huawei AppGallery

build.gradle

@@ -29,12 +29,12 @@ android {
     //   > Task :stripFatDebugDebugSymbols
     //   Unable to strip the following libraries, packaging them as they are: libanimation-decoder-gif.so, libnative-utils.so.
     // See <https://issuetracker.google.com/issues/237187538> for details.
-    ndkVersion "23.2.8568313"
+    ndkVersion "27.0.12077973"
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 30000694
-        versionName "1.48.2"
+        versionCode 30000702
+        versionName "1.50.6"
 
         applicationId "chat.delta.lite"
         multiDexEnabled true
@@ -206,7 +206,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
     implementation 'androidx.work:work-runtime:2.9.1'
-    implementation 'androidx.emoji2:emoji2-emojipicker:1.4.0'
+    implementation 'androidx.emoji2:emoji2-emojipicker:1.5.0'
     implementation 'com.google.guava:guava:31.1-android'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1' // plays video and audio
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.1'

fastlane/metadata/android/en-US/full_description.txt

@@ -17,19 +17,21 @@ ArcaneChat is a Delta Chat client and was created with a focus on usability, goo
 <b>Main differences with official Delta Chat client:</b>
 
 <ul>
-<li>Basic markdown support (bold, italic, strike, etc.)</li>
+<li>Support for some markdown styles in text messages (bold, italic, strike, etc.)</li>
 <li>Support for displaying Telegram's animated stickers (.tgs files)</li>
 <li>Support for SVG images previews</li>
 <li>Multiple color themes/skins</li>
-<li>It is possible to disable accounts to completely disconnect them to save data/bandwidth</li>
+<li>It is possible to disable profiles to completely disconnect them saving data/bandwidth</li>
+<li>You can easily see the connection status of all your profiles in the profile switcher</li>
 <li>A videochat instance is set by default</li>
-<li>Replies to your messages in muted groups trigger notifications</li>
 <li>Location streaming feature enabled by default and extra option to share location for 12 hours</li>
+<li>Clicking on a message with a POI location, will open the POI on the map</li>
+<li>Last-seen status of contacts is shown in your contact list, like in WhatsApp, Telegram, etc.</li>
 <li>Videos are played in loop, useful for short GIF videos</li>
 <li>Verified icon is shown in the chat list for the "Device Messages" chat</li>
 <li>Voice messages have more aggressive compression in "worse quality" mode to save data plan</li>
 <li>Automatic download of messages limited to 640KB by default</li>
-<li>Account's display name is always shown in the app's title bar instead of the name of the app</li>
+<li>Profile's display name is always shown in the app's title bar instead of the name of the app</li>
 <li>Your avatar is visible to other users in Mailing Lists</li>
 <li>Can be selected as app to open .xdc files</li>
 <li>For mini-apps developers: there are some extra features in the WebXDC API, check https://github.com/ArcaneChat/android/#webxdc</li>

flake.lock

@@ -3,15 +3,15 @@
     "android": {
       "inputs": {
         "devshell": "devshell",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1710633978,
-        "narHash": "sha256-yemnwSvW7cdWtXGpivFA5jDO35rGPs6fqxlQ4l6ODXs=",
+        "lastModified": 1733948466,
+        "narHash": "sha256-o/uq/tU458Ykudi8Zk3sRga5iazkuSczt9wDOCUDOSU=",
         "owner": "tadfisher",
         "repo": "android-nixpkgs",
-        "rev": "e91fb3d8517538e5ad9b422c9a4f604b56008a9e",
+        "rev": "0bf99ffaea6a7c0948ae10cf2e40c2905e4e4d6b",
         "type": "github"
       },
       "original": {
@@ -22,18 +22,17 @@
     },
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "android",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1708939976,
-        "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=",
+        "lastModified": 1728330715,
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
         "type": "github"
       },
       "original": {
@@ -47,11 +46,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -65,47 +64,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -116,11 +79,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1733759999,
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
         "type": "github"
       },
       "original": {
@@ -132,11 +95,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1710889954,
-        "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=",
+        "lastModified": 1733749988,
+        "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b",
+        "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68",
         "type": "github"
       },
       "original": {
@@ -148,11 +111,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1706487304,
-        "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
+        "lastModified": 1728538411,
+        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
+        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
         "type": "github"
       },
       "original": {
@@ -165,22 +128,21 @@
     "root": {
       "inputs": {
         "android": "android",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1711073443,
-        "narHash": "sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0+c6Lcw=",
+        "lastModified": 1733970833,
+        "narHash": "sha256-sPEKtSaZk2CtfF9cdhtbY93S6qGq+d2PKI1fcoDfDaI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "eec55ba9fcde6be4c63942827247e42afef7fafe",
+        "rev": "f7f4c59ccdf1bec3f1547d27398e9589aa94e3e8",
         "type": "github"
       },
       "original": {
@@ -218,36 +180,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -17,10 +17,9 @@
           with sdkPkgs; [
             build-tools-33-0-1
             cmdline-tools-latest
-            ndk-bundle
             platform-tools
             platforms-android-34
-            ndk-23-2-8568313
+            ndk-27-0-11902837
           ]);
         rust-version = pkgs.lib.removeSuffix "\n"
           (builtins.readFile ./scripts/rust-toolchain);
@@ -28,7 +27,7 @@
         devShells.default = pkgs.mkShell {
           ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
           ANDROID_NDK_ROOT =
-            "${android-sdk}/share/android-sdk/ndk/23.2.8568313";
+            "${android-sdk}/share/android-sdk/ndk/27.0.11902837";
           buildInputs = [
             android-sdk
             pkgs.openjdk17

jni/dc_wrapper.c

@@ -7,57 +7,6 @@
 #include "deltachat-core-rust/deltachat-ffi/deltachat.h"
 
 
-#if __ANDROID_API__ == 16
-unsigned long getauxval(unsigned long type) {
-    return 0;
-}
-
-#include <sys/socket.h>
-#include <unistd.h>
-
-int sendmmsg(int sockfd, struct mmsghdr *msgvec, unsigned int vlen,
-             int flags)
-{
-    if (flags != 0) {
-        // Not supported by the fallback.
-        return -1;
-    }
-
-    if (vlen == 0) {
-        return 0;
-    }
-
-    ssize_t n = sendmsg(sockfd, &msgvec->msg_hdr, flags);
-    if (n == -1) {
-        return -1;
-    }
-
-    (*msgvec).msg_len = n;
-    return 1;
-}
-
-int recvmmsg(int sockfd, struct mmsghdr *msgvec, unsigned int vlen,
-             int flags, struct timespec *timeout)
-{
-    if (flags != 0) {
-        // Not supported by the fallback.
-        return -1;
-    }
-
-    if (vlen == 0) {
-        return 0;
-    }
-
-    int n = recvmsg(sockfd, &msgvec->msg_hdr, flags);
-    if (n == -1) {
-        return -1;
-    }
-    (*msgvec).msg_len = n;
-    return 1;
-}
-#endif
-
-
 static dc_msg_t* get_dc_msg(JNIEnv *env, jobject obj);
 
 
@@ -753,12 +702,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_resendMsgs(JNIEnv *env, job
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_DcContext_prepareMsg(JNIEnv *env, jobject obj, jint chat_id, jobject msg)
-{
-    return dc_prepare_msg(get_dc_context(env, obj), chat_id, get_dc_msg(env, msg));
-}
-
-
 JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendMsg(JNIEnv *env, jobject obj, jint chat_id, jobject msg)
 {
     return dc_send_msg(get_dc_context(env, obj), chat_id, get_dc_msg(env, msg));
@@ -780,12 +723,10 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendVideochatInvitation(JNIEnv
 }
 
 
-JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_sendWebxdcStatusUpdate(JNIEnv *env, jobject obj, jint msg_id, jstring payload, jstring descr)
+JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_sendWebxdcStatusUpdate(JNIEnv *env, jobject obj, jint msg_id, jstring payload)
 {
     CHAR_REF(payload);
-    CHAR_REF(descr);
-        jboolean ret = dc_send_webxdc_status_update(get_dc_context(env, obj), msg_id, payloadPtr, descrPtr) != 0;
-    CHAR_UNREF(descr);
+        jboolean ret = dc_send_webxdc_status_update(get_dc_context(env, obj), msg_id, payloadPtr, NULL) != 0;
     CHAR_UNREF(payload);
     return ret;
 }
@@ -1423,12 +1364,6 @@ JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getId(JNIEnv *env, jobject obj)
     return dc_msg_get_id(get_dc_msg(env, obj));
 }
 
-
-JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isOutgoing(JNIEnv *env, jobject obj)
-{
-    return (jboolean)(dc_msg_is_outgoing(get_dc_msg(env, obj))!=0);
-}
-
 JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getSenderColor(JNIEnv *env, jobject obj)
 {
   return dc_msg_get_sender_color(get_dc_msg(env, obj));
@@ -1626,15 +1561,18 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getWebxdcInfoJson(JNIEnv *env, j
 }
 
 
-JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isForwarded(JNIEnv *env, jobject obj)
+JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getWebxdcHref(JNIEnv *env, jobject obj)
 {
-    return dc_msg_is_forwarded(get_dc_msg(env, obj))!=0;
+    char* temp = dc_msg_get_webxdc_href(get_dc_msg(env, obj));
+        jstring ret = JSTRING_NEW(temp);
+    dc_str_unref(temp);
+    return ret;
 }
 
 
-JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isIncreation(JNIEnv *env, jobject obj)
+JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isForwarded(JNIEnv *env, jobject obj)
 {
-    return dc_msg_is_increation(get_dc_msg(env, obj))!=0;
+    return dc_msg_is_forwarded(get_dc_msg(env, obj))!=0;
 }
 
 
@@ -1714,6 +1652,21 @@ JNIEXPORT void Java_com_b44t_messenger_DcMsg_setFile(JNIEnv *env, jobject obj, j
 }
 
 
+JNIEXPORT void Java_com_b44t_messenger_DcMsg_forceSticker(JNIEnv *env, jobject obj)
+{
+    dc_msg_force_sticker(get_dc_msg(env, obj));
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getPOILocation(JNIEnv *env, jobject obj)
+{
+    char* temp = dc_msg_get_poi_location(get_dc_msg(env, obj));
+        jstring ret = JSTRING_NEW(temp);
+    dc_str_unref(temp);
+    return ret;
+}
+
+
 JNIEXPORT void Java_com_b44t_messenger_DcMsg_setDimension(JNIEnv *env, jobject obj, int width, int height)
 {
     dc_msg_set_dimension(get_dc_msg(env, obj), width, height);

scripts/create-local-help.sh

@@ -1 +1 @@
-../deltachat-pages/tools/create-local-help.py ../deltachat-pages/_site src/main/assets/help
+../deltachat-pages/tools/create-local-help.py ../deltachat-pages/result src/main/assets/help

scripts/ndk-make.sh

@@ -38,8 +38,6 @@
 #
 # If anything doesn't work, please open an issue!!
 
-"$(dirname "$0")/rebrand.sh"
-
 set -e
 echo "starting time: `date`"
 
@@ -77,9 +75,9 @@ if test -z "$NDK_HOST_TAG"; then
 fi
 
 TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
-export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang"
+export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi21-clang"
 export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-clang"
-export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang"
+export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android21-clang"
 export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang"
 
 export RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain")
@@ -125,7 +123,7 @@ unset CPATH
 
 if test -z $1 || test $1 = armeabi-v7a; then
     echo "-- cross compiling to armv7-linux-androideabi (arm) --"
-    TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
+    TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi21-clang" \
     TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
     cargo build $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi --features jsonrpc
@@ -143,7 +141,7 @@ fi
 
 if test -z $1 || test $1 = x86; then
     echo "-- cross compiling to i686-linux-android (x86) --"
-    TARGET_CC="$TOOLCHAIN/bin/i686-linux-android16-clang" \
+    TARGET_CC="$TOOLCHAIN/bin/i686-linux-android21-clang" \
     TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
     cargo build $RELEASEFLAG --target i686-linux-android -p deltachat_ffi --features jsonrpc
@@ -176,4 +174,7 @@ else
     rm -f ndkArch # Remove ndkArch, ignore if it doesn't exist
 fi
 
+"$(dirname "$0")/rebrand.sh"
+
+
 echo "ending time: `date`"

scripts/rust-toolchain

@@ -1 +1 @@
-1.77.0
+1.83.0

scripts/undo_rebrand.sh

@@ -4,3 +4,4 @@ find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/github.com
 find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/ArcaneChat/Delta Chat/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/github.com\/ArcaneChat/get.delta.chat/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/ArcaneChat/Delta Chat/g'
+sed -i 's/>Delta Chat</>ArcaneChat</g' ./src/main/res/values/strings.xml

scripts/update-core.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 set -e # stop on all errors
 
 git submodule update --init --recursive

scripts/upload-beta.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 VERSION=$1
 

scripts/upload-release.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 VERSION=$1
 

src/gplay/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java

@@ -28,11 +28,6 @@ public class FcmReceiveService extends FirebaseMessagingService {
   private static volatile String prefixedToken;
 
   public static void register(Context context) {
-    if (Build.VERSION.SDK_INT < 19) {
-      Log.w(TAG, "FCM not available on SDK < 19");
-      triedRegistering = true;
-      return;
-    }
 
     if (FcmReceiveService.prefixedToken != null) {
       Log.i(TAG, "FCM already registered");

src/main/AndroidManifest.xml

@@ -66,6 +66,10 @@
                android:resource="@xml/automotive_app_desc" />
     -->
 
+    <!-- Opt out of metrics collection: https://developer.android.com/develop/ui/views/layout/webapps/managing-webview#metrics -->
+    <meta-data android:name="android.webkit.WebView.MetricsOptOut"
+               android:value="true" />
+
     <activity android:name=".ShareActivity"
               android:theme="@android:style/Theme.Translucent.NoTitleBar"
               android:excludeFromRecents="true"
@@ -385,6 +389,11 @@
               android:exported="true">
     </activity>
 
+    <activity android:name=".WebxdcStoreActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+    </activity>
+
     <activity android:name=".FullMsgActivity"
         android:theme="@style/TextSecure.LightTheme"
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">

src/main/assets/help/cs/help.html

@@ -99,6 +99,7 @@
       <li><a href="#lze-delta-chat-používat-s-protonmail--tutanota--criptext">Lze Delta Chat používat s Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#mám-zájem-o-technické-podrobnosti-kde-najdu-víc">Mám zájem o technické podrobnosti. Kde najdu víc?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#jak-je-financován-vývoj-delta-chatu">Jak je financován vývoj Delta Chatu?</a></li>
     </ul>
   </li>
@@ -297,8 +298,7 @@ Archived chats remain accessible above the chat list or via search.</p>
   </li>
 </ul>
 
-<p>To archive or pin a chat, long tap (Android), use the chat’s menu (Android/Desktop) or swipe to the left (iOS);
-to mute a chat, use the chat’s menu (Android/Desktop) or the chat’s profile (iOS).</p>
+<p>To use the functions, long tap or right click a chat in the chat list.</p>
     
       <h3 id="what-does-the-green-dot-mean">
         
@@ -1309,6 +1309,12 @@ One device is not needed for the other to work.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Your system might have a “personal firewall”,
 which is known to cause problems (especially on Windows).
@@ -1425,6 +1431,7 @@ you only open attachments from senders you trust, and not from spammers.</li>
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1874,6 +1881,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>Dobrý začátek je <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="jak-je-financován-vývoj-delta-chatu">
         
         

src/main/assets/help/de/help.html

@@ -30,14 +30,14 @@
       <li><a href="#was-sind-push-benachrichtigungen-wie-kann-ich-nachrichten-sofort-erhalten">Was sind Push-Benachrichtigungen? Wie kann ich Nachrichten sofort erhalten?</a></li>
       <li><a href="#sind-push-benachrichtigungen-auf-ios-geräten-aktiviert-gibt-es-alternativen">Sind Push-Benachrichtigungen auf iOS-Geräten aktiviert? Gibt es Alternativen?</a></li>
       <li><a href="#android-push">Sind Push-Benachrichtigungen auf Android-Geräten aktiviert/erforderlich?</a></li>
-      <li><a href="#privacy-notifications">Wie privat sind Delta Chat Push-Benachrichtigungen?</a></li>
+      <li><a href="#privacy-notifications">Wie privat sind Delta-Chat-Push-Benachrichtigungen?</a></li>
       <li><a href="#warum-integriert-sich-delta-chat-in-zentralisierte-proprietäre-applegoogle-push-dienste">Warum integriert sich Delta Chat in zentralisierte, proprietäre Apple/Google-Push-Dienste?</a></li>
     </ul>
   </li>
   <li><a href="#verschlüsselung-und-sicherheit">Verschlüsselung und Sicherheit</a>
     <ul>
       <li><a href="#welche-standards-werden-für-die-ende-zu-ende-verschlüsselung-verwendet">Welche Standards werden für die Ende-zu-Ende-Verschlüsselung verwendet?</a></li>
-      <li><a href="#whene2e">Wie kann ich wissen, ob Nachrichten Ende-zu-Ende verschlüsselt sind?</a></li>
+      <li><a href="#whene2e">Wie kann ich wissen, ob Nachrichten Ende-zu-Ende-verschlüsselt sind?</a></li>
       <li><a href="#howtoe2ee">Wie kann ich garantierte Ende-zu-Ende-Verschlüsselung und grüne Häkchen erhalten?</a></li>
       <li><a href="#e2eeguarantee">Was bedeuten das “Grüne Häkchen” und die “garantierte Ende-zu-Ende-Verschlüsselung”?</a></li>
       <li><a href="#nocryptanymore">Ein Kontakt hat eine Nachricht von einem anderen Gerät gesendet”, was kann ich tun?</a></li>
@@ -65,10 +65,10 @@
       <li><a href="#kann-ich-delta-chat-auf-mehreren-geräten-zur-selben-zeit-verwenden">Kann ich Delta Chat auf mehreren Geräten zur selben Zeit verwenden?</a></li>
       <li><a href="#fehlersuche">Fehlersuche</a></li>
       <li><a href="#backup">Manueller Transfer</a></li>
-      <li><a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung">Gibt es Pläne für eine Delta Chat Web-Anwendung?</a></li>
+      <li><a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung">Gibt es Pläne für eine Delta-Chat-Web-Anwendung?</a></li>
     </ul>
   </li>
-  <li><a href="#webxdc">Webxdc Apps</a>
+  <li><a href="#webxdc">Webxdc-Apps</a>
     <ul>
       <li><a href="#wie-privat-sind-webxdc-apps">Wie privat sind Webxdc Apps?</a></li>
       <li><a href="#wo-bekomme-ich-webxdc-apps">Wo bekomme ich Webxdc Apps?</a></li>
@@ -99,6 +99,7 @@
       <li><a href="#ist-delta-chat-kompatibel-mit-protonmail--tutanota--criptext">Ist Delta Chat kompatibel mit Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">Wie kann ich mein Konto löschen?</a></li>
       <li><a href="#ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos">Ich bin an technischen Details interessiert. Gibt es hierzu weitere Infos?</a></li>
+      <li><a href="#wo-können-meine-freunde-delta-chat-finden">Wo können meine Freunde Delta Chat finden?</a></li>
       <li><a href="#wie-wird-delta-chat-finanziert">Wie wird Delta Chat finanziert?</a></li>
     </ul>
   </li>
@@ -152,7 +153,7 @@ auch wenn der Empfänger Delta Chat nicht benutzt.</p>
 die sofortige Push-Benachrichtigungen für iOS- und Android-Geräte bieten.</p>
   </li>
   <li>
-    <p>Durchgängige <a href="#multiple-accounts">Multi-Profil</a> und Multi-Geräte-Unterstützung auf allen Plattformen.</p>
+    <p>Durchgängige <a href="#multiple-accounts">Multi-Profil-</a> und Multi-Geräte-Unterstützung auf allen Plattformen.</p>
   </li>
   <li>
     <p>Interaktive <a href="https://webxdc.org/apps">Webanwendungen in Chats</a> für Spiele und für die Zusammenarbeit</p>
@@ -286,7 +287,7 @@ unter dem Text Ihrer Nachrichten.</p>
   </li>
 </ul>
 
-<p>Zum Archivieren oder Anheften, tippen Sie lange auf den Chat  (Android), verwenden Sie das Chatmenü (Android/Desktop) oder wischen Sie nach links (iOS); zum Stummschalten, verwenden Sie das Chatmenü (Android/Desktop) oder das Chatprofil (iOS).</p>
+<p>Um die Funktionen zu nutzen, lang auf einen Chat in der Chatliste tippen oder den Chat mit der rechten Maustaste anklicken.</p>
     
       <h3 id="was-bedeutet-der-grüne-punkt">
         
@@ -303,7 +304,7 @@ unter dem Text Ihrer Nachrichten.</p>
       <li>entweder weil der Kontakt Ihnen direkt eine Nachricht gesendet hat,</li>
       <li>weil der Kontakt etwas an eine Gruppe geschrieben hat, in der sie beide Mitglied sind,</li>
       <li>weil der Kontakt Ihnen eine Lesebestätigung für eine von Ihnen geschriebene Nachricht gesendet hat</li>
-      <li>oder weil der Kontakt Daten mithilfe einer <a href="#webxdc">Webxdc App</a> an Ihre Delta Chat-App gesendet hat.</li>
+      <li>oder weil der Kontakt Daten mithilfe einer <a href="#webxdc">Webxdc-App</a> an Ihre Delta-Chat-App gesendet hat.</li>
     </ul>
   </li>
   <li>Dies ist also kein Echtzeit-Online-Status - und wenn jemand nicht sofort antwortet, obwohl er online zu sein scheint, machen Sie sich keine Sorgen und geben Sie ihm etwas Raum. ;-)</li>
@@ -486,7 +487,7 @@ und Benachrichtigungen auf dem Telefon des Nutzers anzeigen kann.</p>
     <p>iOS-Geräten, durch die Integration mit den Apple-Push-Diensten.</p>
   </li>
   <li>
-    <p>Android-Geräten, durch die Integration des Google FCM Push-Dienste,
+    <p>Android-Geräten, durch die Integration des Google-FCM-Push-Dienstes,
 auch auf Geräten, die <a href="https://microg.org">microG</a>
 anstelle von proprietärem Google-Code auf dem Telefon.</p>
   </li>
@@ -517,7 +518,7 @@ keine Daten an Apple weitergibt, die Apple nicht bereits hat.</p>
         
       </h3>
 
-<p>Wenn ein „Push-Service“ verfügbar ist, aktiviert Delta Chat Push-Benachrichtigungen
+<p>Wenn ein „Push-Service“ verfügbar ist, aktiviert Delta Chat Push-Benachrichtigungen,
 um eine sofortige Nachrichtenzustellung für alle Chatmail-Benutzer zu erreichen.
 Wenn Sie einen klassischen E-Mail-Anbieter anstelle von <a href="https://delta.chat/chatmail">chatmail</a> Servern verwenden,
 sind Push-Benachrichtigungen nicht verfügbar.</p>
@@ -543,7 +544,7 @@ können sicher ausprobiert werden, wenn Sie feststellen, dass Nachrichten nur mi
       <h3 id="privacy-notifications">
         
         
-          Wie privat sind Delta Chat Push-Benachrichtigungen? <a href="#privacy-notifications" class="anchor"></a>
+          Wie privat sind Delta-Chat-Push-Benachrichtigungen? <a href="#privacy-notifications" class="anchor"></a>
         
         
       </h3>
@@ -560,7 +561,7 @@ an irgendein System, das an der Zustellung von Push-Benachrichtigungen beteiligt
 auf dem <a href="https://delta.chat/chatmail">Chatmail</a>-Server.</p>
   </li>
   <li>
-    <p>Wenn ein <a href="https://delta.chat/chatmail">Chatmail</a>-Server eine E-Mail für einen Delta Chat-Benutzer erhält
+    <p>Wenn ein <a href="https://delta.chat/chatmail">Chatmail</a>-Server eine E-Mail für einen Delta-Chat-Benutzer erhält
 erhält, leitet er den „Geräte-Token“ an den zentralen Delta-Chat-Benachrichtigungs-Proxy weiter.</p>
   </li>
   <li>
@@ -626,7 +627,7 @@ Willkommen bei der Macht des interoperablen und massiven Chatmail- und E-Mail-Sy
 <p><a href="https://autocrypt.org">Autocrypt</a> wird verwendet, um automatisch
 eine Ende-zu-Ende-Verschlüsselung mit Kontakten und Gruppenchats herzustellen.
 Autocrypt verwendet eine begrenzte und <a href="#openpgp-secure">sichere Untermenge des OpenPGP-Standards</a>.
-Ende-zu-Ende verschlüsselte Nachrichten sind mit einem Vorhängeschloss gekennzeichnet <img style="vertical-align:middle; width:1.2em; margin:1px" src="../lock-icon.png" alt="padlock" /></p>
+Ende-zu-Ende-verschlüsselte Nachrichten sind mit einem Vorhängeschloss gekennzeichnet <img style="vertical-align:middle; width:1.2em; margin:1px" src="../lock-icon.png" alt="padlock" /></p>
 
 <p><a href="https://securejoin.delta.chat/en/latest/new.html">Secure-Join-Protokolle</a>
 werden für Chats mit garantierter Ende-zu-Ende-Verschlüsselung verwendet, 
@@ -638,7 +639,7 @@ garantieren Ende-zu-Ende-verschlüsselte Nachrichten.</p>
       <h3 id="whene2e">
         
         
-          Wie kann ich wissen, ob Nachrichten Ende-zu-Ende verschlüsselt sind? <a href="#whene2e" class="anchor"></a>
+          Wie kann ich wissen, ob Nachrichten Ende-zu-Ende-verschlüsselt sind? <a href="#whene2e" class="anchor"></a>
         
         
       </h3>
@@ -729,7 +730,7 @@ Das Einführen geschieht automatisch, wenn Sie Mitglieder zu Gruppen hinzufügen
 Wer einen Kontakt zu einer Gruppe mit grünem Häkchen hinzufügt, wird zum Einführenden 
 für die Mitglieder, die noch nichts von dem hinzugefügten Kontakt wussten.
 In einem Kontaktprofil können Sie wiederholt auf den Text “Eingeführt von …” tippen
-bis du zu demjenigen gelangst, mit dem Sie einen direkten <a href="#howtoe2ee">QR-Scan</a> gemacht haben.</p>
+bis Sie zu demjenigen gelangen, mit dem Sie einen direkten <a href="#howtoe2ee">QR-Scan</a> gemacht haben.</p>
 
 <p>Beachten Sie, dass Sie in einem Kontaktprofil unter Umständen Einführende sehen und antippen können, aber kein grünes Häkchen im Profiltitel vorhanden ist. 
 Dies bedeutet normalerweise, dass der Kontakt <a href="#nocryptanymore">“eine Nachricht von einem anderen Gerät gesendet hat”</a>.</p>
@@ -760,7 +761,7 @@ auch wenn der Kontakt dort Mitglied ist.</p>
 <p><strong>Ihr Kontakt verwendet Delta Chat auf einem zweiten Gerät (Smartphone oder Laptop)</strong></p>
 
 <p>Wenn Ihr Kontakt ein weiteres Gerät mit Delta Chat eingerichtet hat,
-sollte das Konto von dem neuen Gerät entfernen werden und <a href="#multiclient">als zweites Gerät, wie hier beschrieben</a> erneut hinzugefügt werden.
+sollte das Konto von dem neuen Gerät entfernen werden und <a href="#multiclient">als zweites Gerät, wie hier beschrieben</a>, erneut hinzugefügt werden.
 Sobald sie sich danach schreiben, wird die Warnung verschwinden
 und die Verschlüsselung ist mit beiden Geräten Ihres Kontakts garantiert.</p>
 
@@ -882,7 +883,7 @@ wenn dieser falsch ist.</p>
 <p>Delta Chat war auch nie anfällig für den EFAIL-Angriff “Direct Exfiltration”,
 da nur <code class="language-plaintext highlighter-rouge">multipart/encrypted</code> Nachrichten entschlüsselt werden,
 die genau einen verschlüsselten und signierten Teil enthalten;
-so wie in der Autocrypt Level 1 Spezifikation definiert.</p>
+so wie in der Autocrypt-Level-1-Spezifikation definiert.</p>
     
       <h3 id="tls">
         
@@ -948,7 +949,7 @@ Nachrichten an die Geräte der Empfänger weiterzuleiten und zuzustellen.</p>
         
       </h3>
 
-<p>Sowohl zum Schutz vor E-Mail-Servern, die Metadaten sammeln 
+<p>Sowohl zum Schutz vor E-Mail-Servern, die Metadaten sammeln, 
 als auch gegen die Gefahr der Beschlagnahmung von Geräten
 empfehlen wir die Verwendung einer für Delta Chat optimierten <a href="https://delta.chat/serverguide">E-Mail-Server-Instanz</a>, um pseudonym-temporäre Konten durch Scannen von QR-Codes zu erstellen.
 Beachten Sie, dass Delta-Chat-Apps auf allen Plattformen mehrere Konten unterstützen. 
@@ -995,7 +996,7 @@ ohne Ende-zu-Ende-Unterstützung verwendet.</p>
       </h3>
 
 <p>Wenn ein Kontakt keine Autocrypt-fähige App verwendet,
-werden alle Nachrichten, die diesen Kontakt betreffen (in Gruppen- oder Direkt-Chats)
+werden alle Nachrichten, die diesen Kontakt betreffen (in Gruppen- oder Direkt-Chats),
 nicht Ende-zu-Ende-verschlüsselt und zeigen daher kein “Vorhängeschloss”.
 Beachten Sie, auch Kontakte, die primär Delta Chat verwenden,
 können gleichzeitig auch nicht-Autocrypt-fähige Apps verwenden.
@@ -1011,7 +1012,7 @@ um zu verhindern, dass unlesbare Nachrichten auf der Seite Ihrer Kontakte ankomm
       </h3>
 
 <p>Wenn Sie einen sicheren Ende-zu-Ende-verschlüsselten Chat mit einem Kontakt benötigen, 
-der sowohl Delta Chat als auch nicht-Autocrypt-Anwendungen nutzt,
+der sowohl Delta Chat als auch Nicht-Autocrypt-Anwendungen nutzt,
 können Sie eine <a href="#howtoe2ee">garantierte Ende-zu-Ende-Verschlüsselung</a> einrichten, mit einer Gruppe mit Ihnen beiden als Mitgliedern. 
 In diesem Gruppenchat werden alle Nachrichten Ende-zu-Ende verschlüsselt werdejn,
 auch wenn im Direkt-Chat eine
@@ -1025,10 +1026,10 @@ auch wenn im Direkt-Chat eine
         
       </h3>
 
-<p>Der beste Weg, um sicherzustellen, dass alle Nachrichten Ende-zu-Ende verschlüsselt sind
+<p>Der beste Weg, um sicherzustellen, dass alle Nachrichten Ende-zu-Ende-verschlüsselt sind
 und Metadaten so schnell wie möglich gelöscht werden,
 ist <a href="#howtoe2ee">die Verwendung von Chats mit garantierter Ende-zu-Ende-Verschlüsselung</a>
-und die Aktivierung von <a href="#ephemeralmsgs">Verschwindende Nachrichten</a>.</p>
+und die Aktivierung von <a href="#ephemeralmsgs">verschwindenden Nachrichten</a>.</p>
 
 <p>Garantierte Ende-zu-Ende-Verschlüsselung schützt vor <a href="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">MITM-Angriffen</a>
 und das Aktivieren von “Verschwindende Nachrichten” löscht die Nachrichten
@@ -1045,7 +1046,7 @@ auf dem Server und Lokal nach einer vom Benutzer eingestellten Zeit.</p>
       </h3>
 
 <p>Nein, Delta Chat unterstützt kein “Perfect Forward Secrecy” (PFS).
-Das bedeutet, dass wenn Ihr privater Delta-Chat-Schlüssel durchgesickert ist,
+Das bedeutet, wenn Ihr privater Delta-Chat-Schlüssel durchgesickert ist
 und jemand Ihre vorherigen In-Transit-Nachrichten gesammelt hat,
 können diese mit dem veröffentlichtem Schlüssel entschlüsselt werden.</p>
 
@@ -1056,7 +1057,7 @@ Die typische, reale Situation für durchgesickerte private Schlüssel, ist die <
 OpenPGP ist nur ein Container für verschlüsselte Nachrichten mit dem
 die Verwaltung der Schlüssel (und damit die Schlüsselrotation oder das Schlüssel-“Ratcheting”) 
 auf flexible Weise organisiert werden kann. 
-Siehe <a href="https://gitlab.com/sequoia-pgp/openpgp-dr">Seqouia’s PFS-Prototyp</a>
+Siehe <a href="https://gitlab.com/sequoia-pgp/openpgp-dr">Seqouias PFS-Prototyp</a>
 für bestehende Experimente in der OpenPGP-Community.</p>
     
       <h3 id="ist-die-ende-zu-ende-verschlüsselung-von-delta-chat-genauso-sicher-wie-die-von-signal">
@@ -1145,7 +1146,7 @@ Für andere Programme können Sie online eine Lösung finden.</p>
 Weitere Informationen finden Sie in unserem Blogbeitrag über <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-End encryption</a> und in der hinterher publizierten <a href="https://eprint.iacr.org/2024/918.pdf">Kryptografischen Analyse von Delta Chat</a></p>
   </li>
   <li>
-    <p>Im April 2023 haben wir Sicherheits- und Datenschutzprobleme mit den “In Chats geteilten Apps”-Feature behoben, die mit Fehlern beim Sandboxing, insbesondere mit Chromium zusammenhängen. Wir haben daraufhin eine unabhängige Sicherheitsprüfung von Cure53 durchführen lassen, und alle gefundenen Probleme wurden mit den im April 2023 veröffentlichten 1.36 Releases behoben. Siehe <a href="https://delta.chat/en/2023-05-22-webxdc-security">hier für die vollständige Hintergrundgeschichte</a>.</p>
+    <p>Im April 2023 haben wir Sicherheits- und Datenschutzprobleme mit dem “In Chats geteilten Apps”-Feature behoben, die mit Fehlern beim Sandboxing, insbesondere mit Chromium zusammenhängen. Wir haben daraufhin eine unabhängige Sicherheitsprüfung von Cure53 durchführen lassen, und alle gefundenen Probleme wurden mit den im April 2023 veröffentlichten 1.36 Releases behoben. Siehe <a href="https://delta.chat/en/2023-05-22-webxdc-security">hier für die vollständige Hintergrundgeschichte</a>.</p>
   </li>
   <li>
     <p>Im März 2023 analysierte <a href="https://cure53.de">Cure53</a> sowohl die Transportverschlüsselung von Delta Chats Netzwerkverbindungen als auch das reproduzierbare Mailserver-Setup wie <a href="https://delta.chat/de/serverguide">auf dieser Seite empfohlen</a>. Sie können mehr über das Audit <a href="https://delta.chat/en/2023-03-27-third-independent-security-audit">in unserem Blog</a> lesen oder Sie lesen den <a href="https://delta.chat/assets/blog/MER-01-report.pdf">vollständigen Bericht hier</a>.</p>
@@ -1155,7 +1156,7 @@ Weitere Informationen finden Sie in unserem Blogbeitrag über <a href="https://d
 Es wurden keine kritischen oder hochgradig gefährlichen Probleme gefunden. Der Bericht wies auf einige Schwachstellen mittlerer Schwere hin - sie stellen für sich genommen keine Bedrohung für Delta-Chat-Benutzer dar, da sie von der Umgebung abhängen, in der Delta Chat verwendet wird. Aus Gründen der Benutzerfreundlichkeit und der Kompatibilität können wir nicht alle Schwachstellen beseitigen und haben beschlossen, Sicherheitsempfehlungen für bedrohte Benutzer zu geben. Sie können den <a href="https://delta.chat/assets/blog/2020-second-security-review.pdf">vollständigen Bericht hier</a> lesen.</p>
   </li>
   <li>
-    <p>Im Jahr 2019 analysierte <a href="https://includesecurity.com">Include Security</a> die von Delta Chat verwendeten <a href="https://github.com/rpgp/rpgp">PGP</a> und <a href="https://github.com/RustCrypto/RSA">RSA</a> Bibliotheken.
+    <p>Im Jahr 2019 analysierte <a href="https://includesecurity.com">Include Security</a> die von Delta Chat verwendeten <a href="https://github.com/rpgp/rpgp">PGP-</a> und <a href="https://github.com/RustCrypto/RSA">RSA-</a> Bibliotheken.
 Es wurden keine kritischen Probleme gefunden, aber zwei Probleme mit hohem Schweregrad, die wir anschließend behoben haben. Außerdem wurden ein mittelschweres und einige weniger schwerwiegende Probleme gefunden, aber es gab keine Möglichkeit, diese Schwachstellen in der Delta-Chat-Implementierung auszunutzen. Einige dieser Schwachstellen haben wir dennoch nach Abschluss des Audits behoben. Sie können den [vollständigen Bericht hier] lesen (../assets/blog/2019-first-security-review.pdf).</p>
   </li>
 </ul>
@@ -1215,6 +1216,12 @@ Es wurden keine kritischen Probleme gefunden, aber zwei Probleme mit hohem Schwe
 und sicherstellen, dass <strong>Privates Netzwerk</strong> als “Netzwerkprofiltyp” ausgewählt ist.
 (nach der Übertragung kann wieder der ursprüngliche Wert verwendet werden)</p>
   </li>
+  <li>
+    <p>Auf <strong>iOS</strong>, sicherstellen, dass „Systemeinstellungen / Apps / Delta Chat / <strong>Lokales Netzwerk</strong>“ eingeschaltet ist</p>
+  </li>
+  <li>
+    <p>Auf <strong>macOS,</strong> „Systemeinstellungen / Datenschutz &amp; Sicherheit / <strong>Lokales Netzwerk</strong> / Delta Chat“ aktivieren</p>
+  </li>
   <li>
     <p>Ihr System verfügt möglicherweise über eine “Personal Firewall”, diese sind dafür bekannt, Probleme zu verursachen (insbesondere bei Windows). <strong>Deaktivieren Sie die Personal Firewall</strong> für Delta Chat auf beiden Seiten und versuchen Sie es erneut</p>
   </li>
@@ -1253,32 +1260,32 @@ Verwenden Sie nach Möglichkeit ein Nicht-Gast-Netzwerk. Wenn Sie Zugriff auf de
       <li><strong>Wenn Sie iOS verwenden</strong> und auf Schwierigkeiten stoßen, hilft Ihnen vielleicht <a href="https://support.delta.chat/t/import-backup-to-ios/1628">diese Anleitung</a>.</li>
     </ul>
   </li>
-  <li>Sie sind nun synchronisiert und können beide Geräte zum Senden und Empfangen von Ende-zu-Ende verschlüsselten Nachrichten mit Ihren Kommunikationspartnern verwenden.</li>
+  <li>Sie sind nun synchronisiert und können beide Geräte zum Senden und Empfangen von Ende-zu-Ende-verschlüsselten-Nachrichten mit Ihren Kommunikationspartnern verwenden.</li>
 </ul>
     
       <h3 id="gibt-es-pläne-für-eine-delta-chat-web-anwendung">
         
         
-          Gibt es Pläne für eine Delta Chat Web-Anwendung? <a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung" class="anchor"></a>
+          Gibt es Pläne für eine Delta-Chat-Web-Anwendung? <a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung" class="anchor"></a>
         
         
       </h3>
 
 <ul>
   <li>Es gibt keine direkten Pläne, aber einige vorläufige Gedanken.</li>
-  <li>Es gibt 2-3 Möglichkeiten, einen Delta Chat Web-Client einzuführen, aber sie bedeuten alle immense Arbeit. Im Moment fokussieren wir uns darauf, stabile native Apps in den Appstores (Google Play/iOS/Windows/macOS/Linux repositories) anzubieten.</li>
-  <li>Sollten Sie einen Web-Client benötigen, weil Sie auf Ihrem Arbeitsrechner keine Software installieren dürfen, können Sie den Windows Desktop-Client bzw. Applmage für Linux nutzen. Sie finden diese unter <a href="https://get.delta.chat">get.delta.chat</a>.</li>
+  <li>Es gibt 2-3 Möglichkeiten, einen Delta-Chat-Web-Client einzuführen, aber sie bedeuten alle immense Arbeit. Im Moment fokussieren wir uns darauf, stabile native Apps in den Appstores (Google Play/iOS/Windows/macOS/Linux repositories) anzubieten.</li>
+  <li>Sollten Sie einen Web-Client benötigen, weil Sie auf Ihrem Arbeitsrechner keine Software installieren dürfen, können Sie den Windows-Desktop-Client bzw. Applmage für Linux nutzen. Sie finden diese unter <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
         
         
-          Webxdc Apps <a href="#webxdc" class="anchor"></a>
+          Webxdc-Apps <a href="#webxdc" class="anchor"></a>
         
         
       </h2>
 
-<p>In Delta Chat können Sie <a href="https://webxdc.org">Webxdc Apps</a>, Anhänge mit der Dateierweiterung “.xdc” teilen. Sie können sehr unterschiedliche Dinge tun und machen Delta Chat zu einem wirklich erweiterbaren Messenger.</p>
+<p>In Delta Chat können Sie <a href="https://webxdc.org">Webxdc-Apps</a>, Anhänge mit der Dateierweiterung “.xdc” teilen. Sie können sehr unterschiedliche Dinge tun und machen Delta Chat zu einem wirklich erweiterbaren Messenger.</p>
     
       <h3 id="wie-privat-sind-webxdc-apps">
         
@@ -1304,7 +1311,8 @@ Verwenden Sie nach Möglichkeit ein Nicht-Gast-Netzwerk. Wenn Sie Zugriff auf de
       </h3>
 
 <ul>
-  <li>Grundsätzlich kann jeder Webxdc Apps mit anderen ohne Einschränkungen teilen.</li>
+  <li>Grundsätzlich kann jeder Webxdc-Apps mit anderen ohne Einschränkungen teilen.</li>
+  <li>Von <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>Sie können <a href="https://delta.chat/en/2023-08-11-xstore">‘hallo’ an xstore@testrun.org senden</a>
 um einen experimentellen Webxdc Appstore zu sehen.
 Alle Apps dort sind Open Source und umsonst.</li>
@@ -1322,7 +1330,7 @@ forum</a> veröffentlicht und diskutiert.</li>
 
 <ul>
   <li>Webxdc Apps sind nur ZIP-Dateien, die HTML-, CSS- und JavaScript-Code enthalten.</li>
-  <li>Sie können die <a href="https://github.com/webxdc/hello">Hello World-Beispiel-App</a> erweitern, um loszulegen.</li>
+  <li>Sie können die <a href="https://github.com/webxdc/hello">Hello-World-Beispiel-App</a> erweitern, um loszulegen.</li>
   <li>Alles andere, was Sie wissen müssen, steht in der <a href="https://docs.webxdc.org/">Dokumentation</a>.</li>
   <li>Wenn Sie Fragen haben, können Sie andere mit Erfahrung im <a href="https://support.delta.chat/c/webxdc/20">Delta-Chat-Forum</a> fragen.</li>
 </ul>
@@ -1635,7 +1643,7 @@ wenn Sie eine <a href="#signature">Signaturtext</a> einfügen.</p>
 <ul>
   <li>Ja und Nein.</li>
   <li>Nein, Sie können sich nicht mit Delta Chat in ein Protonmail-, Tutanota- oder Criptext-Konto einloggen, da diese keinen Standard-E-Mail-Empfang über IMAP anbieten.</li>
-  <li>Ja, Sie können Delta Chat verwenden, um Nachrichten an Personen zu senden, die Protonmail, Tutanota oder Criptext verwenden. Diese Nachrichten werden jedoch nicht ende-zu-ende-verschlüsselt, da diese Anbieter keine mit dem <a href="https://autocrypt.org/">Autocrypt</a>-Standard kompatible Verschlüsselung verwenden.</li>
+  <li>Ja, Sie können Delta Chat verwenden, um Nachrichten an Personen zu senden, die Protonmail, Tutanota oder Criptext verwenden. Diese Nachrichten werden jedoch nicht Ende-zu-Ende-verschlüsselt, da diese Anbieter keine mit dem <a href="https://autocrypt.org/">Autocrypt</a>-Standard kompatible Verschlüsselung verwenden.</li>
   <li>Delta Chat kann Ende-zu-Ende-Verschlüsselung über jeden E-Mail-Anbieter mit jeder
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-fähige E-Mail-Anwendung</a> herstellen</li>
 </ul>
@@ -1680,6 +1688,34 @@ Andernfalls könnten Sie unverschlüsselte Nachrichten aus diesen Gruppenchats e
   <li>Siehe hierzu <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">in Delta Chat genutzte Standards</a>.</li>
 </ul>
     
+      <h3 id="wo-können-meine-freunde-delta-chat-finden">
+        
+        
+          Wo können meine Freunde Delta Chat finden? <a href="#wo-können-meine-freunde-delta-chat-finden" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat ist für alle großen und einige kleinere Plattformen verfügbar:</p>
+
+<ul>
+  <li>
+    <p>Die <strong>offizielle Website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> zeigt alle Optionen im Detail</p>
+  </li>
+  <li>
+    <p>Falls nicht verfügbar, verwenden Sie den <strong>Mirror</strong> auf <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Öffnen Sie einen der folgenden <strong>App-Stores und suchen Sie nach „Delta Chat“:</strong> Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS und macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Im <strong>Paketmanager</strong> Ihrer Linux-Distribution nachschauen</p>
+  </li>
+  <li>
+    <p><strong>Android-APKs</strong> sind auch auf <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a> verfügbar.</p>
+  </li>
+</ul>
+    
       <h3 id="wie-wird-delta-chat-finanziert">
         
         
@@ -1705,10 +1741,10 @@ Die zweite Förderung 2019/2020 (~$300K) half uns bei der  Erstellung der iOS-Ve
     <p>Die <a href="https://nlnet.nl/">NLnet-Stiftung</a> bewilligte 2019/2020 46K  EUR für die Fertigstellung von Rust-/Python-Bindungs und die Einrichtung eines Chat-Bot-Ökosystems.</p>
   </li>
   <li>
-    <p>Im Jahr 2021 erhielten wir weitere EU-Mittel für zwei “Next-Generation-Internet” Anträge, nämlich für <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - E-Mail-Provider-Portabilitätsverzeichnis</a> (~97K EUR) und <a href="https://nlnet.nl/project/EmailPorting/">AEAP - E-Mail-Adressportierung</a> (~90K EUR). Ziel sind bessere Unterstützung von Mehrfachkonten, verbesserten QR-Code-Kontakt- und -Gruppen-Setups sowie Netzwerkverbesserungen auf allen Plattformen.</p>
+    <p>Im Jahr 2021 erhielten wir weitere EU-Mittel für zwei “Next-Generation-Internet”-Anträge, nämlich für <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - E-Mail-Provider-Portabilitätsverzeichnis</a> (~97K EUR) und <a href="https://nlnet.nl/project/EmailPorting/">AEAP - E-Mail-Adressportierung</a> (~90K EUR). Ziel sind bessere Unterstützung von Mehrfachkonten, verbesserten QR-Code-Kontakt- und -Gruppen-Setups sowie Netzwerkverbesserungen auf allen Plattformen.</p>
   </li>
   <li>
-    <p>Von Ende 2021 bis März 2023 erhielten wir eine <em>Internet Freedom</em> Finanzierung (500K USD) vom U.S. Bureau of Democracy, Human Rights and Labor (DRL). Diese Finanzierung unterstützte unsere langjährigen Ziele, Delta Chat benutzerfreundlicher und kompatibel mit einer breiten Palette von E-Mail-Servern weltweit zu machen, sowie widerstandsfähiger und sicherer an Orten, die häufig von Internetzensur und Abschaltungen betroffen sind.</p>
+    <p>Von Ende 2021 bis März 2023 erhielten wir eine <em>Internet-Freedom</em>-Finanzierung (500K USD) vom U.S. Bureau of Democracy, Human Rights and Labor (DRL). Diese Finanzierung unterstützte unsere langjährigen Ziele, Delta Chat benutzerfreundlicher und kompatibel mit einer breiten Palette von E-Mail-Servern weltweit zu machen, sowie widerstandsfähiger und sicherer an Orten, die häufig von Internetzensur und Abschaltungen betroffen sind.</p>
   </li>
   <li>
     <p>2023-2024 schlossen wir erfolgreich das vom OTF finanzierte 
@@ -1718,11 +1754,11 @@ das <a href="https://delta.chat/chatmail">Chatmail-Server-Netzwerk</a>
 und „Instant Onboarding“ allen ab April 2024 veröffentlichten Anwendungen hinzu.</p>
   </li>
   <li>
-    <p>2023 und 2024 wurden wir in das Next Generation Internet (NGI)
-Programm für unsere Arbeit an <a href="https://nlnet.nl/project/WebXDC-Push/">webxdc PUSH</a> aufgenommen,
+    <p>2023 und 2024 wurden wir in das Next-Generation-Internet-Programm (NGI)
+für unsere Arbeit an <a href="https://nlnet.nl/project/WebXDC-Push/">Webxdc-PUSH</a> aufgenommen,
 zusammen mit Kooperationspartnern, die an 
-<a href="https://nlnet.nl/project/Webxdc-Evolve/">webxdc evolve</a>, 
-<a href="https://nlnet.nl/project/WebXDC-XMPP/">webxdc XMPP</a>, 
+<a href="https://nlnet.nl/project/Webxdc-Evolve/">Webxdc-Evolve</a>, 
+<a href="https://nlnet.nl/project/WebXDC-XMPP/">Webxdc-XMPP</a>, 
 <a href="https://nlnet.nl/project/DeltaTouch/">DeltaTouch</a> und 
 <a href="https://nlnet.nl/project/DeltaTauri/">DeltaTauri</a>. 
 Alle diese Projekte sind teilweise abgeschlossen oder sollen Anfang 2025 abgeschlossen werden.</p>
@@ -1740,7 +1776,7 @@ Der Erhalt von Spenden hilft uns auch, unabhängiger und langfristig lebensfähi
 
 <p>Die oben aufgeführte finanzielle Förderung wird hauptsächlich von der merlinux GmbH in Freiburg (Deutschland) organisiert und an mehr als ein Dutzend Mitwirkende weltweit verteilt.</p>
 
-<p>Möglichkeiten mitzuwirken finden Sie Auf der <a href="https://delta.chat/de/contribute">Delta Chat Seite “Mitwirken”</a>.</p>
+<p>Möglichkeiten mitzuwirken finden Sie Auf der <a href="https://delta.chat/de/contribute">Delta-Chat-Seite “Mitwirken”</a>.</p>
 
 
 

src/main/assets/help/en/help.html

@@ -99,6 +99,7 @@
       <li><a href="#is-delta-chat-compatible-with-protonmail--tutanota--criptext">Is Delta Chat compatible with Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#im-interested-in-the-technical-details-can-you-tell-me-more">I’m interested in the technical details. Can you tell me more?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#how-are-delta-chat-developments-funded">How are Delta Chat developments funded?</a></li>
     </ul>
   </li>
@@ -301,8 +302,7 @@ Archived chats remain accessible above the chat list or via search.</p>
   </li>
 </ul>
 
-<p>To archive or pin a chat, long tap (Android), use the chat’s menu (Android/Desktop) or swipe to the left (iOS);
-to mute a chat, use the chat’s menu (Android/Desktop) or the chat’s profile (iOS).</p>
+<p>To use the functions, long tap or right click a chat in the chat list.</p>
     
       <h3 id="what-does-the-green-dot-mean">
         
@@ -1315,6 +1315,12 @@ One device is not needed for the other to work.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Your system might have a “personal firewall”,
 which is known to cause problems (especially on Windows).
@@ -1432,6 +1438,7 @@ you only open attachments from senders you trust, and not from spammers.</li>
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1883,6 +1890,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>See <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="how-are-delta-chat-developments-funded">
         
         

src/main/assets/help/es/help.html

@@ -99,6 +99,7 @@
       <li><a href="#delta-chat-es-compatible-con-protonmail--tutanota--criptext">¿Delta Chat es compatible con Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">¿Cómo puedo eliminar mi cuenta?</a></li>
       <li><a href="#estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">Estoy interesado en los detalles técnicos. ¿Pueden decirme más?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#cómo-se-financia-el-desarrollo-de-delta-chat">¿Cómo se financia el desarrollo de Delta Chat?</a></li>
     </ul>
   </li>
@@ -1277,6 +1278,12 @@ No es necesario un dispositivo para que el otro funcione.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Your system might have a “personal firewall”,
 which is known to cause problems (especially on Windows).
@@ -1394,6 +1401,7 @@ solo abre archivos adjuntos de remitentes en los que confía y no de spammers.</
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1827,6 +1835,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>Visita la página <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Estándares usados en Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="cómo-se-financia-el-desarrollo-de-delta-chat">
         
         

src/main/assets/help/fr/help.html

@@ -99,6 +99,7 @@
       <li><a href="#delta-chat-est-il-compatible-avec-protonmail--tutanota--criptext-">Delta Chat est-il compatible avec Protonmail / Tutanota / Criptext ?</a></li>
       <li><a href="#remove-account">Comment supprimer mon compte ?</a></li>
       <li><a href="#les-détails-techniques-mintéressent-pouvez-vous-men-dire-plus-">Les détails techniques m’intéressent. Pouvez-vous m’en dire plus ?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#comment-est-financé-le-développement-de-delta-chat-">Comment est financé le développement de Delta Chat ?</a></li>
     </ul>
   </li>
@@ -1262,6 +1263,12 @@ L’un n’a pas besoin de l’autre pour pouvoir fonctionner.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Il se peut que votre système dispose d’un “pare-feu personnalisé”,
 source bien connue de dysfonctionnements (en particulier sur Windows).
@@ -1375,6 +1382,7 @@ you only open attachments from senders you trust, and not from spammers.</li>
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1789,6 +1797,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>Consultez les <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">standards utilisés dans Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="comment-est-financé-le-développement-de-delta-chat-">
         
         

src/main/assets/help/id/help.html

@@ -99,6 +99,7 @@
       <li><a href="#is-delta-chat-compatible-with-protonmail--tutanota--criptext">Is Delta Chat compatible with Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#im-interested-in-the-technical-details-can-you-tell-me-more">I’m interested in the technical details. Can you tell me more?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#how-are-delta-chat-developments-funded">How are Delta Chat developments funded?</a></li>
     </ul>
   </li>
@@ -301,8 +302,7 @@ Archived chats remain accessible above the chat list or via search.</p>
   </li>
 </ul>
 
-<p>To archive or pin a chat, long tap (Android), use the chat’s menu (Android/Desktop) or swipe to the left (iOS);
-to mute a chat, use the chat’s menu (Android/Desktop) or the chat’s profile (iOS).</p>
+<p>To use the functions, long tap or right click a chat in the chat list.</p>
     
       <h3 id="what-does-the-green-dot-mean">
         
@@ -1315,6 +1315,12 @@ One device is not needed for the other to work.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Your system might have a “personal firewall”,
 which is known to cause problems (especially on Windows).
@@ -1432,6 +1438,7 @@ you only open attachments from senders you trust, and not from spammers.</li>
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1883,6 +1890,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>See <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="how-are-delta-chat-developments-funded">
         
         

src/main/assets/help/it/help.html

@@ -99,6 +99,7 @@
       <li><a href="#delta-chat-è-compatibile-con-protonmail--tutanota--criptext">Delta Chat è compatibile con Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">Come posso eliminare il mio profilo?</a></li>
       <li><a href="#sono-interessato-ai-dettagli-tecnici-mi-puoi-dire-di-più">Sono interessato ai dettagli tecnici. Mi puoi dire di più?</a></li>
+      <li><a href="#dove-possono-trovare-delta-chat-i-miei-amici">Dove possono trovare Delta Chat i miei amici?</a></li>
       <li><a href="#come-viene-finanziato-lo-sviluppo-di-delta-chat">Come viene finanziato lo sviluppo di Delta Chat?</a></li>
     </ul>
   </li>
@@ -1302,6 +1303,12 @@ Un dispositivo non è necessario perché l’altro funzioni.</p>
 e assicurati che <strong>Rete Privata</strong> sia selezionata come “Tipo di profilo di rete”
 (dopo il trasferimento è possibile ripristinare il valore originale)</p>
   </li>
+  <li>
+    <p>Su <strong>iOS</strong>, assicurati che l’accesso a “Impostazioni di Sistema / App / Delta Chat / <strong>Rete locale</strong>” sia concesso</p>
+  </li>
+  <li>
+    <p>Su <strong>macOS</strong>, abilita “Impostazioni di Sistema / Privacy &amp; Sicurezza / <strong>Rete locale</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Il sistema potrebbe avere un “personal firewall”,
 che è noto per causare problemi (soprattutto su Windows).
@@ -1845,6 +1852,35 @@ Altrimenti potresti ricevere messaggi non decifrabili da quelle chat di gruppo.<
   <li>Vedi <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Standard usati in Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="dove-possono-trovare-delta-chat-i-miei-amici">
+        
+        
+          Dove possono trovare Delta Chat i miei amici? <a href="#dove-possono-trovare-delta-chat-i-miei-amici" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat è disponibile per tutte le piattaforme principali e alcune minori:</p>
+
+<ul>
+  <li>
+    <p>Il <strong>sito ufficiale</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> mostra tutte le opzioni in dettaglio</p>
+  </li>
+  <li>
+    <p>Se non disponibile, utilizzare <strong>mirror</strong> su <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Apri uno dei seguenti <strong>app store e cerca “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS e macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Controlla il <strong>gestore pacchetti</strong> delle tue distribuzioni Linux</p>
+  </li>
+  <li>
+    <p><strong>APK Android</strong> sono disponibili anche su <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="come-viene-finanziato-lo-sviluppo-di-delta-chat">
         
         

src/main/assets/help/nl/help.html

@@ -99,6 +99,7 @@
       <li><a href="#is-delta-chat-compatibel-met-protonmailtutanotacriptext">Is Delta Chat compatibel met Protonmail/Tutanota/Criptext?</a></li>
       <li><a href="#remove-account">Hoe kan ik mijn account verwijderen?</a></li>
       <li><a href="#ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">Ik wil graag meer weten over de gebruikte technieken. Waar kan ik meer informatie vinden?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#hoe-wordt-de-ontwikkeling-van-delta-chat-gefinancierd">Hoe wordt de ontwikkeling van Delta Chat gefinancierd?</a></li>
     </ul>
   </li>
@@ -1306,6 +1307,12 @@ op beide apparaten</strong>. Hierdoor hoef je niet het ene apparaat bij de hand
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Wellicht is een firewall actief op je apparaat,
 welke problemen kan veroorzaken (met name op Windows).
@@ -1423,6 +1430,7 @@ you only open attachments from senders you trust, and not from spammers.</li>
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1868,6 +1876,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>Bekijk de pagina <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Door Delta Chat gebruikte standaarden</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="hoe-wordt-de-ontwikkeling-van-delta-chat-gefinancierd">
         
         

src/main/assets/help/pl/help.html

@@ -99,6 +99,7 @@
       <li><a href="#czy-delta-chat-jest-kompatybilny-z-protonmail--tutanota--criptext">Czy Delta Chat jest kompatybilny z Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">Jak mogę usunąć swoje konto?</a></li>
       <li><a href="#interesują-mnie-szczegóły-techniczne-możesz-powiedzieć-mi-coś-więcej">Interesują mnie szczegóły techniczne. Możesz powiedzieć mi coś więcej?</a></li>
+      <li><a href="#gdzie-moi-znajomi-mogą-znaleźć-delta-chat">Gdzie moi znajomi mogą znaleźć Delta Chat?</a></li>
       <li><a href="#w-jaki-sposób-finansowany-jest-rozwój-delta-chat">W jaki sposób finansowany jest rozwój Delta Chat?</a></li>
     </ul>
   </li>
@@ -265,8 +266,7 @@
   </li>
 </ul>
 
-<p>Aby zarchiwizować lub przypiąć czat, dotknij i przytrzymaj (Android), użyj menu czatu (Android/Desktop) lub przesuń palcem w lewo (iOS);
-aby wyciszyć czat, użyj menu czatu (Android/Desktop) lub profilu czatu (iOS).</p>
+<p>Aby skorzystać z tych funkcji, przytrzymaj dłużej lub kliknij prawym przyciskiem myszy czat na liście czatów.</p>
     
       <h3 id="co-oznacza-zielona-kropka">
         
@@ -941,6 +941,12 @@ W przypadku innych programów można znaleźć rozwiązanie online.</p>
     <p>Na <strong>Windowsie</strong>, przejdź do <strong>Panel sterowania / Sieć i internet</strong> i upewnij się, że <strong>Sieć prywatna</strong> jest wybrana jako “Typ profilu sieci”
 (po przeniesieniu możesz wrócić do pierwotnej wartości)</p>
   </li>
+  <li>
+    <p>W systemie <strong>iOS</strong> upewnij się, że jest przydzielony dostęp do opcji „Ustawienia » Aplikacje » Delta Chat » <strong>Sieć lokalna</strong>”</p>
+  </li>
+  <li>
+    <p>W systemie <strong>macOS</strong> włącz „Ustawienia systemowe » Prywatność i bezpieczeństwo » <strong>Sieć lokalna</strong> » Delta Chat”</p>
+  </li>
   <li>
     <p>Twój system może mieć „zaporę ogniową”, o której wiadomo, że powoduje problemy (szczególnie w systemie Windows).
 <strong>Wyłącz zaporę</strong> dla Delta Chat po obu stronach i spróbuj ponownie</p>
@@ -1031,6 +1037,7 @@ W przypadku innych programów można znaleźć rozwiązanie online.</p>
 
 <ul>
   <li>Ogólnie rzecz biorąc, każdy może udostępniać sobie aplikacje webxdc bez ograniczeń.</li>
+  <li>Od <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>Możesz <a href="https://delta.chat/en/2023-08-11-xstore">wysłać „hi” na adres xstore@testrun.org</a>, aby zobaczyć eksperymentalny sklep z aplikacjami webxdc. Wszystkie aplikacje są otwarto źródłowe i są bezpłatne.</li>
   <li>Wiele osób pisze własne, aplikacje webxdc i publikuje je na <a href="https://support.delta.chat/c/webxdc/20">forum Delta Chat</a>.</li>
 </ul>
@@ -1356,6 +1363,34 @@ jeśli chcesz sprawdzić, czy Twoje poświadczenia są przetwarzane w bezpieczny
   <li>Zobacz <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Standardy używane w Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="gdzie-moi-znajomi-mogą-znaleźć-delta-chat">
+        
+        
+          Gdzie moi znajomi mogą znaleźć Delta Chat? <a href="#gdzie-moi-znajomi-mogą-znaleźć-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat jest dostępny na wszystkich głównych i niektórych mniejszych platformach:</p>
+
+<ul>
+  <li>
+    <p>Oficjalna <strong>strona internetowa</strong> <a href="https://delta.chat/download">https://delta.chat/download</a> pokazuje wszystkie opcje szczegółowo</p>
+  </li>
+  <li>
+    <p>Jeśli nie jest dostępna, użyj <strong>kopii strony</strong> pod adresem <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Otwórz jeden z następujących <strong>sklepów z aplikacjami i wyszukaj „Delta Chat”</strong>: Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS i macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Sprawdź <strong>menedżera pakietów</strong> swoich dystrybucji Linuksa</p>
+  </li>
+  <li>
+    <p><strong>Aplikacje na Androida</strong> są również dostępne na <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="w-jaki-sposób-finansowany-jest-rozwój-delta-chat">
         
         

src/main/assets/help/pt/help.html

@@ -99,6 +99,7 @@
       <li><a href="#o-delta-chat-é-compatível-com-protonmail--tutanota--criptext">O Delta Chat é compatível com Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#estou-interessado-nos-detalhes-técnicos-pode-me-dizer-mais">Estou interessado nos detalhes técnicos. Pode me dizer mais?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#como-são-os-desenvolvimentos-do-delta-chat-financiados">Como são os desenvolvimentos do Delta Chat financiados?</a></li>
     </ul>
   </li>
@@ -297,8 +298,7 @@ Archived chats remain accessible above the chat list or via search.</p>
   </li>
 </ul>
 
-<p>To archive or pin a chat, long tap (Android), use the chat’s menu (Android/Desktop) or swipe to the left (iOS);
-to mute a chat, use the chat’s menu (Android/Desktop) or the chat’s profile (iOS).</p>
+<p>To use the functions, long tap or right click a chat in the chat list.</p>
     
       <h3 id="what-does-the-green-dot-mean">
         
@@ -1309,6 +1309,12 @@ One device is not needed for the other to work.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Your system might have a “personal firewall”,
 which is known to cause problems (especially on Windows).
@@ -1426,6 +1432,7 @@ you only open attachments from senders you trust, and not from spammers.</li>
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1869,6 +1876,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>Veja <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">As normas usadas no Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="como-são-os-desenvolvimentos-do-delta-chat-financiados">
         
         

src/main/assets/help/ru/help.html

@@ -87,7 +87,7 @@
   <li><a href="#разное">Разное</a>
     <ul>
       <li><a href="#какие-разрешения-нужны-delta-chat">Какие разрешения нужны Delta Chat?</a></li>
-      <li><a href="#работает-ли-delta-chat-работу-с-моим-провайдером-электронной-почты">Работает ли Delta Chat работу с <em>моим</em> провайдером электронной почты?</a></li>
+      <li><a href="#работает-ли-delta-chat-с-моим-провайдером-электронной-почты">Работает ли Delta Chat с <em>моим</em> провайдером электронной почты?</a></li>
       <li><a href="#я-хочу-управлять-своим-собственным-почтовым-сервером-для-delta-chat-что-вы-посоветуете">Я хочу управлять своим собственным почтовым сервером для Delta Chat. Что вы посоветуете?</a></li>
       <li><a href="#почему-я-должен-вводить-свой-пароль-от-электронной-почты-в-delta-chat-это-безопасно">Почему я должен вводить свой пароль от электронной почты в Delta Chat? Это безопасно?</a></li>
       <li><a href="#какие-сообщения-отображаются-в-delta-chat">Какие сообщения отображаются в Delta Chat?</a></li>
@@ -99,6 +99,7 @@
       <li><a href="#совместим-ли-delta-chat-с-protonmail--tutanota--criptext">Совместим ли Delta Chat с Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">Как я могу удалить свой аккаунт?</a></li>
       <li><a href="#меня-интересуют-технические-детали-можете-рассказать-больше">Меня интересуют технические детали. Можете рассказать больше?</a></li>
+      <li><a href="#где-мои-друзья-могут-найти-delta-chat">Где мои друзья могут найти Delta Chat?</a></li>
       <li><a href="#как-финансируются-разработки-delta-chat">Как финансируются разработки Delta Chat?</a></li>
     </ul>
   </li>
@@ -217,7 +218,7 @@
         
       </h3>
 
-<p>Профиль - это <strong>имя, изображение</strong> и некоторая дополнительная информация для шифрования сообщений.
+<p>Профиль — это <strong>имя, изображение</strong> и некоторая дополнительная информация для шифрования сообщений.
 Профиль существует только на вашем устройстве(ах)
 и использует серверы chatmail или обычные серверы электронной почты для передачи сообщений.</p>
 
@@ -301,8 +302,7 @@
   </li>
 </ul>
 
-<p>Чтобы архивировать или закрепить чат, нажмите на него долгим нажатием (Android), воспользуйтесь меню чата (Android/Desktop) или проведите пальцем влево (iOS);
-чтобы отключить уведомления, воспользуйтесь меню чата (Android/Desktop) или профиль чата (iOS).</p>
+<p>Чтобы использовать функции, нажмите долгим нажатием или щелкните правой кнопкой мыши по чату в списке чатов.</p>
     
       <h3 id="что-означает-зеленая-точка">
         
@@ -350,7 +350,7 @@
 приложение Delta Chat каждого участника чата позаботится
 об удалении сообщений
 по истечении выбранного периода времени.
-Отсчет времени начинается
+Отсчет времени начинается,
 когда получатель впервые видит сообщение в Delta Chat.
 Сообщения удаляются
 как в каждой учетной записи электронной почты на сервере,
@@ -429,7 +429,7 @@
 Если позже вы снова захотите присоединиться к группе, попросите другого участника группы добавить вас.</p>
   </li>
   <li>
-    <p>Или, вместо этого, вы можете “отключить уведомления” для группы - это означает, что вы будете получать все сообщения и сможете их писать, но больше не будете получать уведомления о новых сообщениях.</p>
+    <p>Или, вместо этого, вы можете “отключить уведомления” для группы — это означает, что вы будете получать все сообщения и сможете их писать, но больше не будете получать уведомления о новых сообщениях.</p>
   </li>
 </ul>
     
@@ -474,7 +474,7 @@
 По истечении этого срока все сообщения, полученные Delta Chat, будут удалены с сервера.</p>
   </li>
   <li>
-    <p>Обратите внимание, что если вы используете Delta Chat на нескольких устройствах,
+    <p>Обратите внимание, что, если вы используете Delta Chat на нескольких устройствах,
 необходимо оставлять сообщения на сервере с достаточным временным интервалом,
 чтобы другое устройство(а) тоже смогло их загрузить.</p>
   </li>
@@ -575,8 +575,8 @@ Push-уведомления недоступны.</p>
   </li>
   <li>
     <p>Принудительное соединение в фоновом режиме: это запасной вариант
-если предыдущие варианты недоступны или или не обеспечивают “мгновенную доставку”.
-Включение этого параметра вызывает постоянное уведомление на вашем телефоне
+если предыдущие варианты недоступны или не обеспечивают “мгновенную доставку”.
+Включение этого параметра вызывает постоянное уведомление на вашем телефоне,
 которое иногда может быть “сжато” на последних телефонах Android.</p>
   </li>
 </ul>
@@ -642,7 +642,7 @@ Push-уведомления недоступны.</p>
         
       </h3>
 
-<p>Delta Chat - это бесплатный децентрализованный мессенджер с открытым исходным кодом и возможностью выбора сервера,
+<p>Delta Chat — это бесплатный децентрализованный мессенджер с открытым исходным кодом и возможностью выбора сервера,
 но мы хотим, чтобы пользователи гарантированно получали “мгновенную доставку” сообщений,
 такую же, что и в приложениях WhatsApp, Signal или Telegram,
 не задавая вопросов, которые больше подходят для опытных пользователей или разработчиков.</p>
@@ -671,7 +671,7 @@ Push-уведомления недоступны.</p>
 <p><a href="https://autocrypt.org">Autocrypt</a> используется для автоматической
 установки сквозного шифрования при работе с контактами и групповыми чатами.
 Autocrypt использует ограниченное и <a href="#openpgp-secure">безопасное подмножество стандарта OpenPGP</a>.
-Сообщения, зашифрованные сквозным шифрованием помечаются замком 
+Сообщения, зашифрованные сквозным шифрованием, помечаются замком 
 <img style="vertical-align:middle; width:1.2em; margin:1px" src="../lock-icon.png" alt="padlock" />.</p>
 
 <p><a href="https://securejoin.delta.chat/en/latest/new.html">Протоколы Secure-Join</a>
@@ -689,7 +689,7 @@ Autocrypt использует ограниченное и <a href="#openpgp-sec
         
       </h3>
 
-<p>Все сообщения зашифрованые сквозным шифрованием имеют значок замка:</p>
+<p>Все сообщения, зашифрованные сквозным шифрованием, имеют значок замка:</p>
 
 <p><img style="width:160px; margin:1px" src="../lock-screenshot.png" alt="Значок замка в пузырьке" /></p>
 
@@ -779,7 +779,7 @@ Autocrypt использует ограниченное и <a href="#openpgp-sec
 В профиле контакта можно несколько раз нажать на текст “Представлен …” несколько раз
 пока не дойдёте до того, с кем вы непосредственно провели <a href="#howtoe2ee">QR-сканирование</a>.</p>
 
-<p>Обратите внимание, что в профиле контакта вы можете увидеть и присоеденённых знакомых 
+<p>Обратите внимание, что в профиле контакта вы можете увидеть и присоединённых знакомых, 
 но в заголовке профиля нет зелёной галочки. 
 Обычно это означает, что контакт <a href="#nocryptanymore">“отправил сообщение с другого устройства”</a>.</p>
 
@@ -797,10 +797,10 @@ Autocrypt использует ограниченное и <a href="#openpgp-sec
       </h3>
 
 <p>Ваш чат с контактом утратил гарантированное сквозное шифрование. 
-Зелёная галочка была удалёна для этого чата и контакта, и когда вы увидели предупреждение.
+Зелёная галочка была удалена для этого чата и контакта, и когда вы увидели предупреждение.
 <strong>Если вы обнаружили внезапное прекращение гарантированного сквозного шифрования 
 для этого контакта, не принимайте предупреждение!</strong>
-Вместо этого свяжитесь со своим контактом по второму каналу 
+Вместо этого свяжитесь со своим контактом по второму каналу, 
 например, видеозвонок, другой мессенджер или телефонный звонок,
 чтобы узнать, что произошло.</p>
 
@@ -935,7 +935,7 @@ Delta Chat вместо этого использует реализацию Ope
 и возвращает <a href="https://docs.rs/pgp/latest/pgp/errors/enum.Error.html#variant.MdcError">ошибку</a>
 если код обнаружения модификаций не совпадает.</p>
 
-<p>Delta Chat также никогда не был уязвим к атаке “Direct Exfiltration” EFAIL
+<p>Delta Chat также никогда не был уязвим к атаке “Direct Exfiltration” EFAIL,
 потому что он расшифровывает только <code class="language-plaintext highlighter-rouge">многочастные/зашифрованные</code> сообщения,
 которые содержат ровно одну зашифрованную и подписанную часть,
 как определено спецификацией Autocrypt Level 1.</p>
@@ -1172,16 +1172,16 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
         
       </h3>
 
-<p>Наиболее вероятная причина - это то, что ваш ключ зашифрован и/или имеет пароль.
+<p>Наиболее вероятная причина — это то, что ваш ключ зашифрован и/или имеет пароль.
 Delta Chat не поддерживает такие ключи.
 Вы можете снять шифрование пароля и пароль, а затем повторить попытку импорта.</p>
 
 <p>Другая распространенная ошибка - неправильное расширение файла.
 Используйте формат ASCII armored и расширение файла <code class="language-plaintext highlighter-rouge">.asc</code>.</p>
 
-<p>Delta Chat поддерживает расспространённые форматы закрытых ключей OpenPGP, однако
+<p>Delta Chat поддерживает распространённые форматы закрытых ключей OpenPGP, однако
 маловероятно, что мы будем поддерживать все закрытые ключи из любых источников. Это
-не является основной целью Delta Chat. На самом деле, подавляющее большинство пользователей 
+не является основной целью Delta Chat. На самом деле, подавляющее большинство пользователей
 Delta Chat не будут иметь никакого ключа, прежде чем они начнут использовать его.
 Однако мы стремимся поддерживать закрытые ключи из как можно большего числа источников.</p>
 
@@ -1305,13 +1305,19 @@ Chat <a href="https://github.com/rpgp/rpgp">PGP</a> и
 
 <ul>
   <li>
-    <p>Перепроверьте, что оба устройства находятся в <strong>в одной Wi-Fi или локальной сети</strong>.</p>
+    <p>Перепроверьте, что оба устройства находятся <strong>в одной Wi-Fi или локальной сети</strong>.</p>
   </li>
   <li>
     <p>В <strong>Windows</strong> перейдите в <strong>Панель управления / Сеть и Интернет</strong>
 и убедитесь, что в качестве “Типа сетевого профиля” выбрана <strong>Частная сеть</strong>.
 (после передачи, вы можете изменить обратно на исходное значение)</p>
   </li>
+  <li>
+    <p>На <strong>iOS</strong>, убедитесь, что предоставлен доступ “Настройки системы / Приложения / Delta Chat / <strong>Локальная сеть</strong>”</p>
+  </li>
+  <li>
+    <p>На <strong>macOS</strong>, включите “Системные настройки / Конфиденциальность и безопасность / <strong>Локальная сеть</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>В вашей системе может быть установлен “персональный брандмауэр”,
 который может вызвать проблемы (особенно на Windows).
@@ -1407,12 +1413,12 @@ PIN-код разблокировки экрана, графический кл
       </h3>
 
 <ul>
-  <li>Приложения webxdc webxdc не могут отправлять данные в Интернет или скачивать что-либо.</li>
+  <li>Приложения webxdc не могут отправлять данные в Интернет или скачивать что-либо.</li>
   <li>Приложение webxdc может обмениваться данными только внутри чата Delta Chat, с его
 копиями на устройствах ваших собеседников по чату.
 В остальном, оно полностью
 изолировано от Интернета.</li>
-  <li>Конфиденциальность, которую обеспечивает приложение webxdc - это конфиденциальность вашего чата - пока
+  <li>Конфиденциальность, которую обеспечивает приложение webxdc — это конфиденциальность вашего чата - пока
 вы доверяете людям, с которыми вы общаетесь, вы можете доверять приложению webxdc.</li>
   <li>Это также означает, что открытие приложений webxdc в чатах с участниками, которым вы
 не доверяете, тоже самое, что и с вложениями электронной почты, когда вы открываете
@@ -1430,11 +1436,11 @@ PIN-код разблокировки экрана, графический кл
 <ul>
   <li>В общем, каждый может поделиться приложениями webxdc
 друг с другом без ограничений.</li>
+  <li>Из <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>Вы можете <a href="https://delta.chat/en/2023-08-11-xstore">отправить ‘hi’ на xstore@testrun.org</a>
 чтобы увидеть экспериментальный магазин приложений webxdc.
 Все приложения с открытым исходным кодом и бесплатны.</li>
-  <li>Многие люди пишут свои собственные приложения webxdc и публикуют их на <a href="https://support.delta.chat/c/webxdc/20">форуме
-Delta Chat</a>.</li>
+  <li>Многие люди создают свои собственные приложения webxdc и публикуют их на <a href="https://support.delta.chat/c/webxdc/20">форуме Delta Chat</a>.</li>
 </ul>
     
       <h3 id="как-я-могу-создать-свои-собственные-приложения-webxdc">
@@ -1446,7 +1452,7 @@ Delta Chat</a>.</li>
       </h3>
 
 <ul>
-  <li>Приложения webxdc - это просто архивы zip, содержащие код html, css и javascript.</li>
+  <li>Приложения webxdc — это просто архивы zip, содержащие код html, css и javascript.</li>
   <li>Вы можете расширить <a href="https://github.com/webxdc/hello">пример приложения Hello World</a>
 для начала.</li>
   <li>Все остальное, что вам нужно знать, написано в
@@ -1572,7 +1578,7 @@ Delta Chat</a>.</li>
 <ol>
   <li>
     <p>Измените свой адрес в разделе “Настройки → Дополнительные параметры → Пароль и аккаунт” и
-введите пароль вашей новой электронной почты (и если необходимо, настройки сервера).
+введите пароль вашей новой электронной почты (и, если необходимо, настройки сервера).
 Вы получите информационное сообщение о том, что переходите на новый адрес. 
 Дополнительное уведомление также появится в вашем чате “Сообщения устройства”.</p>
   </li>
@@ -1656,10 +1662,10 @@ Delta Chat</a>.</li>
   </li>
 </ul>
     
-      <h3 id="работает-ли-delta-chat-работу-с-моим-провайдером-электронной-почты">
+      <h3 id="работает-ли-delta-chat-с-моим-провайдером-электронной-почты">
         
         
-          Работает ли Delta Chat работу с <em>моим</em> провайдером электронной почты? <a href="#работает-ли-delta-chat-работу-с-моим-провайдером-электронной-почты" class="anchor"></a>
+          Работает ли Delta Chat с <em>моим</em> провайдером электронной почты? <a href="#работает-ли-delta-chat-с-моим-провайдером-электронной-почты" class="anchor"></a>
         
         
       </h3>
@@ -1791,7 +1797,7 @@ Delta Chat необходим пароль, чтобы использовать
         
       </h3>
 
-<p>Единственная причина, по которой вы можете захотеть наблюдать за папкой “Отправленные”, - это если вы используете другую
+<p>Единственная причина, по которой вы можете захотеть наблюдать за папкой “Отправленные”, — это если вы используете другую
 почтовую программу (например, Thunderbird) вместе с приложением Delta Chat, и хотите, чтобы ваш почтовый клиент
 мог участвовать в разговорах в чате.</p>
 
@@ -1879,6 +1885,35 @@ Chat.</li>
   <li>Смотрите <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Стандарты, используемые в Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="где-мои-друзья-могут-найти-delta-chat">
+        
+        
+          Где мои друзья могут найти Delta Chat? <a href="#где-мои-друзья-могут-найти-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat доступен на всех популярных и некоторых менее известных платформах:</p>
+
+<ul>
+  <li>
+    <p>На <strong>официальной странице загрузки</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> можно найти подробную информацию о всех вариантах</p>
+  </li>
+  <li>
+    <p>Если основной сайт недоступен, используйте <strong>зеркало</strong> <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Откройте один из следующих <strong>онлайн-магазинов приложений и введите запрос “Delta Chat”:</strong>
+ Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, App Store для iOS и macOS, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Проверьте <strong>менеджер пакетов</strong> вашего дистрибутива Linux</p>
+  </li>
+  <li>
+    <p>Файлы <strong>APK для Android</strong> доступны на <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="как-финансируются-разработки-delta-chat">
         
         
@@ -1895,7 +1930,7 @@ Chat.</li>
 основанную на Свободном и Открытом исходном коде.</p>
 
 <p>В частности, разработка Delta Chat финансировалась из следующих источников,
-перечисленны в хронологическом порядке:</p>
+перечислены в хронологическом порядке:</p>
 
 <ul>
   <li>
@@ -1910,7 +1945,7 @@ Chat.</li>
 и выпустили первую бета-версию приложения для настольных систем, а также провели 
 исследования в области UX в контексте прав человека, 
  см. наш заключительный отчет <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-Второй грант, полученый в 2019/2020 году (~$300тыс.), помог нам 
+Второй грант, полученный в 2019/2020 году (~$300 тыс.), помог нам 
 выпустить версии Delta/iOS, перевести наш основной код на Rust и 
 предоставить новые функции для всех платформ.</p>
   </li>

src/main/assets/help/sk/help.html

@@ -99,6 +99,7 @@
       <li><a href="#je-delta-chat-kompatibilný-s-protonmail--tutanota--criptext">Je Delta Chat kompatibilný s Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#zaujímajú-ma-technické-detaily-môžete-mi-povedať-viac">Zaujímajú ma technické detaily. Môžete mi povedať viac?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#ako-sa-financuje-vývoj-delta-chat">Ako sa financuje vývoj Delta Chat?</a></li>
     </ul>
   </li>
@@ -301,8 +302,7 @@ Archived chats remain accessible above the chat list or via search.</p>
   </li>
 </ul>
 
-<p>To archive or pin a chat, long tap (Android), use the chat’s menu (Android/Desktop) or swipe to the left (iOS);
-to mute a chat, use the chat’s menu (Android/Desktop) or the chat’s profile (iOS).</p>
+<p>To use the functions, long tap or right click a chat in the chat list.</p>
     
       <h3 id="what-does-the-green-dot-mean">
         
@@ -1315,6 +1315,12 @@ One device is not needed for the other to work.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Your system might have a “personal firewall”,
 which is known to cause problems (especially on Windows).
@@ -1432,6 +1438,7 @@ you only open attachments from senders you trust, and not from spammers.</li>
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1879,6 +1886,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>Pozrite si <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Štandardy používané v Delta Chate</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="ako-sa-financuje-vývoj-delta-chat">
         
         

src/main/assets/help/sq/help.html

@@ -99,6 +99,7 @@
       <li><a href="#a-është-i-përputhshëm-delta-chat-i-me-protonmail-in--tutanota-n--criptext-in">A është i përputhshëm Delta Chat-i me Protonmail-in / Tutanota-n / Criptext-in?</a></li>
       <li><a href="#remove-account">Si mund ta fshij llogarinë time?</a></li>
       <li><a href="#më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">Më interesojnë hollësitë teknike. Mund të më tregoni diçka më tepër?</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#si-financohet-zhvillimi-i-delta-chat-it">Si financohet zhvillimi i Delta Chat-it?</a></li>
     </ul>
   </li>
@@ -1315,6 +1316,12 @@ Njëra pajisja s’ka nevojë për tjetrën që të funksionojë.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Sistemi juaj mund të ketë një “firewall personal”,
 që dihet se shkakton probleme (veçanërisht në Windows).
@@ -1890,6 +1897,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>Shihni <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Standarde të përdorur në Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="si-financohet-zhvillimi-i-delta-chat-it">
         
         

src/main/assets/help/uk/help.html

@@ -99,6 +99,7 @@
       <li><a href="#чи-сумісний-delta-chat-із-protonmail--tutanota--criptext">Чи сумісний Delta Chat із Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#remove-account">Як мені видалити свій обліковий запис?</a></li>
       <li><a href="#мене-цікавлять-технічні-деталі-можете-розповісти-більше">Мене цікавлять технічні деталі. Можете розповісти більше?</a></li>
+      <li><a href="#де-мої-друзі-можуть-знайти-delta-chat">Де мої друзі можуть знайти Delta Chat?</a></li>
       <li><a href="#як-фінансується-розробка-delta-chat">Як фінансується розробка Delta Chat?</a></li>
     </ul>
   </li>
@@ -267,7 +268,7 @@
   </li>
 </ul>
 
-<p>Щоб заархівувати або закріпити чат, довго торкніться (Android), скористайтеся меню чату (Android/комп’ютер) або проведіть пальцем ліворуч (iOS); щоб вимкнути звук чату, скористайтеся меню чату (Android/комп’ютер) або профілем чату (iOS).</p>
+<p>Щоб скористатися функціями, утримуйте натиснутою клавішу або клацніть правою кнопкою миші на чаті у списку чатів.</p>
     
       <h3 id="що-означає-зелена-точка">
         
@@ -944,6 +945,12 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
   <li>
     <p>У <strong>Windows</strong> перейдіть до <strong>Панель керування / Мережа та Інтернет</strong> і переконайтеся, що <strong>Приватна мережа</strong> вибрано як “Тип мережевого профілю” (після перенесення ви можете повернути початкове значення)</p>
   </li>
+  <li>
+    <p>На <strong>iOS</strong> переконайтеся, що доступ до “Системні налаштування / Програми / Delta Chat / <strong>Локальна мережа</strong>” дозволено</p>
+  </li>
+  <li>
+    <p>У <strong>macOS</strong> увімкніть “Системні налаштування / Конфіденційність і безпека / <strong>Локальна мережа</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Ваша система може мати “персональний брандмауер”, який, як відомо, викликає проблеми (особливо у Windows). <strong>Вимкніть персональний брандмауер</strong> для Delta Chat на обох кінцях і повторіть спробу</p>
   </li>
@@ -1032,9 +1039,11 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
       </h3>
 
 <ul>
-  <li>Загалом, будь-хто може ділитися додатками webxdc один з одним один з одним без обмежень.</li>
-  <li>Ви можете <a href="https://delta.chat/en/2023-08-11-xstore">надіслати “hi” на xstore@testrun.org</a> щоб побачити експериментальний магазин додатків webxdc. Всі програми мають відкритий вихідний код і є безкоштовними.</li>
-  <li>Багато людей пишуть власні програми для webxdc і публікують їх на <a href="https://support.delta.chat/c/webxdc/20">форумі Delta Chat</a>.</li>
+  <li>Загалом, будь-хто може ділитися додатками webxdc один з одним без обмежень.</li>
+  <li>З <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
+  <li>Ви можете <a href="https://delta.chat/en/2023-08-11-xstore">надіслати “привіт” на xstore@testrun.org</a> щоб побачити експериментальний магазин додатків webxdc.
+Всі програми мають відкритий вихідний код і є безкоштовними.</li>
+  <li>Багато людей пишуть власні програми webxdc і публікують їх на <a href="https://support.delta.chat/c/webxdc/20">форумі Delta Chat</a>.</li>
 </ul>
     
       <h3 id="як-я-можу-створювати-власні-програми-webxdc">
@@ -1374,6 +1383,34 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
   <li>Дивіться <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Стандарти, що використовуються у Delta Chat</a>.</li>
 </ul>
     
+      <h3 id="де-мої-друзі-можуть-знайти-delta-chat">
+        
+        
+          Де мої друзі можуть знайти Delta Chat? <a href="#де-мої-друзі-можуть-знайти-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat доступний для всіх основних і деяких другорядних платформ:</p>
+
+<ul>
+  <li>
+    <p>На <strong>офіційному сайті</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> детально описані всі варіанти</p>
+  </li>
+  <li>
+    <p>Якщо вона недоступна, скористайтеся <strong>дзеркалом</strong> за адресою <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Відкрийте один з наступних <strong>магазинів додатків і введіть у пошук “Delta Chat”:</strong> Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS та macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Перевірте <strong>менеджер пакунків</strong> вашого дистрибутива Linux</p>
+  </li>
+  <li>
+    <p><strong>APK для Android</strong> також доступні на <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="як-фінансується-розробка-delta-chat">
         
         

src/main/assets/help/zh_CN/help.html

@@ -27,9 +27,9 @@
   </li>
   <li><a href="#instant-delivery">Instant message delivery and Push Notifications</a>
     <ul>
-      <li><a href="#what-are-push-notifications-how-can-i-get-instant-message-delivery">What are Push Notifications? How can I get instant message delivery?</a></li>
-      <li><a href="#are-push-notifications-enabled-on-ios-devices-is-there-an-alternative">Are Push Notifications enabled on iOS devices? Is there an alternative?</a></li>
-      <li><a href="#android-push">Are Push notifications enabled / needed on Android devices?</a></li>
+      <li><a href="#什么是推送通知如何获得即时消息传递">什么是推送通知？如何获得即时消息传递？</a></li>
+      <li><a href="#ios-设备上是否启用了推送通知我还有其他的选择吗">iOS 设备上是否启用了推送通知？我还有其他的选择吗？</a></li>
+      <li><a href="#android-设备上是否启用需要推送通知android-push">Android 设备上是否启用/需要推送通知？{#android-push}</a></li>
       <li><a href="#privacy-notifications">How private are Delta Chat Push Notifications?</a></li>
       <li><a href="#why-does-delta-chat-integrate-with-centralized-proprietary-applegoogle-push-services">Why does Delta Chat integrate with centralized proprietary Apple/Google push services?</a></li>
     </ul>
@@ -44,7 +44,7 @@
       <li><a href="#are-attachments-pictures-files-audio-etc-end-to-end-encrypted">Are attachments (pictures, files, audio etc.) end-to-end encrypted?</a></li>
       <li><a href="#openpgp-secure">Is OpenPGP secure?</a></li>
       <li><a href="#openpgp-alternatives">Did you consider using alternatives to OpenPGP for end-to-end -encryption?</a></li>
-      <li><a href="#is-delta-chat-vulnerable-to-efail">Is Delta Chat vulnerable to EFAIL?</a></li>
+      <li><a href="#delta-chat-是否容易受到-efail-攻击">Delta Chat 是否容易受到 EFAIL 攻击？</a></li>
       <li><a href="#tls">Is a message exposed in cleartext if end-to-end encryption is not available?</a></li>
       <li><a href="#message-metadata">How does Delta Chat protect metadata in messages?</a></li>
       <li><a href="#device-seizure">How to protect metadata and contacts when a device is seized?</a></li>
@@ -53,7 +53,7 @@
       <li><a href="#why-do-i-see-unencrypted-messages">Why do I see unencrypted messages?</a></li>
       <li><a href="#how-can-i-get-an-end-to-end-encrypted-chat-with-a-delta-chat-contact-who-sometimes-uses-webmail-or-another-non-autocrypt-e-mail-app">How can i get an end-to-end encrypted chat with a Delta Chat contact who sometimes uses webmail or another non-Autocrypt e-mail app?</a></li>
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
-      <li><a href="#pfs">Does Delta Chat support Perfect Forward Secrecy?</a></li>
+      <li><a href="#pfs">Delta Chat 是否支持完美前向保密？</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of Delta Chat as safe as Signal?</a></li>
       <li><a href="#importkey">我可以重复使用现有的私钥吗？</a></li>
       <li><a href="#我无法将现有的-pgp-密钥导入-delta-chat">我无法将现有的 PGP 密钥导入 Delta Chat。</a></li>
@@ -99,6 +99,7 @@
       <li><a href="#delta-chat-与-protonmail--tutanota--criptext-兼容吗">Delta Chat 与 Protonmail / Tutanota / Criptext 兼容吗？</a></li>
       <li><a href="#remove-account">如何删除我的账户？</a></li>
       <li><a href="#我对技术细节很感兴趣能告诉我更多吗">我对技术细节很感兴趣。能告诉我更多吗？</a></li>
+      <li><a href="#where-can-my-friends-find-delta-chat">Where can my friends find Delta Chat?</a></li>
       <li><a href="#delta-chat-的开发是如何被资助的">Delta Chat 的开发是如何被资助的?</a></li>
     </ul>
   </li>
@@ -337,10 +338,8 @@ The messages are deleted
 both in each email account on the server,
 and in the app itself.</p>
 
-<p>Note that you can rely on disappearing messages
-only as long as you trust your chat partners;
-malicious chat partners can take photos,
-or otherwise save, copy or forward messages before deletion.</p>
+<p>请注意，只有当您信任您的聊天伙伴时，您才可以依赖“消息定时销毁”；
+不怀好意的人可能会拍照，或者在删除之前以其他方式保存、复制或转发消息。</p>
 
 <p>Apart from that,
 if one chat partner uninstalls Delta Chat,
@@ -473,64 +472,59 @@ Delta Chat 收到的所有电子邮件都将在此期限后从服务器中删除
         
       </h2>
     
-      <h3 id="what-are-push-notifications-how-can-i-get-instant-message-delivery">
+      <h3 id="什么是推送通知如何获得即时消息传递">
         
         
-          What are Push Notifications? How can I get instant message delivery? <a href="#what-are-push-notifications-how-can-i-get-instant-message-delivery" class="anchor"></a>
+          什么是推送通知？如何获得即时消息传递？ <a href="#什么是推送通知如何获得即时消息传递" class="anchor"></a>
         
         
       </h3>
 
-<p>Push Notifications are sent by Apple and Google “Push services” to a user’s device
-so that an inactive Delta Chat app can fetch messages in the background
-and show notifications on a user’s phone if needed.</p>
+<p>推送通知由 Apple 和 Google 的“推送服务”发送到用户的设备，以便非活动状态的 Delta Chat 应用可以在后台获取消息，并在需要时在用户的手机上显示通知。</p>
 
-<p>Push Notifications work with all <a href="https://delta.chat/chatmail">chatmail</a> servers on</p>
+<p>推送通知适用于以下所有 <a href="https://delta.chat/chatmail">chatmail</a> 服务器：</p>
 
 <ul>
   <li>
-    <p>iOS devices, by integrating with Apple Push services.</p>
+    <p>iOS 设备通过与 Apple Push 服务集成。</p>
   </li>
   <li>
-    <p>Android devices, by integrating with the Google FCM Push service,
-including on devices that use <a href="https://microg.org">microG</a>
-instead of proprietary Google code on the phone.</p>
+    <p>Android 设备，通过与 Google FCM Push 服务集成，
+包括使用 <a href="https://microg.org">microG</a>
+而不是手机上专有 Google 代码的设备。</p>
   </li>
 </ul>
 
-<p>As of May 2024, classic e-mail servers do not support Push Notifications
-for Delta Chat users.</p>
+<p>自 2024 年 5 月起，传统电子邮件服务器不再支持 Delta Chat 用户的推送通知。</p>
     
-      <h3 id="are-push-notifications-enabled-on-ios-devices-is-there-an-alternative">
+      <h3 id="ios-设备上是否启用了推送通知我还有其他的选择吗">
         
         
-          Are Push Notifications enabled on iOS devices? Is there an alternative? <a href="#are-push-notifications-enabled-on-ios-devices-is-there-an-alternative" class="anchor"></a>
+          iOS 设备上是否启用了推送通知？我还有其他的选择吗？ <a href="#ios-设备上是否启用了推送通知我还有其他的选择吗" class="anchor"></a>
         
         
       </h3>
 
-<p>Yes, Delta Chat automatically uses Push Notifications for <a href="https://delta.chat/chatmail">chatmail</a> profiles.
-And no, there is no alternative on Apple’s phones to achieve instant message delivery
-because Apple devices do not allow Delta Chat to fetch data in the background.
-Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
-does not expose data to Apple that it doesn’t already have.</p>
+<p>是的，Delta Chat 会自动使用推送通知来接收 <a href="https://delta.chat/chatmail">chatmail</a> 个人资料。
+而且，Apple 手机上没有其他方式可以实现即时消息传递
+因为 Apple 设备不允许 Delta Chat 在后台获取数据。
+推送通知会自动为 iOS 用户激活，因为
+<a href="#privacy-notifications">Delta Chat 的隐私保护推送通知系统</a>
+不会向 Apple 泄露其尚未拥有的数据。</p>
     
-      <h3 id="android-push">
+      <h3 id="android-设备上是否启用需要推送通知android-push">
         
         
-          Are Push notifications enabled / needed on Android devices? <a href="#android-push" class="anchor"></a>
+          Android 设备上是否启用/需要推送通知？{#android-push} <a href="#android-设备上是否启用需要推送通知android-push" class="anchor"></a>
         
         
       </h3>
 
-<p>If a “Push Service” is available, Delta Chat enables Push Notifications
-to achieve instant message delivery for all chatmail users.
-If you are using a classic e-mail provider instead of <a href="https://delta.chat/chatmail">chatmail</a> servers,
-Push Notifications are not available.</p>
+<p>如果有“推送服务”可用，Delta Chat 将启用推送通知，
+以实现所有聊天邮件用户的即时消息传递。
+如果您使用的是传统电子邮件提供商而不是 <a href="https://delta.chat/chatmail">chatmail</a> 服务器，则无法使用推送通知。</p>
 
-<p>In the Delta Chat “Notifications” settings for “Instant delivery”
-you can change the following settings effecting all chat profiles:</p>
+<p>在 Delta Chat“通知”的“推送通知”设置中，您可以更改以下影响所有聊天配置文件的设置：</p>
 
 <ul>
   <li>
@@ -710,17 +704,13 @@ both sides will eventually see a (group or direct) chat with a green checkmark
 next to the title.</p>
   </li>
   <li>
-    <p>If one of the devices is offline, the green checkmarks will only
-appear later when the device is internet-connected again
-and the Secure-Join network protocol completed.</p>
+    <p>如果其中一个设备处于离线状态，则只有当设备再次连接互联网且安全加入网络协议完成时，绿色复选标记才会出现。</p>
   </li>
 </ul>
 
-<p>Congratulations! 
-You now will automatically use guaranteed end-to-end encryption
-with this contact and both of you can add each other to green-checkmarked groups
-<img style="vertical-align:middle; width:1.5em; margin:1px" src="../green-checkmark.png" alt="green checkmark" />,
-thereby automatically spreading guaranteed end-to-end encryption among its members.</p>
+<p>恭喜！
+从现在开始您将会自动使用安全的端到端加密与此联系人联系，并且双方都可以将对方添加到绿色复选标记的群组
+<img style="vertical-align:middle; width:1.5em; margin:1px" src="../green-checkmark.png" alt="green checkmark" />，从而自动在其成员之间传播有保障的端到端加密。</p>
     
       <h3 id="e2eeguarantee">
         
@@ -891,19 +881,18 @@ only one part of “user outcomes”,
 see also our answers to <a href="#device-seizure">device-seizure</a>
 and <a href="#message-metadata">message-metadata</a> questions.</p>
     
-      <h3 id="is-delta-chat-vulnerable-to-efail">
+      <h3 id="delta-chat-是否容易受到-efail-攻击">
         
         
-          Is Delta Chat vulnerable to EFAIL? <a href="#is-delta-chat-vulnerable-to-efail" class="anchor"></a>
+          Delta Chat 是否容易受到 EFAIL 攻击？ <a href="#delta-chat-是否容易受到-efail-攻击" class="anchor"></a>
         
         
       </h3>
 
-<p>No, <a href="https://delta.chat/en/2018-05-15-delta-chat-not-vulnerable-to-efail">Delta Chat never was vulnerable to EFAIL</a>
-because its OpenPGP implementation <a href="https://github.com/rpgp/rpgp">rPGP</a> 
-uses Modification Detection Code when encrypting messages
-and returns <a href="https://docs.rs/pgp/latest/pgp/errors/enum.Error.html#variant.MdcError">an error</a>
-if the Modification Detection Code is incorrect.</p>
+<p>不，<a href="https://delta.chat/en/2018-05-15-delta-chat-not-vulnerable-to-efail">Delta Chat 从未受到任何 EFAIL 攻击</a>
+因为所使用的 OpenPGP 实现了 <a href="https://github.com/rpgp/rpgp">rPGP</a>
+在加密消息时“修改检测代码”
+并且如果“修改检测代码”不正确则返回 <a href="https://docs.rs/pgp/latest/pgp/errors/enum.Error.html#variant.MdcError">错误</a>。</p>
 
 <p>Delta Chat also never was vulnerable to the “Direct Exfiltration” EFAIL attack
 because it only decrypts <code class="language-plaintext highlighter-rouge">multipart/encrypted</code> messages
@@ -1072,21 +1061,21 @@ you can also turn on <a href="#delold">“delete messages from server automatica
       <h3 id="pfs">
         
         
-          Does Delta Chat support Perfect Forward Secrecy? <a href="#pfs" class="anchor"></a>
+          Delta Chat 是否支持完美前向保密？ <a href="#pfs" class="anchor"></a>
         
         
       </h3>
 
-<p>No, Delta Chat doesn’t support Perfect Forward Secrecy (PFS).
-This means that if your Delta Chat private decryption key is leaked,
-and someone has collected your prior in-transit messages,
-they will be able to decrypt and read them using the leaked decryption key.</p>
+<p>不，Delta Chat 不支持完美前向保密 (PFS)。
+这意味着，如果您的 Delta Chat 私人解密密钥泄露，
+并且有人收集了您之前传输的消息，
+他们将能够使用泄露的解密密钥解密并阅读这些消息。</p>
 
-<p>Note, however, that if anyone obtains to your decryption keys, 
-they will typically also be able to obtain your messages, 
-irrespective if Perfect Forward Secrecy is in place or not. 
-The typical real-world situation for leaked decryption keys is device seizure
-which we discuss in our answer <a href="#device-seizure">on metadata and device seizure</a>.</p>
+<p>但请注意，如果有人获得您的解密密钥，
+他们通常也能够获得您的消息，
+无论是否实施了完全前向保密。
+泄露解密密钥的典型现实情况是设备扣押，
+我们在<a href="#device-seizure">关于元数据和设备扣押</a>的回答中讨论了这一点。</p>
 
 <p>It is possible that Delta Chat evolves to support Perfect Forward Secrecy,
 because OpenPGP is just a container for encrypted messages 
@@ -1272,6 +1261,12 @@ One device is not needed for the other to work.</p>
 and make sure, <strong>Private Network</strong> is selected as “Network profile type”
 (after transfer, you can change back to the original value)</p>
   </li>
+  <li>
+    <p>On <strong>iOS</strong>, make sure “System Settings / Apps / Delta Chat / <strong>Local Network</strong>” access is granted</p>
+  </li>
+  <li>
+    <p>On <strong>macOS</strong>, enable “System Settings / Privacy &amp; Security / <strong>Local Network</strong> / Delta Chat”</p>
+  </li>
   <li>
     <p>Your system might have a “personal firewall”,
 which is known to cause problems (especially on Windows).
@@ -1384,6 +1379,7 @@ you only open attachments from senders you trust, and not from spammers.</li>
 <ul>
   <li>In general, anyone can share webxdc apps with each
 other without restrictions.</li>
+  <li>From <a href="https://webxdc.org/apps/">webxdc.org/apps</a>.</li>
   <li>You can <a href="https://delta.chat/en/2023-08-11-xstore">send ‘hi’ to xstore@testrun.org</a>
 to see an experimental webxdc appstore.
 All of the apps are open source and for free.</li>
@@ -1794,6 +1790,35 @@ Otherwise you might receive undecryptable messages from those group chats.</p>
   <li>请参阅 <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Delta Chat 中使用的标准</a>。</li>
 </ul>
     
+      <h3 id="where-can-my-friends-find-delta-chat">
+        
+        
+          Where can my friends find Delta Chat? <a href="#where-can-my-friends-find-delta-chat" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>Delta Chat is available for all major and some minor platforms:</p>
+
+<ul>
+  <li>
+    <p>The <strong>official website</strong>, <a href="https://delta.chat/download">https://delta.chat/download</a> shows all options in detail</p>
+  </li>
+  <li>
+    <p>If unavailable, use the <strong>mirror</strong> at <a href="https://deltachat.github.io/deltachat-pages">https://deltachat.github.io/deltachat-pages</a></p>
+  </li>
+  <li>
+    <p>Open one of the following <strong>app stores and search for “Delta Chat”:</strong>
+Google Play Store, F-Droid, Huawei App Gallery, Amazon App Store, iOS and macOS App Store, Microsoft Store</p>
+  </li>
+  <li>
+    <p>Check the <strong>package manager</strong> of your Linux distributions</p>
+  </li>
+  <li>
+    <p><strong>Android APKs</strong> are also available on <a href="https://github.com/deltachat/deltachat-android/releases">https://github.com/deltachat/deltachat-android/releases</a></p>
+  </li>
+</ul>
+    
       <h3 id="delta-chat-的开发是如何被资助的">
         
         

src/main/java/com/b44t/messenger/DcContext.java

@@ -2,16 +2,14 @@ package com.b44t.messenger;
 
 public class DcContext {
 
-    public final static int DC_PREF_DEFAULT_MDNS_ENABLED = 1;
-    public final static int DC_PREF_DEFAULT_TRIM_ENABLED = 0;
-    public final static int DC_PREF_DEFAULT_TRIM_LENGTH  = 500;
-
     public final static int DC_EVENT_INFO                        = 100;
     public final static int DC_EVENT_WARNING                     = 300;
     public final static int DC_EVENT_ERROR                       = 400;
     public final static int DC_EVENT_ERROR_SELF_NOT_IN_GROUP     = 410;
     public final static int DC_EVENT_MSGS_CHANGED                = 2000;
     public final static int DC_EVENT_REACTIONS_CHANGED           = 2001;
+    public final static int DC_EVENT_INCOMING_REACTION           = 2002;
+    public final static int DC_EVENT_INCOMING_WEBXDC_NOTIFY      = 2003;
     public final static int DC_EVENT_INCOMING_MSG                = 2005;
     public final static int DC_EVENT_MSGS_NOTICED                = 2008;
     public final static int DC_EVENT_MSG_DELIVERED               = 2010;
@@ -82,16 +80,13 @@ public class DcContext {
     public final static int DC_MEDIA_QUALITY_BALANCED = 0;
     public final static int DC_MEDIA_QUALITY_WORSE    = 1;
 
-    public final static int DC_DECISION_START_CHAT = 0;
-    public final static int DC_DECISION_BLOCK      = 1;
-    public final static int DC_DECISION_NOT_NOW    = 2;
-
     public final static int DC_CONNECTIVITY_NOT_CONNECTED = 1000;
     public final static int DC_CONNECTIVITY_CONNECTING = 2000;
     public final static int DC_CONNECTIVITY_WORKING = 3000;
     public final static int DC_CONNECTIVITY_CONNECTED = 4000;
 
     private static final String CONFIG_ACCOUNT_ENABLED = "ui.enabled";
+    private static final String CONFIG_MUTE_MENTIONS_IF_MUTED = "ui.mute_mentions_if_muted";
 
     // when using DcAccounts, use DcAccounts.addAccount() instead
     public DcContext(String osName, String dbfile) {
@@ -200,11 +195,10 @@ public class DcContext {
     public native void         deleteMsgs           (int msg_ids[]);
     public native void         forwardMsgs          (int msg_ids[], int chat_id);
     public native boolean      resendMsgs           (int msg_ids[]);
-    public native int          prepareMsg           (int chat_id, DcMsg msg);
     public native int          sendMsg              (int chat_id, DcMsg msg);
     public native int          sendTextMsg          (int chat_id, String text);
     public native int          sendVideochatInvitation(int chat_id);
-    public native boolean      sendWebxdcStatusUpdate(int msg_id, String payload, String descr);
+    public native boolean      sendWebxdcStatusUpdate(int msg_id, String payload);
     public native String       getWebxdcStatusUpdates(int msg_id, int last_known_serial);
     public native void         setWebxdcIntegration (String file);
     public native int          initWebxdcIntegration(int chat_id);
@@ -232,22 +226,12 @@ public class DcContext {
       }
     }
 
-    public String getNameNAddr() {
-      String displayname = getConfig("displayname");
-      String addr = getConfig("addr");
-      String ret = "";
+    public boolean isMentionsEnabled() {
+      return getConfigInt(CONFIG_MUTE_MENTIONS_IF_MUTED) != 1;
+    }
 
-      if (!displayname.isEmpty() && !addr.isEmpty()) {
-        ret = String.format("%s (%s)", displayname, addr);
-      } else if (!addr.isEmpty()) {
-        ret = addr;
-      }
-
-      if (ret.isEmpty() || isConfigured() == 0) {
-        ret += " (not configured)";
-      }
-
-      return ret.trim();
+    public void setMentionsEnabled(boolean enabled) {
+      setConfigInt(CONFIG_MUTE_MENTIONS_IF_MUTED, enabled? 0 : 1);
     }
 
     public String getName() {

src/main/java/com/b44t/messenger/DcMsg.java

@@ -148,6 +148,7 @@ public class DcMsg {
         return new JSONObject();
       }
     }
+    public native String  getWebxdcHref      ();
     public native boolean isForwarded        ();
     public native boolean isInfo             ();
     public native boolean isSetupMessage     ();
@@ -155,25 +156,25 @@ public class DcMsg {
     public native String  getSetupCodeBegin  ();
     public native String  getVideochatUrl    ();
     public native int     getVideochatType   ();
-    public native boolean isIncreation       ();
     public native void    setText            (String text);
     public native void    setSubject         (String text);
     public native void    setHtml            (String text);
     public native void    setFile            (String file, String filemime);
+    public native void    forceSticker       ();
     public native void    setDimension       (int width, int height);
     public native void    setDuration        (int duration);
     public native void    setLocation        (float latitude, float longitude);
+    public native String  getPOILocation     ();
     public void           setQuote           (DcMsg quote) { setQuoteCPtr(quote.msgCPtr); }
     public native String  getQuotedText      ();
     public native String  getError           ();
     public native String  getOverrideSenderName();
-    public native boolean isOutgoing();
     public native int     getSenderColor();
 
-    public String getSenderName(DcContact dcContact, boolean markOverride) {
+    public String getSenderName(DcContact dcContact) {
         String overrideName = getOverrideSenderName();
         if (overrideName != null) {
-            return (markOverride ? "~" : "") + overrideName;
+            return "~" + overrideName;
         } else {
             return dcContact.getDisplayName();
         }
@@ -208,6 +209,10 @@ public class DcMsg {
         return ids;
     }
 
+    public boolean isOutgoing() {
+        return getFromId() == DcContact.DC_CONTACT_ID_SELF;
+    }
+
     public String getDisplayBody()  {
         return getText();
     }

src/main/java/com/b44t/messenger/rpc/Rpc.java

@@ -79,23 +79,6 @@ public class Rpc {
         }
     }
 
-    public int addAccount() throws RpcException {
-        return gson.fromJson(getResult("add_account"), int.class);
-    }
-
-    public void startIO() throws RpcException {
-        getResult("start_io_for_all_accounts");
-    }
-
-    public void stopIO() throws RpcException {
-        getResult("stop_io_for_all_accounts");
-    }
-
-    public Map<String, String> getSystemInfo() throws RpcException {
-        TypeToken<Map<String, String>> mapType = new TypeToken<Map<String, String>>(){};
-        return gson.fromJson(getResult("get_system_info"), mapType.getType());
-    }
-
     public List<VcardContact> parseVcard(String path) throws RpcException {
         TypeToken<List<VcardContact>> listType = new TypeToken<List<VcardContact>>(){};
         return gson.fromJson(getResult("parse_vcard", path), listType.getType());

src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -27,7 +27,6 @@ import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcEventEmitter;
 import com.b44t.messenger.rpc.Rpc;
 
-import org.thoughtcrime.securesms.components.emoji.EmojiProvider;
 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -37,7 +36,6 @@ import org.thoughtcrime.securesms.connect.KeepAliveService;
 import org.thoughtcrime.securesms.connect.NetworkStateReceiver;
 import org.thoughtcrime.securesms.crypto.DatabaseSecret;
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
-import org.thoughtcrime.securesms.crypto.PRNGFixes;
 import org.thoughtcrime.securesms.geolocation.DcLocationManager;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.notifications.FcmReceiveService;
@@ -107,11 +105,6 @@ public class ApplicationContext extends MultiDexApplication {
 
     Log.i("DeltaChat", "++++++++++++++++++ ApplicationContext.onCreate() ++++++++++++++++++");
 
-    // The first call to `getInstance` takes about 100ms-300ms, so, do it on a background thread
-    Thread t = new Thread(() -> EmojiProvider.getInstance(this), "InitEmojiProviderThread");
-    t.setPriority(Thread.MIN_PRIORITY);
-    t.start();
-
     System.loadLibrary("native-utils");
 
     dcAccounts = new DcAccounts(new File(getFilesDir(), "accounts").getAbsolutePath());
@@ -131,9 +124,6 @@ public class ApplicationContext extends MultiDexApplication {
           e.printStackTrace();
         }
       }
-      if ("deltafans@nine.testrun.org".equals(ac.getConfig("configured_addr")) && !ac.isCommunity()) {
-          ac.setCommunityMode(true);
-      }
     }
     if (allAccounts.length == 0) {
       dcAccounts.addAccount();
@@ -209,7 +199,6 @@ public class ApplicationContext extends MultiDexApplication {
 
     KeepAliveService.maybeStartSelf(this);
 
-    initializeRandomNumberFix();
     initializeLogging();
     initializeJobManager();
     InChatSounds.getInstance(this);
@@ -240,11 +229,10 @@ public class ApplicationContext extends MultiDexApplication {
             TimeUnit.MILLISECONDS)
             .setConstraints(constraints)
             .build();
-    try {
-      // in Android 4 this throws exception due to R8/shrinking
-      WorkManager.getInstance(this)
-        .enqueueUniquePeriodicWork("FetchWorker", ExistingPeriodicWorkPolicy.KEEP, fetchWorkRequest);
-    } catch (Throwable e) {}
+    WorkManager.getInstance(this).enqueueUniquePeriodicWork(
+            "FetchWorker",
+            ExistingPeriodicWorkPolicy.KEEP,
+            fetchWorkRequest);
     AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
 
     if (Prefs.isPushEnabled(this)) {
@@ -258,10 +246,6 @@ public class ApplicationContext extends MultiDexApplication {
     return jobManager;
   }
 
-  private void initializeRandomNumberFix() {
-    PRNGFixes.apply();
-  }
-
   private void initializeLogging() {
     SignalProtocolLoggerProvider.setProvider(new AndroidSignalProtocolLogger());
   }

src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -156,10 +156,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
       this.findPreference(PREFERENCE_CATEGORY_HELP)
           .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_HELP));
 
-      if (VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-        tintIcons(getActivity());
-      }
-
       DcHelper.getEventCenter(getActivity()).addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this);
     }
 

src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java

@@ -33,9 +33,6 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     onPreCreate();
-    if (BaseActivity.isMenuWorkaroundRequired()) {
-      forceOverflowMenu();
-    }
     super.onCreate(savedInstanceState);
   }
 
@@ -46,20 +43,6 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
     dynamicTheme.onResume(this);
   }
 
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    return (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
-  }
-
-  @Override
-  public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
-    if (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) {
-      openOptionsMenu();
-      return true;
-    }
-    return super.onKeyUp(keyCode, event);
-  }
-
   private void initializeScreenshotSecurity() {
     if (Prefs.isScreenSecurityEnabled(this)) {
       getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);

src/main/java/org/thoughtcrime/securesms/BaseActivity.java

@@ -1,28 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.os.Build;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import android.view.KeyEvent;
-
-public abstract class BaseActivity extends FragmentActivity {
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    return (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
-  }
-
-  @Override
-  public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
-    if (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) {
-      openOptionsMenu();
-      return true;
-    }
-    return super.onKeyUp(keyCode, event);
-  }
-
-  public static boolean isMenuWorkaroundRequired() {
-    return VERSION.SDK_INT < VERSION_CODES.KITKAT && ("LGE".equalsIgnoreCase(Build.MANUFACTURER) || "E6710".equalsIgnoreCase(Build.DEVICE));
-  }
-}

src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java

@@ -364,9 +364,7 @@ public abstract class BaseConversationListFragment extends Fragment implements A
 
     mode.setTitle("1");
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      requireActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-    }
+    requireActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
 
     return true;
   }
@@ -395,11 +393,9 @@ public abstract class BaseConversationListFragment extends Fragment implements A
     actionMode = null;
     getListAdapter().initializeBatchMode(false);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      TypedArray color = requireActivity().getTheme().obtainStyledAttributes(new int[] {android.R.attr.statusBarColor});
-      requireActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
-      color.recycle();
-    }
+    TypedArray color = requireActivity().getTheme().obtainStyledAttributes(new int[]{android.R.attr.statusBarColor});
+    requireActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
+    color.recycle();
 
     Context context = getContext();
     if (context != null) {

src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -136,9 +136,7 @@ public class ContactSelectionListFragment extends    Fragment
       public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
         MenuInflater inflater = getActivity().getMenuInflater();
         inflater.inflate(R.menu.contact_list, menu);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-          getActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-        }
+        getActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
         setCorrectMenuVisibility(menu);
         actionMode.setTitle("1");
         return true;
@@ -170,11 +168,9 @@ public class ContactSelectionListFragment extends    Fragment
         ContactSelectionListFragment.this.actionMode = null;
         getContactSelectionListAdapter().resetActionModeSelection();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-          TypedArray color = getActivity().getTheme().obtainStyledAttributes(new int[] {android.R.attr.statusBarColor});
-          getActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
-          color.recycle();
-        }
+        TypedArray color = getActivity().getTheme().obtainStyledAttributes(new int[]{android.R.attr.statusBarColor});
+        getActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
+        color.recycle();
       }
     };
 

src/main/java/org/thoughtcrime/securesms/ConversationActivity.java

@@ -45,6 +45,7 @@ import android.text.TextWatcher;
 import android.util.Log;
 import android.util.Pair;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -53,6 +54,7 @@ import android.view.View.OnFocusChangeListener;
 import android.view.View.OnKeyListener;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -89,8 +91,6 @@ import org.thoughtcrime.securesms.components.InputPanel;
 import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout.OnKeyboardShownListener;
 import org.thoughtcrime.securesms.components.ScaleStableImageView;
 import org.thoughtcrime.securesms.components.SendButton;
-import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
-import org.thoughtcrime.securesms.components.emoji.EmojiProvider;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
@@ -119,6 +119,7 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.guava.Optional;
+import org.thoughtcrime.securesms.util.views.ProgressDialog;
 import org.thoughtcrime.securesms.util.views.Stub;
 import org.thoughtcrime.securesms.video.recode.VideoRecoder;
 import org.thoughtcrime.securesms.videochat.VideochatUtil;
@@ -162,8 +163,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private static final int GROUP_EDIT          = 6;
   private static final int TAKE_PHOTO          = 7;
   private static final int RECORD_VIDEO        = 8;
-  private static final int PICK_LOCATION       = 9;  // TODO: i think, this can be deleted
-  private static final int SMS_DEFAULT         = 11; // TODO: i think, this can be deleted
+  private static final int PICK_WEBXDC         = 9;
 
   private   GlideRequests               glideRequests;
   protected ComposeText                 composeText;
@@ -176,11 +176,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   View                        composePanel;
   private   ScaleStableImageView        backgroundView;
   private   MessageRequestsBottomView   messageRequestBottomView;
+  private   ProgressDialog              progressDialog;
 
   private   AttachmentTypeSelector attachmentTypeSelector;
   private   AttachmentManager      attachmentManager;
   private   AudioRecorder          audioRecorder;
-  private   Stub<MediaKeyboard>    emojiDrawerStub;
+  private   FrameLayout            emojiPickerContainer;
+  private   MediaKeyboard          emojiPicker;
   protected HidingLinearLayout     quickAttachmentToggle;
   private   InputPanel             inputPanel;
 
@@ -320,10 +322,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     super.onConfigurationChanged(newConfig);
     composeText.setTransport(sendButton.getSelectedTransport());
 
-    if (emojiDrawerStub.resolved() && container.getCurrentInput() == emojiDrawerStub.get()) {
+    if (emojiPicker != null && container.getCurrentInput() == emojiPicker) {
       container.hideAttachedInput(true);
     }
 
+    emojiPicker = null; // force reloading next time onEmojiToggle() is called
     initializeBackground();
   }
 
@@ -337,8 +340,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public void onActivityResult(final int reqCode, int resultCode, Intent data) {
     super.onActivityResult(reqCode, resultCode, data);
 
-    if ((data == null && reqCode != TAKE_PHOTO && reqCode != RECORD_VIDEO && reqCode != SMS_DEFAULT) ||
-        (resultCode != RESULT_OK && reqCode != SMS_DEFAULT))
+    if (resultCode != RESULT_OK || (data == null && reqCode != TAKE_PHOTO && reqCode != RECORD_VIDEO))
     {
       return;
     }
@@ -362,7 +364,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
             for (int i = 0; i < uriCount; i++) {
               uriList.add(multipleUris.getItemAt(i).getUri());
             }
-            askSendingFiles(uriList, () -> SendRelayedMessageUtil.sendMultipleMsgs(this, chatId, uriList, null));
+            askSendingFiles(uriList, () -> {
+              Util.runOnAnyBackgroundThread(() -> {
+                SendRelayedMessageUtil.sendMultipleMsgs(this, chatId, uriList, null);
+              });
+            });
           }
         }
       }
@@ -374,6 +380,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       setMedia(data.getData(), docMediaType);
       break;
 
+    case PICK_WEBXDC:
+      setMedia(data.getData(), MediaType.DOCUMENT);
+      break;
+
     case PICK_CONTACT:
       addAttachmentContactInfo(data.getIntExtra(AttachContactActivity.CONTACT_ID_EXTRA, 0));
       break;
@@ -401,16 +411,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       }
       break;
 
-    case PICK_LOCATION:
-      break;
-
     case ScribbleActivity.SCRIBBLE_REQUEST_CODE:
       setMedia(data.getData(), MediaType.IMAGE);
       break;
-
-    case SMS_DEFAULT:
-      initializeSecurity(isSecureText, isDefaultSms);
-      break;
     }
   }
 
@@ -710,7 +713,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     DcMsg draft = dcContext.getDraft(chatId);
     final String sharedText = RelayUtil.getSharedText(this);
 
-    if (draft == null) {
+    if (!draft.isOk()) {
       if (TextUtils.isEmpty(sharedText)) {
         composeText.setText("");
         future.set(false);
@@ -811,7 +814,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     sendButton            = ViewUtil.findById(this, R.id.send_button);
     attachButton          = ViewUtil.findById(this, R.id.attach_button);
     composeText           = ViewUtil.findById(this, R.id.embedded_text_editor);
-    emojiDrawerStub       = ViewUtil.findStubById(this, R.id.emoji_drawer_stub);
+    emojiPickerContainer  = ViewUtil.findById(this, R.id.emoji_picker_container);
     composePanel          = ViewUtil.findById(this, R.id.bottom_panel);
     container             = ViewUtil.findById(this, R.id.layout_container);
     quickAttachmentToggle = ViewUtil.findById(this, R.id.quick_attachment_toggle);
@@ -931,13 +934,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     case AttachmentTypeSelector.TAKE_PHOTO:
       attachmentManager.capturePhoto(this, TAKE_PHOTO); break;
     case AttachmentTypeSelector.RECORD_VIDEO:
-      if(VideoRecoder.canRecode()) {
-        attachmentManager.captureVideo(this, RECORD_VIDEO);
-      }
-      else {
-        Toast.makeText(this, "This device does not support video-compression (requires Android 4.4 KitKat)", Toast.LENGTH_LONG).show();
-      }
+      attachmentManager.captureVideo(this, RECORD_VIDEO);
       break;
+    case AttachmentTypeSelector.ADD_WEBXDC:
+      AttachmentManager.selectWebxdc(this, PICK_WEBXDC); break;
     }
   }
 
@@ -986,14 +986,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   protected static final int ACTION_SEND_OUT = 1;
   protected static final int ACTION_SAVE_DRAFT = 2;
 
-  private String getSelfReaction(int msgId) {
-    try {
-      final String [] selfReactions = rpc.getMsgReactions(dcContext.getAccountId(), msgId).getReactionsByContact().get(DcContact.DC_CONTACT_ID_SELF);
-      if (selfReactions != null && selfReactions.length > 0) return selfReactions[0];
-    } catch(Exception e) { e.printStackTrace(); }
-    return null;
-  }
-
   protected ListenableFuture<Integer> processComposeControls(int action) {
     return processComposeControls(action, composeText.getTextTrimmed(),
       attachmentManager.isAttachmentPresent() ?
@@ -1079,7 +1071,23 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
           {
             boolean doSend = true;
             if (recompress==DcMsg.DC_MSG_VIDEO) {
+              Util.runOnMain(() -> {
+                progressDialog = ProgressDialog.show(
+                        ConversationActivity.this,
+                        "",
+                        getString(R.string.one_moment),
+                        true,
+                        false
+                );
+              });
               doSend = VideoRecoder.prepareVideo(ConversationActivity.this, dcChat.getId(), msg);
+              Util.runOnMain(() -> {
+                try {
+                  progressDialog.dismiss();
+                } catch (final IllegalArgumentException e) {
+                  // The activity is finishing/destroyed, do nothing.
+                }
+              });
             }
 
             if (doSend) {
@@ -1235,17 +1243,23 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     });
   }
 
+  private void reloadEmojiPicker() {
+    emojiPickerContainer.removeAllViews();
+    emojiPicker = (MediaKeyboard) LayoutInflater.from(this).inflate(R.layout.conversation_activity_emojidrawer_stub, emojiPickerContainer, false);
+    emojiPickerContainer.addView(emojiPicker);
+    inputPanel.setMediaKeyboard(emojiPicker);
+  }
+
   @Override
   public void onEmojiToggle() {
-    if (!emojiDrawerStub.resolved()) {
-      initializeMediaKeyboardProviders(emojiDrawerStub.get(), false);
-      inputPanel.setMediaKeyboard(emojiDrawerStub.get());
+    if (emojiPicker == null) {
+      reloadEmojiPicker();
     }
 
-    if (container.getCurrentInput() == emojiDrawerStub.get()) {
+    if (container.getCurrentInput() == emojiPicker) {
       container.showSoftkey(composeText);
     } else {
-      container.show(composeText, emojiDrawerStub.get());
+      container.show(composeText, emojiPicker);
     }
   }
 
@@ -1274,16 +1288,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       msg.setQuote(quote.get().getQuotedMsg());
     }
     msg.setFile(path, null);
+    msg.forceSticker();
     dcContext.sendMsg(chatId, msg);
   }
 
-  private void initializeMediaKeyboardProviders(@NonNull MediaKeyboard mediaKeyboard, boolean stickersAvailable) {
-    boolean isSystemEmojiPreferred   = Prefs.isSystemEmojiPreferred(this);
-    if (!isSystemEmojiPreferred) {
-      mediaKeyboard.setProviders(0, new EmojiKeyboardProvider(this, inputPanel));
-    }
-  }
-
   // Listeners
 
   private class AttachmentTypeListener implements AttachmentTypeSelector.AttachmentClickedListener {

src/main/java/org/thoughtcrime/securesms/ConversationFragment.java

@@ -24,9 +24,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -211,7 +211,7 @@ public class ConversationFragment extends MessageSelectorFragment
     public void onResume() {
         super.onResume();
 
-        dcContext.marknoticedChat((int) chatId);
+        Util.runOnBackground(() -> dcContext.marknoticedChat((int) chatId));
         if (list.getAdapter() != null) {
             list.getAdapter().notifyDataSetChanged();
         }
@@ -442,7 +442,7 @@ public class ConversationFragment extends MessageSelectorFragment
 
             if (msg.getFromId() != prevMsg.getFromId() && !singleMsg) {
                 DcContact contact = dcContext.getContact(msg.getFromId());
-                result.append(msg.getSenderName(contact, false)).append(":\n");
+                result.append(msg.getSenderName(contact)).append(":\n");
             }
             if (msg.getType() == DcMsg.DC_MSG_TEXT || (singleMsg && !msg.getText().isEmpty())) {
                 result.append(msg.getText());
@@ -810,7 +810,10 @@ public class ConversationFragment extends MessageSelectorFragment
                 DozeReminder.dozeReminderTapped(getContext());
             }
             else if(messageRecord.getInfoType() == DcMsg.DC_INFO_WEBXDC_INFO_MESSAGE) {
-                scrollMaybeSmoothToMsgId(messageRecord.getParent().getId());
+                WebxdcActivity.openWebxdcActivity(getContext(), messageRecord.getParent(), messageRecord.getWebxdcHref());
+            }
+            else if (!TextUtils.isEmpty(messageRecord.getPOILocation()) && messageRecord.getType() == DcMsg.DC_MSG_TEXT && !messageRecord.hasHtml()) {
+                WebxdcActivity.openMaps(getContext(), getListAdapter().getChat().getId(), "index.html#"+messageRecord.getPOILocation());
             }
             else {
                 String self_mail = dcContext.getConfig("configured_mail_user");
@@ -911,11 +914,9 @@ public class ConversationFragment extends MessageSelectorFragment
 
             mode.setTitle("1");
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                Window window = getActivity().getWindow();
-                statusBarColor = window.getStatusBarColor();
-                window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-            }
+            Window window = getActivity().getWindow();
+            statusBarColor = window.getStatusBarColor();
+            window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
 
             setCorrectMenuVisibility(menu);
             ConversationAdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth());
@@ -932,9 +933,7 @@ public class ConversationFragment extends MessageSelectorFragment
             ((ConversationAdapter)list.getAdapter()).clearSelection();
             list.getAdapter().notifyDataSetChanged();
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                getActivity().getWindow().setStatusBarColor(statusBarColor);
-            }
+            getActivity().getWindow().setStatusBarColor(statusBarColor);
 
             actionMode = null;
             hideAddReactionView();

src/main/java/org/thoughtcrime/securesms/ConversationItem.java

@@ -22,12 +22,10 @@ import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
-import android.os.Build;
 import android.text.Spannable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -56,7 +54,6 @@ import org.thoughtcrime.securesms.components.DocumentView;
 import org.thoughtcrime.securesms.components.QuoteView;
 import org.thoughtcrime.securesms.components.VcardView;
 import org.thoughtcrime.securesms.components.WebxdcView;
-import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
@@ -69,10 +66,10 @@ import org.thoughtcrime.securesms.mms.StickerSlide;
 import org.thoughtcrime.securesms.mms.VcardSlide;
 import org.thoughtcrime.securesms.reactions.ReactionsConversationView;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.Linkifier;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.MarkdownUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.Stub;
@@ -112,6 +109,7 @@ public class ConversationItem extends BaseConversationItem
   protected ViewGroup              contactPhotoHolder;
   private   ViewGroup              container;
   private   Button                 msgActionButton;
+  private   Button                 showFullButton;
 
   private @NonNull  Stub<ConversationItemThumbnail> mediaThumbnailStub;
   private @NonNull  Stub<AudioView>                 audioViewStub;
@@ -158,6 +156,7 @@ public class ConversationItem extends BaseConversationItem
     this.container               =            findViewById(R.id.container);
     this.replyView               =            findViewById(R.id.reply_icon);
     this.msgActionButton         =            findViewById(R.id.msg_action_button);
+    this.showFullButton          =            findViewById(R.id.show_full_button);
 
     setOnClickListener(new ClickListener(null));
 
@@ -385,7 +384,6 @@ public class ConversationItem extends BaseConversationItem
   private void setBodyText(DcMsg messageRecord) {
     bodyText.setClickable(false);
     bodyText.setFocusable(false);
-    bodyText.setTextSize(TypedValue.COMPLEX_UNIT_SP, Prefs.getMessageBodyTextSize(context));
 
     String text = messageRecord.getText();
 
@@ -399,7 +397,7 @@ public class ConversationItem extends BaseConversationItem
     else {
       Spannable spannable = (Spannable) MarkdownUtil.toMarkdown(context, text);
       if (batchSelected.isEmpty()) {
-        spannable = EmojiTextView.linkify(spannable);
+        spannable = Linkifier.linkify(spannable);
       }
       bodyText.setText(spannable);
       bodyText.setVisibility(View.VISIBLE);
@@ -407,6 +405,7 @@ public class ConversationItem extends BaseConversationItem
 
     int downloadState = messageRecord.getDownloadState();
     if (downloadState == DcMsg.DC_DOWNLOAD_AVAILABLE || downloadState == DcMsg.DC_DOWNLOAD_FAILURE || downloadState == DcMsg.DC_DOWNLOAD_IN_PROGRESS) {
+      showFullButton.setVisibility(View.GONE);
       msgActionButton.setVisibility(View.VISIBLE);
       if (downloadState==DcMsg.DC_DOWNLOAD_IN_PROGRESS) {
         msgActionButton.setEnabled(false);
@@ -427,6 +426,7 @@ public class ConversationItem extends BaseConversationItem
         }
       });
     } else if (messageRecord.getType() == DcMsg.DC_MSG_WEBXDC) {
+      showFullButton.setVisibility(View.GONE);
       msgActionButton.setVisibility(View.VISIBLE);
       msgActionButton.setEnabled(true);
       msgActionButton.setText(webxdcViewStub.get().isCommunity()? R.string.join: R.string.start_app);
@@ -439,10 +439,11 @@ public class ConversationItem extends BaseConversationItem
       });
     }
     else if (messageRecord.hasHtml()) {
-      msgActionButton.setVisibility(View.VISIBLE);
-      msgActionButton.setEnabled(true);
-      msgActionButton.setText(R.string.show_full_message);
-      msgActionButton.setOnClickListener(view -> {
+      msgActionButton.setVisibility(View.GONE);
+      showFullButton.setVisibility(View.VISIBLE);
+      showFullButton.setEnabled(true);
+      showFullButton.setText(R.string.show_full_message);
+      showFullButton.setOnClickListener(view -> {
         if (eventListener != null && batchSelected.isEmpty()) {
           eventListener.onShowFullClicked(messageRecord);
         } else {
@@ -451,6 +452,7 @@ public class ConversationItem extends BaseConversationItem
       });
     } else {
       msgActionButton.setVisibility(View.GONE);
+      showFullButton.setVisibility(View.GONE);
     }
   }
 
@@ -492,9 +494,7 @@ public class ConversationItem extends BaseConversationItem
       audioViewStub.get().setAudio(new AudioSlide(context, messageRecord), duration);
       audioViewStub.get().setOnClickListener(passthroughClickListener);
       audioViewStub.get().setOnLongClickListener(passthroughClickListener);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-        audioViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-      }
+      audioViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -512,9 +512,7 @@ public class ConversationItem extends BaseConversationItem
       documentViewStub.get().setDocument(new DocumentSlide(context, messageRecord));
       documentViewStub.get().setDocumentClickListener(new ThumbnailClickListener());
       documentViewStub.get().setOnLongClickListener(passthroughClickListener);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-        documentViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-      }
+      documentViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -531,9 +529,7 @@ public class ConversationItem extends BaseConversationItem
       webxdcViewStub.get().setWebxdc(messageRecord, context.getString(R.string.webxdc_app));
       webxdcViewStub.get().setWebxdcClickListener(new ThumbnailClickListener());
       webxdcViewStub.get().setOnLongClickListener(passthroughClickListener);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-        webxdcViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-      }
+      webxdcViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -551,9 +547,7 @@ public class ConversationItem extends BaseConversationItem
       vcardViewStub.get().setVcardClickListener(new ThumbnailClickListener());
       vcardViewStub.get().setOnLongClickListener(passthroughClickListener);
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-        vcardViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-      }
+      vcardViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -589,9 +583,7 @@ public class ConversationItem extends BaseConversationItem
       mediaThumbnailStub.get().setOnLongClickListener(passthroughClickListener);
       mediaThumbnailStub.get().setOnClickListener(passthroughClickListener);
       mediaThumbnailStub.get().showShade(TextUtils.isEmpty(messageRecord.getText()));
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-        mediaThumbnailStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-      }
+      mediaThumbnailStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
 
       setThumbnailOutlineCorners(messageRecord, showSender);
 
@@ -614,9 +606,7 @@ public class ConversationItem extends BaseConversationItem
       stickerStub.get().setThumbnailClickListener(new StickerClickListener());
       stickerStub.get().setOnLongClickListener(passthroughClickListener);
       stickerStub.get().setOnClickListener(passthroughClickListener);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-        stickerStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-      }
+      stickerStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -677,7 +667,7 @@ public class ConversationItem extends BaseConversationItem
       contactPhoto.setVisibility(View.GONE);
     } else {
       int color = messageRecord.getSenderColor();
-      Recipient recipient = new Recipient(context, dcContact, messageRecord.getSenderName(dcContact, !dcContext.isCommunity()), color);
+      Recipient recipient = new Recipient(context, dcContact, messageRecord.getSenderName(dcContact), color);
       contactPhoto.setAvatar(glideRequests, recipient, true);
       contactPhoto.setVisibility(View.VISIBLE);
     }
@@ -802,14 +792,14 @@ public class ConversationItem extends BaseConversationItem
 
     if (messageRecord.isForwarded()) {
       if (showSender && dcContact !=null) {
-        this.groupSender.setText(context.getString(R.string.forwarded_by, messageRecord.getSenderName(dcContact, false)));
+        this.groupSender.setText(context.getString(R.string.forwarded_by, messageRecord.getSenderName(dcContact)));
       } else {
         this.groupSender.setText(context.getString(R.string.forwarded_message));
       }
       this.groupSender.setTextColor(context.getResources().getColor(R.color.unknown_sender));
     }
     else if (showSender && dcContact !=null) {
-      this.groupSender.setText(messageRecord.getSenderName(dcContact, true));
+      this.groupSender.setText(messageRecord.getSenderName(dcContact));
       int color = messageRecord.getSenderColor();
       this.groupSender.setTextColor(Util.rgbToArgbColor(color!=0? color : dcContact.getColor()));
     }

src/main/java/org/thoughtcrime/securesms/ConversationItemSwipeCallback.java

@@ -174,9 +174,7 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
         vibrate(viewHolder.itemView.getContext());
       }
     }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      recyclerView.cancelPendingInputEvents();
-    }
+    recyclerView.cancelPendingInputEvents();
   }
 
   private static void resetProgress(RecyclerView.ViewHolder viewHolder) {
@@ -199,11 +197,7 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
   }
 
   private static float getSignFromDirection(@NonNull View view) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      return view.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL ? -1f : 1f;
-    } else {
-      return 1f;
-    }
+    return view.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL ? -1f : 1f;
   }
 
   private static boolean sameSign(float dX, float sign) {

src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -113,7 +113,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     // it is not needed to keep all past update messages, however, when deleted, also the strings should be deleted.
     try {
       DcContext dcContext = DcHelper.getContext(this);
-      final String deviceMsgLabel = "update_1_46_0l_android";
+      final String deviceMsgLabel = "update_1_50_0_android";
       if (!dcContext.wasDeviceMsgEverAdded(deviceMsgLabel)) {
         DcMsg msg = null;
         if (!getIntent().getBooleanExtra(FROM_WELCOME, false)) {
@@ -124,7 +124,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
           // Util.copy(inputStream, new FileOutputStream(outputFile));
           // msg.setFile(outputFile, "image/jpeg");
 
-          msg.setText(getString(R.string.update_1_46_android, "https://raw.githubusercontent.com/ArcaneChat/android/refs/heads/main/CHANGELOG.md"));
+          msg.setText(getString(R.string.update_1_50_android, "https://raw.githubusercontent.com/ArcaneChat/android/refs/heads/main/CHANGELOG.md"));
         }
         dcContext.addDeviceMsg(deviceMsgLabel, msg);
 
@@ -257,6 +257,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
   @Override
   protected void onNewIntent(Intent intent) {
+    if (isFinishing()) {
+      Log.w(TAG, "Activity is finishing, aborting onNewIntent()");
+      return;
+    }
     super.onNewIntent(intent);
     setIntent(intent);
     refresh();
@@ -458,9 +462,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
       case R.id.menu_all_media:
         startActivity(new Intent(this, ProfileActivity.class));
         return true;
-      case R.id.menu_webxdc_apps_store:
-        handleShowBot("juegos@buzon.uy", "OPENPGP4FPR:d3d403a734be71fe9293a00311fef80dbe5dbc89#a=juegos%40buzon.uy&n=&i=WQZY-8FODS3&s=ZQBkaclFzao");
-        return true;
       case R.id.menu_public_bots:
         handleShowBot("puente@buzon.uy", "OPENPGP4FPR:4B41E5AFAF78A0C71DB56138D5BEFED00A45F97A#a=puente%40buzon.uy&n=Public%20Bots&i=ZC_oaJtuvJP&s=5SE96rRovsK");
         return true;
@@ -564,7 +565,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   private void shareInvite() {
     Intent intent = new Intent(Intent.ACTION_SEND);
     intent.setType("text/plain");
-    String inviteURL = Util.QrDataToInviteURL(DcHelper.getContext(this).getSecurejoinQr(0));
+    String inviteURL = DcHelper.getContext(this).getSecurejoinQr(0);
     intent.putExtra(Intent.EXTRA_TEXT, getString(R.string.invite_friends_text, inviteURL));
     startActivity(Intent.createChooser(intent, getString(R.string.chat_share_with_title)));
   }

src/main/java/org/thoughtcrime/securesms/ConversationListItemInboxZero.java

@@ -29,7 +29,6 @@ public class ConversationListItemInboxZero extends LinearLayout implements Binda
     super(context, attrs, defStyleAttr);
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   public ConversationListItemInboxZero(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
   }

src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java

@@ -5,7 +5,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -35,8 +34,6 @@ import com.soundcloud.android.crop.Crop;
 
 import org.thoughtcrime.securesms.components.AvatarSelector;
 import org.thoughtcrime.securesms.components.InputAwareLayout;
-import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
-import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.mms.AttachmentManager;
@@ -54,7 +51,7 @@ import java.security.SecureRandom;
 
 
 @SuppressLint("StaticFieldLeak")
-public class CreateProfileActivity extends BaseActionBarActivity implements EmojiKeyboardProvider.EmojiEventListener {
+public class CreateProfileActivity extends BaseActionBarActivity {
 
   private static final String TAG = CreateProfileActivity.class.getSimpleName();
 
@@ -66,7 +63,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
   private ImageView              avatar;
   private EditText               name;
   private EditText               overridenName;
-  private MediaKeyboard          emojiDrawer;
   private EditText               statusView;
 
   private boolean fromWelcome;
@@ -91,7 +87,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
     attachmentManager = new AttachmentManager(this, () -> {});
     avatarChanged = false;
     initializeResources();
-    initializeEmojiInput();
     initializeProfileName();
     initializeProfileAvatar();
     initializeStatusText();
@@ -130,15 +125,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
     }
   }
 
-  @Override
-  public void onConfigurationChanged(Configuration newConfig) {
-    super.onConfigurationChanged(newConfig);
-
-    if (container.getCurrentInput() == emojiDrawer) {
-      container.hideAttachedInput(true);
-    }
-  }
-
   @Override
   public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
@@ -206,7 +192,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
     this.avatar       = ViewUtil.findById(this, R.id.avatar);
     this.name         = ViewUtil.findById(this, R.id.name_text);
     this.overridenName = ViewUtil.findById(this, R.id.overriden_name);
-    this.emojiDrawer  = ViewUtil.findById(this, R.id.emoji_drawer);
     this.container    = ViewUtil.findById(this, R.id.container);
     this.statusView   = ViewUtil.findById(this, R.id.status_text);
 
@@ -261,33 +246,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
     );
   }
 
-
-  @Override
-  public void onEmojiSelected(String emoji) {
-    final int start = name.getSelectionStart();
-    final int end   = name.getSelectionEnd();
-
-    name.getText().replace(Math.min(start, end), Math.max(start, end), emoji);
-    name.setSelection(start + emoji.length());
-  }
-
-  @Override
-  public void onKeyEvent(KeyEvent keyEvent) {
-    name.dispatchKeyEvent(keyEvent);
-  }
-
-  private void initializeMediaKeyboardProviders(@NonNull MediaKeyboard mediaKeyboard) {
-    boolean isSystemEmojiPreferred   = Prefs.isSystemEmojiPreferred(this);
-    if (!isSystemEmojiPreferred) {
-      mediaKeyboard.setProviders(0, new EmojiKeyboardProvider(this, this));
-    }
-  }
-
-  private void initializeEmojiInput() {
-    initializeMediaKeyboardProviders(emojiDrawer);
-    this.name.setOnClickListener(v -> container.showSoftkey(name));
-  }
-
   private void initializeStatusText() {
     String status = DcHelper.get(this, DcHelper.CONFIG_SELF_STATUS);
     statusView.setText(status);

src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java

@@ -246,16 +246,22 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
   protected void onPause() {
     super.onPause();
 
-    final String displayName = name.getText().toString();
-    DcHelper.set(this, DcHelper.CONFIG_DISPLAY_NAME, TextUtils.isEmpty(displayName)? null : displayName);
+    // Save display name and avatar in the unconfigured profile.
+    // If the currently selected profile is configured, then this means that rollbackAccountCreation()
+    // was called (see handleOnBackPressed() above), i.e. the newly created profile was removed already
+    // and we can't save the display name & avatar.
+    if (DcHelper.getContext(this).isConfigured() == 0) {
+      final String displayName = name.getText().toString();
+      DcHelper.set(this, DcHelper.CONFIG_DISPLAY_NAME, TextUtils.isEmpty(displayName) ? null : displayName);
 
-    if (avatarChanged) {
-      try {
-        AvatarHelper.setSelfAvatar(InstantOnboardingActivity.this, avatarBmp);
-        Prefs.setProfileAvatarId(InstantOnboardingActivity.this, new SecureRandom().nextInt());
-        avatarChanged = false;
-      } catch (IOException e) {
-        Log.e(TAG, "Failed to save avatar", e);
+      if (avatarChanged) {
+        try {
+          AvatarHelper.setSelfAvatar(InstantOnboardingActivity.this, avatarBmp);
+          Prefs.setProfileAvatarId(InstantOnboardingActivity.this, new SecureRandom().nextInt());
+          avatarChanged = false;
+        } catch (IOException e) {
+          Log.e(TAG, "Failed to save avatar", e);
+        }
       }
     }
   }

src/main/java/org/thoughtcrime/securesms/LogViewFragment.java

@@ -197,12 +197,11 @@ public class LogViewFragment extends Fragment {
                          asMegs(info.maxMemory()));
   }
 
-  @TargetApi(VERSION_CODES.KITKAT)
   public static String getMemoryClass(Context context) {
     ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
     String          lowMem          = "";
 
-    if (VERSION.SDK_INT >= VERSION_CODES.KITKAT && activityManager.isLowRamDevice()) {
+    if (activityManager.isLowRamDevice()) {
       lowMem = ", low-mem device";
     }
     return activityManager.getMemoryClass() + lowMem;
@@ -252,10 +251,8 @@ public class LogViewFragment extends Fragment {
 
       Locale locale = Util.getLocale();
       builder.append("lang=").append(locale.toString()).append("\n");
-      if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) {
-        boolean isRtl = Util.getLayoutDirection(context) == View.LAYOUT_DIRECTION_RTL;
-        builder.append("rtl=").append(isRtl).append("\n");
-      }
+      boolean isRtl = Util.getLayoutDirection(context) == View.LAYOUT_DIRECTION_RTL;
+      builder.append("rtl=").append(isRtl).append("\n");
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
         boolean notifPermGranted = PermissionChecker.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) == PermissionChecker.PERMISSION_GRANTED;

src/main/java/org/thoughtcrime/securesms/ProfileDocumentsFragment.java

@@ -229,11 +229,9 @@ public class ProfileDocumentsFragment
       mode.getMenuInflater().inflate(R.menu.profile_context, menu);
       mode.setTitle("1");
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        Window window = getActivity().getWindow();
-        originalStatusBarColor = window.getStatusBarColor();
-        window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-      }
+      Window window = getActivity().getWindow();
+      originalStatusBarColor = window.getStatusBarColor();
+      window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
       setCorrectMenuVisibility(menu);
       return true;
     }
@@ -283,9 +281,7 @@ public class ProfileDocumentsFragment
       actionMode = null;
       getListAdapter().clearSelection();
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
-      }
+      getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
     }
   }
 }

src/main/java/org/thoughtcrime/securesms/ProfileGalleryFragment.java

@@ -219,11 +219,9 @@ public class ProfileGalleryFragment
       mode.getMenuInflater().inflate(R.menu.profile_context, menu);
       mode.setTitle("1");
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        Window window = getActivity().getWindow();
-        originalStatusBarColor = window.getStatusBarColor();
-        window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-      }
+      Window window = getActivity().getWindow();
+      originalStatusBarColor = window.getStatusBarColor();
+      window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
       setCorrectMenuVisibility(menu);
       return true;
     }
@@ -269,9 +267,7 @@ public class ProfileGalleryFragment
       actionMode = null;
       getListAdapter().clearSelection();
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
-      }
+      getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
     }
   }
 }

src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java

@@ -268,11 +268,9 @@ public class ProfileSettingsFragment extends Fragment
       menu.findItem(R.id.menu_select_all).setVisible(false);
       mode.setTitle("1");
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        Window window = getActivity().getWindow();
-        originalStatusBarColor = window.getStatusBarColor();
-        window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-      }
+      Window window = getActivity().getWindow();
+      originalStatusBarColor = window.getStatusBarColor();
+      window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
       return true;
     }
 
@@ -314,9 +312,7 @@ public class ProfileSettingsFragment extends Fragment
     public void onDestroyActionMode(ActionMode mode) {
       actionMode = null;
       adapter.clearSelection();
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
-      }
+      getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
     }
   }
 

src/main/java/org/thoughtcrime/securesms/ProfileStatusItem.java

@@ -6,12 +6,14 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import org.thoughtcrime.securesms.util.Linkifier;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 
 public class ProfileStatusItem extends LinearLayout {
 
-  private EmojiTextView statusTextView;
+  private AppCompatTextView statusTextView;
   private final PassthroughClickListener passthroughClickListener   = new PassthroughClickListener();
 
   public ProfileStatusItem(Context context) {
@@ -32,7 +34,7 @@ public class ProfileStatusItem extends LinearLayout {
   }
 
   public void set(String status) {
-    statusTextView.setText(EmojiTextView.linkify(new SpannableString(status)));
+    statusTextView.setText(Linkifier.linkify(new SpannableString(status)));
   }
 
   private class PassthroughClickListener implements View.OnLongClickListener, View.OnClickListener {

src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java

@@ -31,7 +31,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -59,6 +58,7 @@ import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.ProgressDialog;
 
 import java.lang.ref.WeakReference;
@@ -185,7 +185,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             expandAdvanced = expandAdvanced || !TextUtils.isEmpty(strVal);
 
             intVal = DcHelper.getInt(this, CONFIG_MAIL_SECURITY);
-            imapSecurity.setSelection(intVal);
+            imapSecurity.setSelection(ViewUtil.checkBounds(intVal, imapSecurity));
             expandAdvanced = expandAdvanced || intVal != 0;
 
             TextInputEditText smtpLoginInput = findViewById(R.id.smtp_login_text);
@@ -207,7 +207,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             expandAdvanced = expandAdvanced || !TextUtils.isEmpty(strVal);
 
             intVal = DcHelper.getInt(this, CONFIG_SEND_SECURITY);
-            smtpSecurity.setSelection(intVal);
+            smtpSecurity.setSelection(ViewUtil.checkBounds(intVal, smtpSecurity));
             expandAdvanced = expandAdvanced || intVal != 0;
 
             int serverFlags = DcHelper.getInt(this, CONFIG_SERVER_FLAGS);
@@ -222,12 +222,15 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
               }
               // /remove gmail oauth2
             }
-            authMethod.setSelection(sel);
+            authMethod.setSelection(ViewUtil.checkBounds(sel, authMethod));
             expandAdvanced = expandAdvanced || sel != 0;
 
-            int certCheckFlags = DcHelper.getInt(this, "imap_certificate_checks");
-            certCheck.setSelection(certCheckFlags);
-            expandAdvanced = expandAdvanced || certCheckFlags != 0;
+            int imapCertificateChecks = DcHelper.getInt(this, "imap_certificate_checks");
+            if (imapCertificateChecks == 3) {
+              imapCertificateChecks = 2; // 3 is a deprecated alias for 2
+            }
+            certCheck.setSelection(ViewUtil.checkBounds(imapCertificateChecks, certCheck));
+            expandAdvanced = expandAdvanced || imapCertificateChecks != 0;
         } else if (getIntent() != null && getIntent().getBundleExtra(ACCOUNT_DATA) != null) {
           // Companion app might have sent account data
           Bundle b = getIntent().getBundleExtra(ACCOUNT_DATA);

src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java

@@ -40,6 +40,7 @@ import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcMsg;
 import com.b44t.messenger.rpc.Rpc;
 import com.b44t.messenger.rpc.RpcException;
+import com.google.common.base.Charsets;
 
 import org.json.JSONObject;
 import org.thoughtcrime.securesms.connect.AccountManager;
@@ -54,6 +55,8 @@ import java.io.ByteArrayInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -63,7 +66,9 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
   private static final String EXTRA_ACCOUNT_ID = "accountId";
   private static final String EXTRA_APP_MSG_ID = "appMessageId";
   private static final String EXTRA_HIDE_ACTION_BAR = "hideActionBar";
+  private static final String EXTRA_HREF = "href";
   private static final int REQUEST_CODE_FILE_PICKER = 51426;
+  private static long lastOpenTime = 0;
 
   private ValueCallback<Uri[]> filePathCallback;
   private DcContext dcContext;
@@ -71,12 +76,23 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
   private DcMsg dcAppMsg;
   private String baseURL;
   private String sourceCodeUrl = "";
+  private String selfAddr;
+  private int sendUpdateMaxSize;
+  private int sendUpdateInterval;
   private boolean internetAccess = false;
   private boolean hideActionBar = false;
 
   public static void openMaps(Context context, int chatId) {
+    openMaps(context, chatId, "");
+  }
+
+  public static void openMaps(Context context, int chatId, String href) {
     DcContext dcContext = DcHelper.getContext(context);
-    int msgId = dcContext.initWebxdcIntegration(chatId);
+    int msgId = 0;
+    final int mapsVersion = 2;
+    if (dcContext.getConfigInt("ui.maps_version") >= mapsVersion) {
+      msgId = dcContext.initWebxdcIntegration(chatId);
+    }
     if (msgId == 0) {
       try {
         InputStream inputStream = context.getResources().getAssets().open("webxdc/maps.xdc");
@@ -91,34 +107,36 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
          Toast.makeText(context, "Cannot get maps.xdc, see log for details.", Toast.LENGTH_LONG).show();
          return;
       }
+      dcContext.setConfigInt("ui.maps_version", mapsVersion);
     }
-    openWebxdcActivity(context, msgId, true);
+    openWebxdcActivity(context, msgId, true, href);
   }
 
   public static void openWebxdcActivity(Context context, DcMsg instance) {
-    openWebxdcActivity(context, instance.getId(), false);
+    openWebxdcActivity(context, instance, "");
   }
 
-  public static void openWebxdcActivity(Context context, int msgId, boolean hideActionBar) {
+  public static void openWebxdcActivity(Context context, DcMsg instance, String href) {
+    openWebxdcActivity(context, instance.getId(), false, href);
+  }
+
+  public static void openWebxdcActivity(Context context, int msgId, boolean hideActionBar, String href) {
     if (!Util.isClickedRecently()) {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        if (Prefs.isDeveloperModeEnabled(context)) {
-          WebView.setWebContentsDebuggingEnabled(true);
-        }
-        context.startActivity(getWebxdcIntent(context, msgId, hideActionBar));
-      } else {
-        Toast.makeText(context, "At least Android 5.0 (Lollipop) required for Webxdc.", Toast.LENGTH_LONG).show();
+      if (Prefs.isDeveloperModeEnabled(context)) {
+        WebView.setWebContentsDebuggingEnabled(true);
       }
+      context.startActivity(getWebxdcIntent(context, msgId, hideActionBar, href));
     }
   }
 
-  private static Intent getWebxdcIntent(Context context, int msgId, boolean hideActionBar) {
+  private static Intent getWebxdcIntent(Context context, int msgId, boolean hideActionBar, String href) {
     DcContext dcContext = DcHelper.getContext(context);
     Intent intent = new Intent(context, WebxdcActivity.class);
     intent.setAction(Intent.ACTION_VIEW);
     intent.putExtra(EXTRA_ACCOUNT_ID, dcContext.getAccountId());
     intent.putExtra(EXTRA_APP_MSG_ID, msgId);
     intent.putExtra(EXTRA_HIDE_ACTION_BAR, hideActionBar);
+    intent.putExtra(EXTRA_HREF, href);
     return intent;
   }
 
@@ -129,7 +147,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
       .putExtra(ConversationActivity.CHAT_ID_EXTRA, dcContext.getMsg(msgId).getChatId())
       .setAction(Intent.ACTION_VIEW);
 
-    final Intent webxdcIntent = getWebxdcIntent(context, msgId, false);
+    final Intent webxdcIntent = getWebxdcIntent(context, msgId, false, "");
 
     return TaskStackBuilder.create(context)
       .addNextIntentWithParentStack(chatIntent)
@@ -197,6 +215,9 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
         // this is needed here because if the app is opened while already in landscape mode, onConfigurationChanged() is not triggered
         setScreenMode(getResources().getConfiguration());
     }
+    selfAddr = info.optString("self_addr");
+    sendUpdateMaxSize = info.optInt("send_update_max_size");
+    sendUpdateInterval = info.optInt("send_update_interval");
 
     toggleFakeProxy(!internetAccess);
 
@@ -213,7 +234,20 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
     webView.setNetworkAvailable(internetAccess); // this does not block network but sets `window.navigator.isOnline` in js land
     webView.addJavascriptInterface(new InternalJSApi(), "InternalJSApi");
 
-    webView.loadUrl(this.baseURL + "/index.html");
+    String extraHref = b.getString(EXTRA_HREF, "");
+    if (TextUtils.isEmpty(extraHref)) {
+      extraHref = "index.html";
+    }
+
+    String href = baseURL + "/" + extraHref;
+    String encodedHref = "";
+    try {
+      encodedHref = URLEncoder.encode(href, Charsets.UTF_8.name());
+    } catch (UnsupportedEncodingException e) {
+      e.printStackTrace();
+    }
+
+    webView.loadUrl(this.baseURL + "/webxdc_bootstrap324567869.html?i=1&href=" + encodedHref);
 
     Util.runOnAnyBackgroundThread(() -> {
       final DcChat chat = dcContext.getChat(dcAppMsg.getChatId());
@@ -223,8 +257,21 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
     });
   }
 
+  @Override
+  public void onResume() {
+    super.onResume();
+    DcHelper.getNotificationCenter(this).updateVisibleWebxdc(dcContext.getAccountId(), dcAppMsg.getId());
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    DcHelper.getNotificationCenter(this).clearVisibleWebxdc();
+  }
+
   @Override
   protected void onDestroy() {
+    lastOpenTime = System.currentTimeMillis();
     DcHelper.getEventCenter(this.getApplicationContext()).removeObservers(this);
     leaveRealtimeChannel();
     super.onDestroy();
@@ -249,6 +296,9 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
       case R.id.source_code:
         openUrlInBrowser(this, sourceCodeUrl);
         return true;
+      case R.id.show_in_chat:
+        showInChat();
+        return true;
     }
     return false;
   }
@@ -334,7 +384,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
       res = new WebResourceResponse("text/plain", "UTF-8", targetStream);
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !internetAccess) {
+    if (!internetAccess) {
       Map<String, String> headers = new HashMap<>();
       headers.put("Content-Security-Policy",
           "default-src 'self'; "
@@ -353,9 +403,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
   }
 
   private void callJavaScriptFunction(String func) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      webView.evaluateJavascript("window." + func + ";", null);
-    }
+    webView.evaluateJavascript("document.getElementById('frame').contentWindow." + func + ";", null);
   }
 
   @Override
@@ -394,6 +442,13 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
       }
   }
 
+  private void showInChat() {
+    Intent intent = new Intent(this, ConversationActivity.class);
+    intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, dcAppMsg.getChatId());
+    intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, DcMsg.getMessagePosition(dcAppMsg, dcContext));
+    startActivity(intent);
+  }
+
   public static void addToHomeScreen(Activity activity, int msgId) {
     Context context = activity.getApplicationContext();
     try {
@@ -469,13 +524,23 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
       return dcContext.isCommunity();
     }
 
+    @JavascriptInterface
+    public int sendUpdateMaxSize() {
+      return WebxdcActivity.this.sendUpdateMaxSize;
+    }
+
+    @JavascriptInterface
+    public int sendUpdateInterval() {
+      return WebxdcActivity.this.sendUpdateInterval;
+    }
+
     @JavascriptInterface
     public String selfAddr() {
       if (dcContext.isCommunity() && !TextUtils.isEmpty(dcContext.getCommunityUser())) {
         int flags = Base64.NO_WRAP | Base64.NO_PADDING | Base64.URL_SAFE;
         return Base64.encodeToString(dcContext.getCommunityUser().getBytes(), flags);
       }
-      return dcContext.getConfig("configured_addr");
+      return WebxdcActivity.this.selfAddr;
     }
 
     /** @noinspection unused*/
@@ -493,9 +558,9 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
 
     /** @noinspection unused*/
     @JavascriptInterface
-    public boolean sendStatusUpdate(String payload, String descr) {
+    public boolean sendStatusUpdate(String payload) {
       Log.i(TAG, "sendStatusUpdate");
-      if (!WebxdcActivity.this.dcContext.sendWebxdcStatusUpdate(WebxdcActivity.this.dcAppMsg.getId(), payload, descr)) {
+      if (!WebxdcActivity.this.dcContext.sendWebxdcStatusUpdate(WebxdcActivity.this.dcAppMsg.getId(), payload)) {
         DcChat dcChat =  WebxdcActivity.this.dcContext.getChat(WebxdcActivity.this.dcAppMsg.getChatId());
         Toast.makeText(WebxdcActivity.this,
                       dcChat.isContactRequest() ?

src/main/java/org/thoughtcrime/securesms/WebxdcStoreActivity.java

@@ -0,0 +1,139 @@
+package org.thoughtcrime.securesms;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Toast;
+
+import androidx.appcompat.app.ActionBar;
+
+import com.b44t.messenger.DcContext;
+import com.b44t.messenger.rpc.HttpResponse;
+import com.b44t.messenger.rpc.Rpc;
+import com.b44t.messenger.rpc.RpcException;
+
+import org.thoughtcrime.securesms.connect.DcHelper;
+import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
+import org.thoughtcrime.securesms.util.MediaUtil;
+import org.thoughtcrime.securesms.util.Prefs;
+import org.thoughtcrime.securesms.util.Util;
+
+import java.io.ByteArrayInputStream;
+import java.util.HashMap;
+
+public class WebxdcStoreActivity extends PassphraseRequiredActionBarActivity {
+  private static final String TAG = WebxdcStoreActivity.class.getSimpleName();
+
+  private DcContext dcContext;
+  private Rpc rpc;
+
+  @Override
+  protected void onCreate(Bundle state, boolean ready) {
+    setContentView(R.layout.web_view_activity);
+    rpc = DcHelper.getRpc(this);
+    dcContext = DcHelper.getContext(this);
+    WebView webView = findViewById(R.id.webview);
+
+    ActionBar actionBar = getSupportActionBar();
+    if (actionBar != null) {
+      actionBar.setDisplayHomeAsUpEnabled(true);
+      actionBar.setTitle(R.string.webxdc_apps);
+    }
+
+    webView.setWebViewClient(new WebViewClient() {
+      @Override
+      public boolean shouldOverrideUrlLoading(WebView view, String url) {
+        String ext = MediaUtil.getFileExtensionFromUrl(Uri.parse(url).getPath());
+        if ("xdc".equals(ext)) {
+          Util.runOnAnyBackgroundThread(() -> {
+            try {
+              HttpResponse httpResponse = rpc.getHttpResponse(dcContext.getAccountId(), url);
+              Uri uri = PersistentBlobProvider.getInstance().create(WebxdcStoreActivity.this, httpResponse.getBlob(), "application/octet-stream", "app.xdc");
+              Intent intent = new Intent();
+              intent.setData(uri);
+              setResult(Activity.RESULT_OK, intent);
+              finish();
+            } catch (RpcException e) {
+              e.printStackTrace();
+              Util.runOnMain(() -> Toast.makeText(WebxdcStoreActivity.this, "Error: " + e.getMessage(), Toast.LENGTH_LONG).show());
+            }
+          });
+        } else {
+          WebViewActivity.openUrlInBrowser(WebxdcStoreActivity.this, url);
+        }
+        return true;
+      }
+
+      @TargetApi(Build.VERSION_CODES.N)
+      @Override
+      public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+        return shouldOverrideUrlLoading(view, request.getUrl().toString());
+      }
+
+      @Override
+      public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+        return interceptRequest(request.getUrl().toString());
+      }
+    });
+
+    WebSettings webSettings = webView.getSettings();
+    webSettings.setJavaScriptEnabled(true);
+    webSettings.setAllowFileAccess(false);
+    webSettings.setAllowContentAccess(false);
+    webSettings.setGeolocationEnabled(false);
+    webSettings.setAllowFileAccessFromFileURLs(false);
+    webSettings.setAllowUniversalAccessFromFileURLs(false);
+    webSettings.setDatabaseEnabled(true);
+    webSettings.setDomStorageEnabled(true);
+    webView.setNetworkAvailable(true); // this does not block network but sets `window.navigator.isOnline` in js land
+
+    webView.loadUrl(Prefs.getWebxdcStoreUrl(this));
+  }
+
+  private WebResourceResponse interceptRequest(String url) {
+    WebResourceResponse res = null;
+    try {
+      if (url == null) {
+        throw new Exception("no url specified");
+      }
+      HttpResponse httpResponse = rpc.getHttpResponse(dcContext.getAccountId(), url);
+      String mimeType = httpResponse.getMimetype();
+      if (mimeType == null) {
+        mimeType = "application/octet-stream";
+      }
+
+      ByteArrayInputStream data = new ByteArrayInputStream(httpResponse.getBlob());
+      res = new WebResourceResponse(mimeType, httpResponse.getEncoding(), data);
+    } catch (Exception e) {
+      e.printStackTrace();
+      ByteArrayInputStream data = new ByteArrayInputStream(("Could not load apps. Are you online?\n\n" + e.getMessage()).getBytes());
+      res = new WebResourceResponse("text/plain", "UTF-8", data);
+    }
+
+    HashMap<String, String> headers = new HashMap<>();
+    headers.put("access-control-allow-origin", "*");
+    res.setResponseHeaders(headers);
+    return res;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+    switch (item.getItemId()) {
+      case android.R.id.home:
+        finish();
+        return true;
+    }
+    return false;
+  }
+
+}

src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java

@@ -166,7 +166,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
                 .withPermanentDenialDialog(getString(R.string.perm_explain_access_to_storage_denied))
                 .onAllGranted(() -> {
                     File imexDir = DcHelper.getImexDir();
-                    if (Build.VERSION.SDK_INT >= 30) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                         AttachmentManager.selectMediaType(this, "application/x-tar", null, PICK_BACKUP, StorageUtil.getDownloadUri());
                     } else {
                         final String backupFile = dcContext.imexHasBackup(imexDir.getAbsolutePath());

src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java

@@ -189,11 +189,16 @@ public class AccountSelectionListFragment extends DialogFragment implements DcEv
     avatar.setAvatar(GlideApp.with(activity), recipient, false);
     nameView.setText(name);
     addrView.setText(contact.getAddr());
-    try {
-      sizeView.setText(Util.getPrettyFileSize(rpc.getAccountFileSize(accountId)));
-    } catch (RpcException e) {
-      e.printStackTrace();
-    }
+    Util.runOnAnyBackgroundThread(() -> {
+      try {
+        final int sizeBytes = rpc.getAccountFileSize(accountId);
+        Util.runOnMain(() -> {
+          sizeView.setText(Util.getPrettyFileSize(sizeBytes));
+        });
+      } catch (RpcException e) {
+        e.printStackTrace();
+      }
+    });
     description.setText(activity.getString(R.string.delete_account_explain_with_name, name));
 
     AlertDialog dialog = new AlertDialog.Builder(activity)

src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java

@@ -41,6 +41,7 @@ public class AttachmentTypeSelector extends PopupWindow {
   public static final int TAKE_PHOTO        = 5;
   public static final int ADD_LOCATION      = 6;
   public static final int RECORD_VIDEO      = 7;
+  public static final int ADD_WEBXDC        = 8;
 
   private static final int ANIMATION_DURATION = 300;
 
@@ -53,7 +54,7 @@ public class AttachmentTypeSelector extends PopupWindow {
     //private final @NonNull ImageView           cameraButton;
   private final @NonNull ImageView           videoButton;
   private final @NonNull ImageView           locationButton;
-  private final @NonNull ImageView           closeButton;
+  private final @NonNull ImageView           webxdcButton;
 
   private @Nullable View                      currentAnchor;
   private @Nullable AttachmentClickedListener listener;
@@ -76,7 +77,7 @@ public class AttachmentTypeSelector extends PopupWindow {
     //this.cameraButton   = ViewUtil.findById(layout, R.id.camera_button);
     this.videoButton    = ViewUtil.findById(layout, R.id.record_video_button);
     this.locationButton = ViewUtil.findById(layout, R.id.location_button);
-    this.closeButton    = ViewUtil.findById(layout, R.id.close_button);
+    this.webxdcButton   = ViewUtil.findById(layout, R.id.webxdc_button);
 
     this.imageButton.setOnClickListener(new PropagatingClickListener(ADD_GALLERY));
     this.videoChatButton.setOnClickListener(new PropagatingClickListener(INVITE_VIDEO_CHAT));
@@ -85,7 +86,7 @@ public class AttachmentTypeSelector extends PopupWindow {
     //this.cameraButton.setOnClickListener(new PropagatingClickListener(TAKE_PHOTO));
     this.videoButton.setOnClickListener(new PropagatingClickListener(RECORD_VIDEO));
     this.locationButton.setOnClickListener(new PropagatingClickListener(ADD_LOCATION));
-    this.closeButton.setOnClickListener(new CloseClickListener());
+    this.webxdcButton.setOnClickListener(new PropagatingClickListener(ADD_WEBXDC));
     this.recentRail.setListener(new RecentPhotoSelectedListener());
 
     if (!Prefs.isLocationStreamingEnabled(context)) {
@@ -130,33 +131,23 @@ public class AttachmentTypeSelector extends PopupWindow {
       public void onGlobalLayout() {
         getContentView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-          animateWindowInCircular(anchor, getContentView());
-        } else {
-          animateWindowInTranslate(getContentView());
-        }
+        animateWindowInCircular(anchor, getContentView());
       }
     });
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        //animateButtonIn(cameraButton, ANIMATION_DURATION / 2);
-      animateButtonIn(videoButton, ANIMATION_DURATION / 2);
-      animateButtonIn(imageButton, ANIMATION_DURATION / 3);
-      animateButtonIn(contactButton, ANIMATION_DURATION / 3);
-      animateButtonIn(locationButton, ANIMATION_DURATION / 4);
-      animateButtonIn(documentButton, ANIMATION_DURATION / 4);
-      animateButtonIn(videoChatButton, 0);
-      animateButtonIn(closeButton, 0);
-    }
+    //animateButtonIn(cameraButton, ANIMATION_DURATION / 2);
+    animateButtonIn(videoButton, ANIMATION_DURATION / 2);
+    animateButtonIn(imageButton, ANIMATION_DURATION / 3);
+    animateButtonIn(contactButton, ANIMATION_DURATION / 3);
+    animateButtonIn(locationButton, ANIMATION_DURATION / 4);
+    animateButtonIn(documentButton, ANIMATION_DURATION / 4);
+    animateButtonIn(webxdcButton, 0);
+    animateButtonIn(videoChatButton, 0);
   }
 
   @Override
   public void dismiss() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      animateWindowOutCircular(currentAnchor, getContentView());
-    } else {
-      animateWindowOutTranslate(getContentView());
-    }
+    animateWindowOutCircular(currentAnchor, getContentView());
   }
 
   public void setListener(@Nullable AttachmentClickedListener listener) {
@@ -186,7 +177,6 @@ public class AttachmentTypeSelector extends PopupWindow {
     button.startAnimation(animation);
   }
 
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   private void animateWindowInCircular(@Nullable View anchor, @NonNull View contentView) {
     Pair<Integer, Integer> coordinates = getClickOrigin(anchor, contentView);
     Animator animator = ViewAnimationUtils.createCircularReveal(contentView,
@@ -205,7 +195,6 @@ public class AttachmentTypeSelector extends PopupWindow {
     getContentView().startAnimation(animation);
   }
 
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   private void animateWindowOutCircular(@Nullable View anchor, @NonNull View contentView) {
     Pair<Integer, Integer> coordinates = getClickOrigin(anchor, contentView);
     Animator               animator    = ViewAnimationUtils.createCircularReveal(getContentView(),
@@ -301,13 +290,6 @@ public class AttachmentTypeSelector extends PopupWindow {
 
   }
 
-  private class CloseClickListener implements View.OnClickListener {
-    @Override
-    public void onClick(View v) {
-      dismiss();
-    }
-  }
-
   public interface AttachmentClickedListener {
     public void onClick(int type);
     public void onQuickAttachment(Uri uri);

src/main/java/org/thoughtcrime/securesms/components/AudioView.java

@@ -71,12 +71,10 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
     this.pauseButton.setOnClickListener(new PauseClickedListener());
     this.seekBar.setOnSeekBarChangeListener(new SeekBarModifiedListener());
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      this.playButton.setImageDrawable(context.getDrawable(R.drawable.play_icon));
-      this.pauseButton.setImageDrawable(context.getDrawable(R.drawable.pause_icon));
-      this.playButton.setBackground(context.getDrawable(R.drawable.ic_circle_fill_white_48dp));
-      this.pauseButton.setBackground(context.getDrawable(R.drawable.ic_circle_fill_white_48dp));
-    }
+    this.playButton.setImageDrawable(context.getDrawable(R.drawable.play_icon));
+    this.pauseButton.setImageDrawable(context.getDrawable(R.drawable.pause_icon));
+    this.playButton.setBackground(context.getDrawable(R.drawable.ic_circle_fill_white_48dp));
+    this.pauseButton.setBackground(context.getDrawable(R.drawable.ic_circle_fill_white_48dp));
 
     setTint(getContext().getResources().getColor(R.color.audio_icon));
   }
@@ -192,13 +190,8 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
   }
 
   public void setTint(int foregroundTint) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      this.playButton.setBackgroundTintList(ColorStateList.valueOf(foregroundTint));
-      this.pauseButton.setBackgroundTintList(ColorStateList.valueOf(foregroundTint));
-    } else {
-      this.playButton.setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN);
-      this.pauseButton.setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN);
-    }
+    this.playButton.setBackgroundTintList(ColorStateList.valueOf(foregroundTint));
+    this.pauseButton.setBackgroundTintList(ColorStateList.valueOf(foregroundTint));
 
     this.seekBar.getProgressDrawable().setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN);
 
@@ -220,25 +213,20 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
   private void togglePlayToPause() {
     controlToggle.displayQuick(pauseButton);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      AnimatedVectorDrawable playToPauseDrawable = (AnimatedVectorDrawable)getContext().getDrawable(R.drawable.play_to_pause_animation);
-      pauseButton.setImageDrawable(playToPauseDrawable);
-      playToPauseDrawable.start();
-    }
+    AnimatedVectorDrawable playToPauseDrawable = (AnimatedVectorDrawable) getContext().getDrawable(R.drawable.play_to_pause_animation);
+    pauseButton.setImageDrawable(playToPauseDrawable);
+    playToPauseDrawable.start();
   }
 
   private void togglePauseToPlay() {
     controlToggle.displayQuick(playButton);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      AnimatedVectorDrawable pauseToPlayDrawable = (AnimatedVectorDrawable)getContext().getDrawable(R.drawable.pause_to_play_animation);
-      playButton.setImageDrawable(pauseToPlayDrawable);
-      pauseToPlayDrawable.start();
-    }
+    AnimatedVectorDrawable pauseToPlayDrawable = (AnimatedVectorDrawable) getContext().getDrawable(R.drawable.pause_to_play_animation);
+    playButton.setImageDrawable(pauseToPlayDrawable);
+    pauseToPlayDrawable.start();
   }
 
   private class PlayClickedListener implements View.OnClickListener {
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @Override
     public void onClick(View v) {
       try {
@@ -279,7 +267,6 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
   }
 
   private class PauseClickedListener implements View.OnClickListener {
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @Override
     public void onClick(View v) {
       Log.w(TAG, "pausebutton onClick");

src/main/java/org/thoughtcrime/securesms/components/ComposeText.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.widget.AppCompatEditText;
 import androidx.core.view.inputmethod.EditorInfoCompat;
 import androidx.core.view.inputmethod.InputConnectionCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
@@ -25,10 +26,9 @@ import android.view.inputmethod.InputConnection;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.TransportOption;
-import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
 import org.thoughtcrime.securesms.util.Prefs;
 
-public class ComposeText extends EmojiEditText {
+public class ComposeText extends AppCompatEditText {
 
   private CharSequence    hint;
   private SpannableString subHint;
@@ -122,7 +122,6 @@ public class ComposeText extends EmojiEditText {
       editorInfo.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
     }
 
-    if (Build.VERSION.SDK_INT < 21) return inputConnection;
     if (mediaListener == null)      return inputConnection;
     if (inputConnection == null)    return null;
 

src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java

@@ -120,15 +120,10 @@ public class ConversationItemThumbnail extends FrameLayout {
   @SuppressWarnings("SuspiciousNameCombination")
   @Override
   protected void dispatchDraw(Canvas canvas) {
-    if (cornerMask.isLegacy()) {
-      cornerMask.mask(canvas);
-    }
 
     super.dispatchDraw(canvas);
 
-    if (!cornerMask.isLegacy()) {
-      cornerMask.mask(canvas);
-    }
+    cornerMask.mask(canvas);
 
     final float halfStrokeWidth = outlinePaint.getStrokeWidth() / 2;
 

src/main/java/org/thoughtcrime/securesms/components/CornerMask.java

@@ -7,7 +7,7 @@ import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.os.Build;
+
 import androidx.annotation.NonNull;
 import android.view.View;
 
@@ -20,11 +20,7 @@ public class CornerMask {
   private final RectF   bounds     = new RectF();
 
   public CornerMask(@NonNull View view) {
-    if (isLegacy()) {
-      view.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-    } else {
-      view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-    }
+    view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
 
     clearPaint.setColor(Color.BLACK);
     clearPaint.setStyle(Paint.Style.FILL);
@@ -44,19 +40,10 @@ public class CornerMask {
     // Note: There's a bug in the P beta where most PorterDuff modes aren't working. But CLEAR does.
     //       So we find and inverse path and use Mode.CLEAR for versions that support Path.op().
     //       See issue https://issuetracker.google.com/issues/111394085.
-    if (!isLegacy()) {
-      outline.reset();
-      outline.addRect(bounds, Path.Direction.CW);
-      outline.op(corners, Path.Op.DIFFERENCE);
-      canvas.drawPath(outline, clearPaint);
-    } else {
-      corners.addRoundRect(bounds, radii, Path.Direction.CW);
-      canvas.clipPath(corners);
-    }
-  }
-
-  public boolean isLegacy() {
-    return Build.VERSION.SDK_INT < 19;
+    outline.reset();
+    outline.addRect(bounds, Path.Direction.CW);
+    outline.op(corners, Path.Op.DIFFERENCE);
+    canvas.drawPath(outline, clearPaint);
   }
 
   public void setRadius(int radius) {

src/main/java/org/thoughtcrime/securesms/components/FromTextView.java

@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.graphics.Typeface;
+
+import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.view.ViewCompat;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -14,12 +16,11 @@ import android.text.style.TypefaceSpan;
 import android.util.AttributeSet;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.spans.CenterAlignedRelativeSizeSpan;
 
-public class FromTextView extends EmojiTextView {
+public class FromTextView extends AppCompatTextView {
 
   private static final String TAG = FromTextView.class.getSimpleName();
 

src/main/java/org/thoughtcrime/securesms/components/InputPanel.java

@@ -9,7 +9,6 @@ import android.os.Build;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AlphaAnimation;
@@ -29,14 +28,12 @@ import com.b44t.messenger.util.concurrent.SettableFuture;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
-import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
@@ -46,9 +43,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class InputPanel extends ConstraintLayout
-    implements MicrophoneRecorderView.Listener,
-               KeyboardAwareLinearLayout.OnKeyboardShownListener,
-               EmojiKeyboardProvider.EmojiEventListener
+  implements MicrophoneRecorderView.Listener,
+             KeyboardAwareLinearLayout.OnKeyboardShownListener,
+             MediaKeyboard.MediaKeyboardListener
 {
 
   private static final String TAG = InputPanel.class.getSimpleName();
@@ -56,7 +53,7 @@ public class InputPanel extends ConstraintLayout
   private static final int FADE_TIME = 150;
 
   private QuoteView       quoteView;
-  private EmojiToggle     mediaKeyboard;
+  private EmojiToggle     emojiToggle;
   private ComposeText     composeText;
   private View            quickCameraToggle;
   private View            quickAudioToggle;
@@ -70,7 +67,6 @@ public class InputPanel extends ConstraintLayout
   private ValueAnimator quoteAnimator;
 
   private @Nullable Listener listener;
-  private           boolean  emojiVisible;
 
   public InputPanel(Context context) {
     super(context);
@@ -92,7 +88,7 @@ public class InputPanel extends ConstraintLayout
     View quoteDismiss           = findViewById(R.id.quote_dismiss);
 
     this.quoteView              = findViewById(R.id.quote_view);
-    this.mediaKeyboard          = findViewById(R.id.emoji_toggle);
+    this.emojiToggle            = findViewById(R.id.emoji_toggle);
     this.composeText            = findViewById(R.id.embedded_text_editor);
     this.quickCameraToggle      = findViewById(R.id.quick_camera_toggle);
     this.quickAudioToggle       = findViewById(R.id.quick_audio_toggle);
@@ -106,21 +102,13 @@ public class InputPanel extends ConstraintLayout
 
     this.recordLockCancel.setOnClickListener(v -> microphoneRecorderView.cancelAction());
 
-    if (Prefs.isSystemEmojiPreferred(getContext())) {
-      mediaKeyboard.setVisibility(View.GONE);
-      emojiVisible = false;
-    } else {
-      mediaKeyboard.setVisibility(View.VISIBLE);
-      emojiVisible = true;
-    }
-
     quoteDismiss.setOnClickListener(v -> clearQuote());
   }
 
   public void setListener(final @NonNull Listener listener) {
     this.listener = listener;
 
-    mediaKeyboard.setOnClickListener(v -> listener.onEmojiToggle());
+    emojiToggle.setOnClickListener(v -> listener.onEmojiToggle());
   }
 
   public void setMediaListener(@NonNull MediaListener listener) {
@@ -207,7 +195,7 @@ public class InputPanel extends ConstraintLayout
   }
 
   public void setMediaKeyboard(@NonNull MediaKeyboard mediaKeyboard) {
-    this.mediaKeyboard.attach(mediaKeyboard);
+    mediaKeyboard.setKeyboardListener(this);
   }
 
   @Override
@@ -221,7 +209,7 @@ public class InputPanel extends ConstraintLayout
     recordTime.display();
     slideToCancel.display();
 
-    if (emojiVisible) ViewUtil.fadeOut(mediaKeyboard, FADE_TIME, View.INVISIBLE);
+    ViewUtil.fadeOut(emojiToggle, FADE_TIME, View.INVISIBLE);
     ViewUtil.fadeOut(composeText, FADE_TIME, View.INVISIBLE);
     ViewUtil.fadeOut(quickCameraToggle, FADE_TIME, View.INVISIBLE);
     ViewUtil.fadeOut(quickAudioToggle, FADE_TIME, View.INVISIBLE);
@@ -276,7 +264,7 @@ public class InputPanel extends ConstraintLayout
 
   public void setEnabled(boolean enabled) {
     composeText.setEnabled(enabled);
-    mediaKeyboard.setEnabled(enabled);
+    emojiToggle.setEnabled(enabled);
     quickAudioToggle.setEnabled(enabled);
     quickCameraToggle.setEnabled(enabled);
   }
@@ -290,7 +278,7 @@ public class InputPanel extends ConstraintLayout
     future.addListener(new AssertedSuccessListener<Void>() {
       @Override
       public void onSuccess(Void result) {
-        if (emojiVisible) ViewUtil.fadeIn(mediaKeyboard, FADE_TIME);
+        ViewUtil.fadeIn(emojiToggle, FADE_TIME);
         ViewUtil.fadeIn(composeText, FADE_TIME);
         ViewUtil.fadeIn(quickCameraToggle, FADE_TIME);
         ViewUtil.fadeIn(quickAudioToggle, FADE_TIME);
@@ -304,17 +292,7 @@ public class InputPanel extends ConstraintLayout
 
   @Override
   public void onKeyboardShown() {
-    mediaKeyboard.setToMedia();
-  }
-
-  @Override
-  public void onKeyEvent(KeyEvent keyEvent) {
-    composeText.dispatchKeyEvent(keyEvent);
-  }
-
-  @Override
-  public void onEmojiSelected(String emoji) {
-    composeText.insertEmoji(emoji);
+    emojiToggle.setToMedia();
   }
 
   public boolean isRecordingInLockedMode() {
@@ -325,6 +303,25 @@ public class InputPanel extends ConstraintLayout
     microphoneRecorderView.unlockAction();
   }
 
+  @Override
+  public void onShown() {
+    emojiToggle.setToIme();
+  }
+
+  @Override
+  public void onHidden() {
+    emojiToggle.setToMedia();
+  }
+
+  @Override
+  public void onEmojiPicked(String emoji) {
+    final int start = composeText.getSelectionStart();
+    final int end   = composeText.getSelectionEnd();
+
+    composeText.getText().replace(Math.min(start, end), Math.max(start, end), emoji);
+    composeText.setSelection(start + emoji.length());
+  }
+
   public interface Listener {
     void onRecorderStarted();
     void onRecorderLocked();

src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java

@@ -104,7 +104,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   }
 
   private void updateKeyboardState() {
-    if (viewInset == 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) viewInset = getViewInset();
+    if (viewInset == 0) viewInset = getViewInset();
 
     getWindowVisibleDisplayFrame(rect);
 
@@ -148,7 +148,6 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
     }
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
   private int getViewInset() {
     try {
       Field attachInfoField = View.class.getDeclaredField("mAttachInfo");
@@ -219,11 +218,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
       return Surface.ROTATION_0;
     }
 
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      return ServiceUtil.getWindowManager(getContext()).getDefaultDisplay().getRotation();
-    }
-
-    if (Build.VERSION.SDK_INT >= 30) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
       getContext().getDisplay().getRealMetrics(displayMetrics);
     } else {
         ServiceUtil.getWindowManager(getContext()).getDefaultDisplay().getRealMetrics(displayMetrics);

src/main/java/org/thoughtcrime/securesms/components/MediaView.java

@@ -40,7 +40,6 @@ public class MediaView extends FrameLayout {
     initialize();
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   public MediaView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
     initialize();

src/main/java/org/thoughtcrime/securesms/components/QuoteView.java

@@ -4,7 +4,6 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.net.Uri;
-import android.os.Build;
 import android.text.Spannable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -17,7 +16,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 
 import com.annimon.stream.Stream;
 import com.b44t.messenger.DcContact;
@@ -80,7 +78,6 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     initialize(attrs);
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   public QuoteView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
     initialize(attrs);
@@ -158,7 +155,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
       if (contact == null) {
         authorView.setText(getContext().getString(R.string.forwarded_message));
       } else {
-        authorView.setText(getContext().getString(R.string.forwarded_by, quotedMsg.getSenderName(contact, false)));
+        authorView.setText(getContext().getString(R.string.forwarded_by, quotedMsg.getSenderName(contact)));
       }
       authorView.setTextColor(getForwardedColor());
       quoteBarView.setBackgroundColor(getForwardedColor());
@@ -169,7 +166,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
         quoteBarView.setBackgroundColor(getForwardedColor());
       } else {
         authorView.setVisibility(VISIBLE);
-        authorView.setText(quotedMsg.getSenderName(contact, true));
+        authorView.setText(quotedMsg.getSenderName(contact));
         if (hasSticker) {
           authorView.setTextColor(getResources().getColor(R.color.core_dark_05));
           quoteBarView.setBackgroundColor(getResources().getColor(R.color.core_dark_05));

src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java

@@ -29,7 +29,6 @@ public class RepeatableImageKey extends ImageButton {
     init();
   }
 
-  @TargetApi(VERSION_CODES.LOLLIPOP)
   public RepeatableImageKey(Context context, AttributeSet attrs, int defStyleAttr,
                             int defStyleRes)
   {

src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java

@@ -130,15 +130,11 @@ public class SearchToolbar extends LinearLayout {
 
       searchItem.expandActionView();
 
-      if (Build.VERSION.SDK_INT >= 21) {
-        Animator animator = ViewAnimationUtils.createCircularReveal(this, (int)x, (int)y, 0, getWidth());
-        animator.setDuration(400);
+      Animator animator = ViewAnimationUtils.createCircularReveal(this, (int) x, (int) y, 0, getWidth());
+      animator.setDuration(400);
 
-        setVisibility(View.VISIBLE);
-        animator.start();
-      } else {
-        setVisibility(View.VISIBLE);
-      }
+      setVisibility(View.VISIBLE);
+      animator.start();
     }
   }
 
@@ -153,19 +149,15 @@ public class SearchToolbar extends LinearLayout {
 
       if (listener != null) listener.onSearchClosed();
 
-      if (Build.VERSION.SDK_INT >= 21) {
-        Animator animator = ViewAnimationUtils.createCircularReveal(this, (int)x, (int)y, getWidth(), 0);
-        animator.setDuration(400);
-        animator.addListener(new AnimationCompleteListener() {
-          @Override
-          public void onAnimationEnd(Animator animation) {
-            setVisibility(View.INVISIBLE);
-          }
-        });
-        animator.start();
-      } else {
-        setVisibility(View.INVISIBLE);
-      }
+      Animator animator = ViewAnimationUtils.createCircularReveal(this, (int) x, (int) y, getWidth(), 0);
+      animator.setDuration(400);
+      animator.addListener(new AnimationCompleteListener() {
+        @Override
+        public void onAnimationEnd(Animator animation) {
+          setVisibility(View.INVISIBLE);
+        }
+      });
+      animator.start();
     }
   }
 

src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java

@@ -18,7 +18,6 @@ public class SwitchPreferenceCompat extends CheckBoxPreference {
         setLayoutRes();
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public SwitchPreferenceCompat(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         setLayoutRes();

src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java

@@ -1,12 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Drawable.Callback;
-import android.text.style.ImageSpan;
-
-public class AnimatingImageSpan extends ImageSpan {
-  public AnimatingImageSpan(Drawable drawable, Callback callback) {
-    super(drawable, ALIGN_BOTTOM);
-    drawable.setCallback(callback);
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java

@@ -1,60 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import androidx.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ResUtil;
-
-public class AsciiEmojiView extends View {
-
-  private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-
-  private String emoji;
-
-  public AsciiEmojiView(Context context) {
-    super(context);
-  }
-
-  public AsciiEmojiView(Context context, @Nullable AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  public void setEmoji(String emoji) {
-    this.emoji = emoji;
-  }
-
-  @Override
-  protected void onDraw(Canvas canvas) {
-    if (TextUtils.isEmpty(emoji)) {
-      return;
-    }
-
-    float targetFontSize = 0.75f * getHeight() - getPaddingTop() - getPaddingBottom();
-
-    paint.setTextSize(targetFontSize);
-    paint.setColor(ResUtil.getColor(getContext(), R.attr.emoji_text_color));
-    paint.setTextAlign(Paint.Align.CENTER);
-
-    int xPos = (getWidth() / 2);
-    int yPos = (int) ((getHeight() / 2) - ((paint.descent() + paint.ascent()) / 2));
-
-    float overflow = paint.measureText(emoji) / (getWidth() - getPaddingLeft() - getPaddingRight());
-    if (overflow > 1f) {
-      paint.setTextSize(targetFontSize / overflow);
-      yPos = (int) ((getHeight() / 2) - ((paint.descent() + paint.ascent()) / 2));
-    }
-    canvas.drawText(emoji, xPos, yPos, paint);
-  }
-
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    //noinspection SuspiciousNameCombination
-    super.onMeasure(widthMeasureSpec, widthMeasureSpec);
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java

@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class CompositeEmojiPageModel implements EmojiPageModel {
-  @AttrRes  private final int         iconAttr;
-  @NonNull  private final EmojiPageModel[] models;
-
-  public CompositeEmojiPageModel(@AttrRes int iconAttr, @NonNull EmojiPageModel... models) {
-    this.iconAttr = iconAttr;
-    this.models   = models;
-  }
-
-  public int getIconAttr() {
-    return iconAttr;
-  }
-
-  @Override
-  public @NonNull List<String> getEmoji() {
-    List<String> emojis = new LinkedList<>();
-    for (EmojiPageModel model : models) {
-      emojis.addAll(model.getEmoji());
-    }
-    return emojis;
-  }
-
-  @Override
-  public @NonNull List<Emoji> getDisplayEmoji() {
-    List<Emoji> emojis = new LinkedList<>();
-    for (EmojiPageModel model : models) {
-      emojis.addAll(model.getDisplayEmoji());
-    }
-    return emojis;
-  }
-
-  @Override
-  public boolean hasSpriteMap() {
-    return false;
-  }
-
-  @Override
-  public @Nullable String getSprite() {
-    return null;
-  }
-
-  @Override
-  public boolean isDynamic() {
-    return false;
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/Emoji.java

@@ -1,21 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class Emoji {
-
-  private final List<String> variations;
-
-  public Emoji(String... variations) {
-    this.variations = Arrays.asList(variations);
-  }
-
-  public String getValue() {
-    return variations.get(0);
-  }
-
-  public List<String> getVariations() {
-    return variations;
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java

@@ -1,62 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatEditText;
-import android.text.InputFilter;
-import android.util.AttributeSet;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
-import org.thoughtcrime.securesms.util.Prefs;
-
-
-public class EmojiEditText extends AppCompatEditText {
-  private static final String TAG = EmojiEditText.class.getSimpleName();
-
-  public EmojiEditText(Context context) {
-    this(context, null);
-  }
-
-  public EmojiEditText(Context context, AttributeSet attrs) {
-    this(context, attrs, R.attr.editTextStyle);
-  }
-
-  public EmojiEditText(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    if (!Prefs.isSystemEmojiPreferred(getContext())) {
-      setFilters(appendEmojiFilter(this.getFilters()));
-    }
-  }
-
-  public void insertEmoji(String emoji) {
-    final int          start = getSelectionStart();
-    final int          end   = getSelectionEnd();
-
-    getText().replace(Math.min(start, end), Math.max(start, end), emoji);
-    setSelection(start + emoji.length());
-  }
-
-  @Override
-  public void invalidateDrawable(@NonNull Drawable drawable) {
-    if (drawable instanceof EmojiDrawable) invalidate();
-    else                                   super.invalidateDrawable(drawable);
-  }
-
-  private InputFilter[] appendEmojiFilter(@Nullable InputFilter[] originalFilters) {
-    InputFilter[] result;
-
-    if (originalFilters != null) {
-      result = new InputFilter[originalFilters.length + 1];
-      System.arraycopy(originalFilters, 0, result, 1, originalFilters.length);
-    } else {
-      result = new InputFilter[1];
-    }
-
-    result[0] = new EmojiFilter(this);
-
-    return result;
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java

@@ -1,30 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.text.InputFilter;
-import android.text.Spannable;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.widget.TextView;
-
-public class EmojiFilter implements InputFilter {
-  private final TextView view;
-
-  public EmojiFilter(TextView view) {
-    this.view = view;
-  }
-
-  @Override
-  public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend)
-  {
-    char[] v = new char[end - start];
-    TextUtils.getChars(source, start, end, v, 0);
-
-    Spannable emojified = EmojiProvider.getInstance(view.getContext()).emojify(new String(v), view);
-
-    if (source instanceof Spanned && emojified != null) {
-      TextUtils.copySpansFrom((Spanned) source, start, end, null, emojified, 0);
-    }
-
-    return emojified;
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java

@@ -1,20 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.appcompat.widget.AppCompatImageView;
-
-public class EmojiImageView extends AppCompatImageView {
-  public EmojiImageView(Context context) {
-    super(context);
-  }
-
-  public EmojiImageView(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  public void setImageEmoji(CharSequence emoji) {
-    setImageDrawable(EmojiProvider.getInstance(getContext()).getEmojiDrawable(emoji));
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java

@@ -1,166 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.viewpager.widget.PagerAdapter;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.util.ResUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * A provider to select emoji in the {@link org.thoughtcrime.securesms.components.emoji.MediaKeyboard}.
- */
-public class EmojiKeyboardProvider implements MediaKeyboardProvider,
-                                              MediaKeyboardProvider.TabIconProvider,
-                                              MediaKeyboardProvider.BackspaceObserver,
-                                              VariationSelectorListener
-{
-  private static final KeyEvent DELETE_KEY_EVENT = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL);
-
-  private static final String RECENT_STORAGE_KEY = "pref_recent_emoji2";
-
-  private final Context              context;
-  private final List<EmojiPageModel> models;
-  private final RecentEmojiPageModel recentModel;
-  private final EmojiPagerAdapter    emojiPagerAdapter;
-  private final EmojiEventListener   emojiEventListener;
-
-  private Controller controller;
-
-  public EmojiKeyboardProvider(@NonNull Context context, @Nullable EmojiEventListener emojiEventListener) {
-    this.context            = context;
-    this.emojiEventListener = emojiEventListener;
-    this.models             = new LinkedList<>();
-    this.recentModel        = new RecentEmojiPageModel(context, RECENT_STORAGE_KEY);
-    this.emojiPagerAdapter  = new EmojiPagerAdapter(context, models, new EmojiEventListener() {
-      @Override
-      public void onEmojiSelected(String emoji) {
-        recentModel.onCodePointSelected(emoji);
-
-        if (emojiEventListener != null) {
-          emojiEventListener.onEmojiSelected(emoji);
-        }
-      }
-
-      @Override
-      public void onKeyEvent(KeyEvent keyEvent) {
-        if (emojiEventListener != null) {
-          emojiEventListener.onKeyEvent(keyEvent);
-        }
-      }
-    }, this);
-
-    models.add(recentModel);
-    models.addAll(EmojiPages.DISPLAY_PAGES);
-  }
-
-  @Override
-  public void requestPresentation(@NonNull Presenter presenter, boolean isSoloProvider) {
-    presenter.present(this, emojiPagerAdapter, this, this, null, null, recentModel.getEmoji().size() > 0 ? 0 : 1);
-  }
-
-  @Override
-  public void setController(@Nullable Controller controller) {
-    this.controller = controller;
-  }
-
-  @Override
-  public int getProviderIconView(boolean selected) {
-    if (selected) {
-      return ThemeUtil.isDarkTheme(context) ? R.layout.emoji_keyboard_icon_dark_selected : R.layout.emoji_keyboard_icon_light_selected;
-    } else {
-      return ThemeUtil.isDarkTheme(context) ? R.layout.emoji_keyboard_icon_dark : R.layout.emoji_keyboard_icon_light;
-    }
-  }
-
-  @Override
-  public void loadCategoryTabIcon(@NonNull GlideRequests glideRequests, @NonNull ImageView imageView, int index) {
-    Drawable drawable = ResUtil.getDrawable(context, models.get(index).getIconAttr());
-    imageView.setImageDrawable(drawable);
-  }
-
-  @Override
-  public void onBackspaceClicked() {
-    if (emojiEventListener != null) {
-      emojiEventListener.onKeyEvent(DELETE_KEY_EVENT);
-    }
-  }
-
-  @Override
-  public void onVariationSelectorStateChanged(boolean open) {
-    if (controller != null) {
-      controller.setViewPagerEnabled(!open);
-    }
-  }
-
-  @Override
-  public boolean equals(@Nullable Object obj) {
-    return obj instanceof EmojiKeyboardProvider;
-  }
-
-  private static class EmojiPagerAdapter extends PagerAdapter {
-    private final Context                   context;
-    private final List<EmojiPageModel>      pages;
-    private final EmojiEventListener emojiSelectionListener;
-    private final VariationSelectorListener variationSelectorListener;
-
-    public EmojiPagerAdapter(@NonNull Context context,
-                             @NonNull List<EmojiPageModel> pages,
-                             @NonNull EmojiEventListener emojiSelectionListener,
-                             @NonNull VariationSelectorListener variationSelectorListener)
-    {
-      super();
-      this.context                   = context;
-      this.pages                     = pages;
-      this.emojiSelectionListener    = emojiSelectionListener;
-      this.variationSelectorListener = variationSelectorListener;
-    }
-
-    @Override
-    public int getCount() {
-      return pages.size();
-    }
-
-    @Override
-    public @NonNull Object instantiateItem(@NonNull ViewGroup container, int position) {
-      EmojiPageView page = new EmojiPageView(context, emojiSelectionListener, variationSelectorListener, true);
-      page.setModel(pages.get(position));
-      container.addView(page);
-      return page;
-    }
-
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
-      container.removeView((View)object);
-    }
-
-    @Override
-    public void setPrimaryItem(ViewGroup container, int position, Object object) {
-      EmojiPageView current = (EmojiPageView) object;
-      current.onSelected();
-      super.setPrimaryItem(container, position, object);
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-      return view == object;
-    }
-  }
-
-  public interface EmojiEventListener {
-    void onEmojiSelected(String emoji);
-    void onKeyEvent(KeyEvent keyEvent);
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java

@@ -1,12 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import java.util.List;
-
-public interface EmojiPageModel {
-  int getIconAttr();
-  List<String> getEmoji();
-  List<Emoji> getDisplayEmoji();
-  boolean hasSpriteMap();
-  String getSprite();
-  boolean isDynamic();
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java

@@ -1,104 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
-import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
-
-public class EmojiPageView extends FrameLayout implements VariationSelectorListener {
-  private static final String TAG = EmojiPageView.class.getSimpleName();
-
-  private EmojiPageModel                   model;
-  private final EmojiPageViewGridAdapter         adapter;
-  private final RecyclerView                     recyclerView;
-  private final GridLayoutManager                layoutManager;
-  private final RecyclerView.OnItemTouchListener scrollDisabler;
-  private final VariationSelectorListener        variationSelectorListener;
-  private final EmojiVariationSelectorPopup      popup;
-
-  public EmojiPageView(@NonNull Context context,
-                       @NonNull EmojiEventListener emojiSelectionListener,
-                       @NonNull VariationSelectorListener variationSelectorListener,
-                       boolean allowVariations)
-  {
-    super(context);
-    final View view = LayoutInflater.from(getContext()).inflate(R.layout.emoji_grid_layout, this, true);
-
-    this.variationSelectorListener = variationSelectorListener;
-
-    recyclerView   = view.findViewById(R.id.emoji);
-    layoutManager  = new GridLayoutManager(context, 8);
-    scrollDisabler = new ScrollDisabler();
-    popup          = new EmojiVariationSelectorPopup(context, emojiSelectionListener);
-    adapter        = new EmojiPageViewGridAdapter(EmojiProvider.getInstance(context),
-                                                  popup,
-                                                  emojiSelectionListener,
-                                                  this,
-                                                  allowVariations);
-
-    recyclerView.setLayoutManager(layoutManager);
-    recyclerView.setAdapter(adapter);
-  }
-
-  public void onSelected() {
-    if (model.isDynamic() && adapter != null) {
-      adapter.notifyDataSetChanged();
-    }
-  }
-
-  public void setModel(EmojiPageModel model) {
-    this.model = model;
-    adapter.setEmoji(model.getDisplayEmoji());
-  }
-
-  @Override
-  protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
-    if (visibility != VISIBLE) {
-      popup.dismiss();
-    }
-  }
-
-  @Override
-  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-    int idealWidth = getContext().getResources().getDimensionPixelOffset(R.dimen.emoji_drawer_item_width);
-    layoutManager.setSpanCount(Math.max(w / idealWidth, 1));
-  }
-
-  @Override
-  public void onVariationSelectorStateChanged(boolean open) {
-    if (open) {
-      recyclerView.addOnItemTouchListener(scrollDisabler);
-    } else {
-      post(() -> recyclerView.removeOnItemTouchListener(scrollDisabler));
-    }
-
-    if (variationSelectorListener != null) {
-      variationSelectorListener.onVariationSelectorStateChanged(open);
-    }
-  }
-
-  public void setRecyclerNestedScrollingEnabled(boolean enabled) {
-    recyclerView.setNestedScrollingEnabled(enabled);
-  }
-
-  private static class ScrollDisabler implements RecyclerView.OnItemTouchListener {
-    @Override
-    public boolean onInterceptTouchEvent(@NonNull RecyclerView recyclerView, @NonNull MotionEvent motionEvent) {
-      return true;
-    }
-
-    @Override
-    public void onTouchEvent(@NonNull RecyclerView recyclerView, @NonNull MotionEvent motionEvent) { }
-
-    @Override
-    public void onRequestDisallowInterceptTouchEvent(boolean b) { }
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java

@@ -1,120 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.PopupWindow;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageViewGridAdapter.EmojiViewHolder> implements PopupWindow.OnDismissListener {
-
-  private final List<Emoji>                 emojiList;
-  private final EmojiProvider               emojiProvider;
-  private final EmojiVariationSelectorPopup popup;
-  private final VariationSelectorListener   variationSelectorListener;
-  private final EmojiEventListener          emojiEventListener;
-  private final boolean                     allowVariations;
-
-  public EmojiPageViewGridAdapter(@NonNull EmojiProvider emojiProvider,
-                                  @NonNull EmojiVariationSelectorPopup popup,
-                                  @NonNull EmojiEventListener emojiEventListener,
-                                  @NonNull VariationSelectorListener variationSelectorListener,
-                                  boolean allowVariations)
-  {
-    this.emojiList                 = new ArrayList<>();
-    this.emojiProvider             = emojiProvider;
-    this.popup                     = popup;
-    this.emojiEventListener        = emojiEventListener;
-    this.variationSelectorListener = variationSelectorListener;
-    this.allowVariations           = allowVariations;
-
-    popup.setOnDismissListener(this);
-  }
-
-  @NonNull
-  @Override
-  public EmojiViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-    return new EmojiViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.emoji_display_item, viewGroup, false));
-  }
-
-  @Override
-  public void onBindViewHolder(@NonNull EmojiViewHolder viewHolder, int i) {
-    Emoji emoji = emojiList.get(i);
-
-    Drawable drawable = emojiProvider.getEmojiDrawable(emoji.getValue());
-
-    if (drawable != null) {
-      viewHolder.textView.setVisibility(View.GONE);
-      viewHolder.imageView.setVisibility(View.VISIBLE);
-      viewHolder.imageView.setContentDescription(emoji.getValue());
-
-      viewHolder.imageView.setImageDrawable(drawable);
-    } else {
-      viewHolder.textView.setVisibility(View.VISIBLE);
-      viewHolder.imageView.setVisibility(View.GONE);
-
-      viewHolder.textView.setEmoji(emoji.getValue());
-    }
-
-    viewHolder.itemView.setOnClickListener(v -> {
-      emojiEventListener.onEmojiSelected(emoji.getValue());
-    });
-
-    if (allowVariations && emoji.getVariations().size() > 1) {
-      viewHolder.itemView.setOnLongClickListener(v -> {
-        popup.dismiss();
-        popup.setVariations(emoji.getVariations());
-        popup.showAsDropDown(viewHolder.itemView, 0, -(2 * viewHolder.itemView.getHeight()));
-        variationSelectorListener.onVariationSelectorStateChanged(true);
-        return true;
-      });
-      viewHolder.hintCorner.setVisibility(View.VISIBLE);
-    } else {
-      viewHolder.itemView.setOnLongClickListener(null);
-      viewHolder.hintCorner.setVisibility(View.GONE);
-    }
-  }
-
-  @Override
-  public int getItemCount() {
-    return emojiList.size();
-  }
-
-  public void setEmoji(@NonNull List<Emoji> emojiList) {
-    this.emojiList.clear();
-    this.emojiList.addAll(emojiList);
-    notifyDataSetChanged();
-  }
-
-  @Override
-  public void onDismiss() {
-    variationSelectorListener.onVariationSelectorStateChanged(false);
-  }
-
-  static class EmojiViewHolder extends RecyclerView.ViewHolder {
-
-    private final ImageView      imageView;
-    private final AsciiEmojiView textView;
-    private final ImageView      hintCorner;
-
-    public EmojiViewHolder(@NonNull View itemView) {
-      super(itemView);
-      this.imageView  = itemView.findViewById(R.id.emoji_image);
-      this.textView   = itemView.findViewById(R.id.emoji_text);
-      this.hintCorner = itemView.findViewById(R.id.emoji_variation_hint);
-    }
-  }
-
-  public interface VariationSelectorListener {
-    void onVariationSelectorStateChanged(boolean open);
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java

@@ -1,258 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.util.Log;
-import android.widget.TextView;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo;
-import org.thoughtcrime.securesms.components.emoji.parsing.EmojiPageBitmap;
-import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
-import org.thoughtcrime.securesms.components.emoji.parsing.EmojiTree;
-import org.thoughtcrime.securesms.util.FutureTaskListener;
-import org.thoughtcrime.securesms.util.Pair;
-import org.thoughtcrime.securesms.util.StringUtil;
-import org.thoughtcrime.securesms.util.Util;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.regex.Pattern;
-
-public class EmojiProvider {
-
-  private static final    String        TAG      = EmojiProvider.class.getSimpleName();
-  private static volatile EmojiProvider instance = null;
-  private static final    Paint         paint    = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG);
-  private static final Pattern EMOJI_PATTERN = Pattern.compile("^(?:(?:[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9-\u21aa\u231a-\u231b\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u24c2\u25aa-\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614-\u2615\u2618\u261d\u2620\u2622-\u2623\u2626\u262a\u262e-\u262f\u2638-\u263a\u2648-\u2653\u2660\u2663\u2665-\u2666\u2668\u267b\u267f\u2692-\u2694\u2696-\u2697\u2699\u269b-\u269c\u26a0-\u26a1\u26aa-\u26ab\u26b0-\u26b1\u26bd-\u26be\u26c4-\u26c5\u26c8\u26ce-\u26cf\u26d1\u26d3-\u26d4\u26e9-\u26ea\u26f0-\u26f5\u26f7-\u26fa\u26fd\u2702\u2705\u2708-\u270d\u270f\u2712\u2714\u2716\u271d\u2721\u2728\u2733-\u2734\u2744\u2747\u274c\u274e\u2753-\u2755\u2757\u2763-\u2764\u2795-\u2797\u27a1\u27b0\u27bf\u2934-\u2935\u2b05-\u2b07\u2b1b-\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299\ud83c\udc04\ud83c\udccf\ud83c\udd70-\ud83c\udd71\ud83c\udd7e-\ud83c\udd7f\ud83c\udd8e\ud83c\udd91-\ud83c\udd9a\ud83c\ude01-\ud83c\ude02\ud83c\ude1a\ud83c\ude2f\ud83c\ude32-\ud83c\ude3a\ud83c\ude50-\ud83c\ude51\u200d\ud83c\udf00-\ud83d\uddff\ud83d\ude00-\ud83d\ude4f\ud83d\ude80-\ud83d\udeff\ud83e\udd00-\ud83e\uddff\udb40\udc20-\udb40\udc7f]|\u200d[\u2640\u2642]|[\ud83c\udde6-\ud83c\uddff]{2}|.[\u20e0\u20e3\ufe0f]+)+)+$");
-
-  private final EmojiTree emojiTree = new EmojiTree();
-
-  private static final int EMOJI_RAW_HEIGHT = 64;
-  private static final int EMOJI_RAW_WIDTH  = 64;
-  private static final int EMOJI_VERT_PAD   = 0;
-  private static final int EMOJI_PER_ROW    = 16;
-
-  private final float decodeScale;
-  private final float verticalPad;
-
-  public static EmojiProvider getInstance(Context context) {
-    if (instance == null) {
-      synchronized (EmojiProvider.class) {
-        if (instance == null) {
-          instance = new EmojiProvider(context);
-        }
-      }
-    }
-    return instance;
-  }
-
-  private EmojiProvider(Context context) {
-    this.decodeScale = Math.min(1f, context.getResources().getDimension(R.dimen.emoji_drawer_size) / EMOJI_RAW_HEIGHT);
-    this.verticalPad = EMOJI_VERT_PAD * this.decodeScale;
-
-    for (EmojiPageModel page : EmojiPages.DATA_PAGES) {
-      if (page.hasSpriteMap()) {
-        EmojiPageBitmap pageBitmap = new EmojiPageBitmap(context, page, decodeScale);
-
-        List<String> emojis = page.getEmoji();
-        for (int i = 0; i < emojis.size(); i++) {
-          emojiTree.add(emojis.get(i), new EmojiDrawInfo(pageBitmap, i));
-        }
-      }
-    }
-
-    for (Pair<String,String> obsolete : EmojiPages.OBSOLETE) {
-      emojiTree.add(obsolete.first(), emojiTree.getEmoji(obsolete.second(), 0, obsolete.second().length()));
-    }
-  }
-
-  @Nullable EmojiParser.CandidateList getCandidates(@Nullable CharSequence text) {
-    if (text == null) return null;
-    return new EmojiParser(emojiTree).findCandidates(text);
-  }
-
-  @Nullable Spannable emojify(@Nullable CharSequence text, @NonNull TextView tv) {
-    return emojify(getCandidates(text), text, tv, false);
-  }
-
-  @Nullable Spannable emojify(@Nullable EmojiParser.CandidateList matches,
-                              @Nullable CharSequence text,
-                              @NonNull TextView tv,
-                              boolean background) {
-    if (matches == null || text == null) return null;
-    SpannableStringBuilder      builder = new SpannableStringBuilder(text);
-
-    for (EmojiParser.Candidate candidate : matches) {
-      Drawable drawable = getEmojiDrawable(candidate.getDrawInfo(), background);
-
-      if (drawable != null) {
-        builder.setSpan(new EmojiSpan(drawable, tv), candidate.getStartIndex(), candidate.getEndIndex(),
-                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-      }
-    }
-
-    return builder;
-  }
-
-  @Nullable Drawable getEmojiDrawable(CharSequence emoji) {
-    EmojiDrawInfo drawInfo = emojiTree.getEmoji(emoji, 0, emoji.length());
-    return getEmojiDrawable(drawInfo, false);
-  }
-
-  public boolean isEmoji(CharSequence emoji) {
-     return emojiTree.getEmoji(emoji, 0, emoji.length()) != null;
-  }
-
-  /**
-   * True if the text is likely a single, valid emoji. Otherwise false.
-   *
-   * We do a two-tier check: first using our own knowledge of emojis (which could be incomplete),
-   * followed by a more wide check for all of the valid emoji unicode ranges (which could lead to
-   * some false positives). YMMV.
-   */
-  public boolean maybeEmoji(CharSequence emoji) {
-    if (Util.isEmpty(emoji)) {
-      return false;
-    }
-
-    if (StringUtil.getGraphemeCount(emoji) != 1) {
-      return false;
-    }
-
-    return isEmoji(emoji) || EMOJI_PATTERN.matcher(emoji).matches();
-  }
-
-  public @Nullable Bitmap getEmojiBitmap(CharSequence emoji, float scale, boolean background) {
-    EmojiDrawInfo drawInfo = emojiTree.getEmoji(emoji, 0, emoji.length());
-    EmojiDrawable drawable = ((EmojiDrawable) getEmojiDrawable(drawInfo, background));
-    if (drawable != null) {
-      return drawable.getEmojiBitmap(scale);
-    }
-    return null;
-  }
-
-  protected  @Nullable Drawable getEmojiDrawable(@Nullable EmojiDrawInfo drawInfo, boolean background) {
-    if (drawInfo == null)  {
-      return null;
-    }
-    final EmojiDrawable drawable = new EmojiDrawable(drawInfo, decodeScale);
-    if (background) {
-      try {
-        drawable.setBitmap(drawInfo.getPage().loadPage(), background);
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    } else {
-      drawInfo.getPage().get().addListener(new FutureTaskListener<Bitmap>() {
-        @Override public void onSuccess(final Bitmap result) {
-          Util.runOnMain(() -> drawable.setBitmap(result));
-        }
-
-        @Override public void onFailure(ExecutionException error) {
-          Log.w(TAG, error);
-        }
-      });
-    }
-    return drawable;
-  }
-
-  class EmojiDrawable extends Drawable {
-    private final EmojiDrawInfo info;
-    private       Bitmap        bmp;
-    private final float         intrinsicWidth;
-    private final float         intrinsicHeight;
-
-    @Override
-    public int getIntrinsicWidth() {
-      return (int)intrinsicWidth;
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-      return (int)intrinsicHeight;
-    }
-
-    EmojiDrawable(EmojiDrawInfo info, float decodeScale) {
-      this.info            = info;
-      this.intrinsicWidth  = EMOJI_RAW_WIDTH  * decodeScale;
-      this.intrinsicHeight = EMOJI_RAW_HEIGHT * decodeScale;
-    }
-
-    private Bitmap getEmojiBitmap(float scale) {
-      Bitmap singleEmoji = Bitmap.createBitmap((int) (intrinsicWidth * scale), (int) (intrinsicHeight*scale), Bitmap.Config.ARGB_8888);
-
-      final int row = info.getIndex() / EMOJI_PER_ROW;
-      final int rowIndex = info.getIndex() % EMOJI_PER_ROW;
-
-      Rect desRect = new Rect(0, 0, (int) intrinsicWidth, (int) intrinsicWidth);
-      Rect srcRect = new Rect((int)(rowIndex * intrinsicWidth),
-        (int)(row * intrinsicHeight + row * verticalPad)+1,
-        (int)(((rowIndex + 1) * intrinsicWidth)-1),
-        (int)((row + 1) * intrinsicHeight + row * verticalPad)-1);
-
-      Canvas canvas = new Canvas(singleEmoji);
-      canvas.scale(scale, scale);
-      canvas.drawBitmap(bmp, srcRect, desRect, paint);
-
-      return singleEmoji;
-    }
-
-
-    @Override
-    public void draw(@NonNull Canvas canvas) {
-      if (bmp == null) {
-        return;
-      }
-
-      final int row = info.getIndex() / EMOJI_PER_ROW;
-      final int row_index = info.getIndex() % EMOJI_PER_ROW;
-
-      canvas.drawBitmap(bmp,
-                        new Rect((int)(row_index * intrinsicWidth),
-                                 (int)(row * intrinsicHeight + row * verticalPad)+1,
-                                 (int)(((row_index + 1) * intrinsicWidth)-1),
-                                 (int)((row + 1) * intrinsicHeight + row * verticalPad)-1),
-                        getBounds(),
-                        paint);
-    }
-
-    public void setBitmap(Bitmap bitmap) {
-      setBitmap(bitmap, false);
-    }
-
-    public void setBitmap(Bitmap bitmap, boolean background) {
-      if (!background) {
-        Util.assertMainThread();
-      }
-      if (bmp == null || !bmp.sameAs(bitmap)) {
-        bmp = bitmap;
-        invalidateSelf();
-      }
-    }
-
-    @Override
-    public int getOpacity() {
-      return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public void setAlpha(int alpha) { }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) { }
-  }
-
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java

@@ -1,48 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Paint.FontMetricsInt;
-import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import android.widget.TextView;
-
-import org.thoughtcrime.securesms.R;
-
-public class EmojiSpan extends AnimatingImageSpan {
-
-  private final float SHIFT_FACTOR = 1.5f;
-
-  private final int            size;
-  private final FontMetricsInt fm;
-
-  public EmojiSpan(@NonNull Drawable drawable, @NonNull TextView tv) {
-    super(drawable, tv);
-    fm   = tv.getPaint().getFontMetricsInt();
-    size = fm != null ? Math.abs(fm.descent) + Math.abs(fm.ascent)
-                      : tv.getResources().getDimensionPixelSize(R.dimen.conversation_item_body_text_size);
-    getDrawable().setBounds(0, 0, size, size);
-  }
-
-  @Override
-  public int getSize(@NonNull Paint paint, CharSequence text, int start, int end, FontMetricsInt fm) {
-    if (fm != null && this.fm != null) {
-      fm.ascent  = this.fm.ascent;
-      fm.descent = this.fm.descent;
-      fm.top     = this.fm.top;
-      fm.bottom  = this.fm.bottom;
-      fm.leading = this.fm.leading;
-      return size;
-    } else {
-      return super.getSize(paint, text, start, end, fm);
-    }
-  }
-
-  @Override
-  public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint) {
-    int height          = bottom - top;
-    int centeringMargin = (height - size) / 2;
-    int adjustedMargin  = (int) (centeringMargin * SHIFT_FACTOR);
-    super.draw(canvas, text, start, end, x, top, y, bottom - adjustedMargin, paint);
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java

@@ -1,5 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-public final class EmojiStrings {
-  public static final String BUST_IN_SILHOUETTE = "\uD83D\uDC64";
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java

@@ -1,249 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.URLSpan;
-import android.text.util.Linkify;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.core.widget.TextViewCompat;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
-import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
-import org.thoughtcrime.securesms.util.LongClickCopySpan;
-import org.thoughtcrime.securesms.util.Prefs;
-import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.guava.Optional;
-
-import java.util.regex.Pattern;
-
-
-public class EmojiTextView extends AppCompatTextView {
-
-  private final boolean scaleEmojis;
-  private final boolean forceCustom;
-  private final boolean createInBackground;
-
-  private static final char ELLIPSIS = '…';
-
-  private CharSequence previousText;
-  private BufferType   previousBufferType;
-  private float        originalFontSize;
-  private boolean      useSystemEmoji;
-  private boolean      sizeChangeInProgress;
-  private final int    maxLength;
-  private CharSequence overflowText;
-  private CharSequence previousOverflowText;
-
-  public EmojiTextView(Context context) {
-    this(context, null);
-  }
-
-  public EmojiTextView(Context context, AttributeSet attrs) {
-    this(context, attrs, 0);
-  }
-
-  public EmojiTextView(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-
-    TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.EmojiTextView, 0, 0);
-    scaleEmojis = a.getBoolean(R.styleable.EmojiTextView_scaleEmojis, false);
-    maxLength   = a.getInteger(R.styleable.EmojiTextView_emoji_maxLength, -1);
-    forceCustom = a.getBoolean(R.styleable.EmojiTextView_emoji_forceCustom, false);
-    createInBackground = a.getBoolean(R.styleable.EmojiTextView_createInBackground, false);
-    a.recycle();
-
-    a = context.obtainStyledAttributes(attrs, new int[]{android.R.attr.textSize});
-    originalFontSize = a.getDimensionPixelSize(0, 0);
-    a.recycle();
-  }
-
-  @Override public void setText(@Nullable CharSequence text, BufferType type) {
-    EmojiProvider             provider   = EmojiProvider.getInstance(getContext());
-    EmojiParser.CandidateList candidates = provider.getCandidates(text);
-
-    if (scaleEmojis && candidates != null && candidates.allEmojis) {
-      int   emojis = candidates.size();
-      float scale  = 1.0f;
-
-      if (emojis <= 8) scale += 0.25f;
-      if (emojis <= 6) scale += 0.25f;
-      if (emojis <= 4) scale += 0.25f;
-      if (emojis <= 2) scale += 0.25f;
-
-      super.setTextSize(TypedValue.COMPLEX_UNIT_PX, originalFontSize * scale);
-    } else if (scaleEmojis) {
-      super.setTextSize(TypedValue.COMPLEX_UNIT_PX, originalFontSize);
-    }
-
-    if (unchanged(text, overflowText, type)) {
-      return;
-    }
-
-    previousText         = text;
-    previousOverflowText = overflowText;
-    previousBufferType   = type;
-    useSystemEmoji       = useSystemEmoji();
-
-    if (useSystemEmoji || candidates == null || candidates.size() == 0) {
-      super.setText(new SpannableStringBuilder(Optional.fromNullable(text).or("")).append(Optional.fromNullable(overflowText).or("")), BufferType.NORMAL);
-
-      if (getEllipsize() == TextUtils.TruncateAt.END && maxLength > 0) {
-        ellipsizeAnyTextForMaxLength();
-      }
-    } else {
-      CharSequence emojified = provider.emojify(candidates, text, this, createInBackground);
-      super.setText(new SpannableStringBuilder(emojified).append(Optional.fromNullable(overflowText).or("")), BufferType.SPANNABLE);
-
-      // Android fails to ellipsize spannable strings. (https://issuetracker.google.com/issues/36991688)
-      // We ellipsize them ourselves by manually truncating the appropriate section.
-      if (getEllipsize() == TextUtils.TruncateAt.END) {
-        if (maxLength > 0) {
-          ellipsizeAnyTextForMaxLength();
-        } else {
-          ellipsizeEmojiTextForMaxLines();
-        }
-      }
-    }
-  }
-
-  public void setOverflowText(@Nullable CharSequence overflowText) {
-    this.overflowText = overflowText;
-    setText(previousText, BufferType.SPANNABLE);
-  }
-
-  private void ellipsizeAnyTextForMaxLength() {
-    if (maxLength > 0 && getText().length() > maxLength + 1) {
-      SpannableStringBuilder newContent = new SpannableStringBuilder();
-      newContent.append(getText().subSequence(0, maxLength)).append(ELLIPSIS).append(Optional.fromNullable(overflowText).or(""));
-
-      EmojiParser.CandidateList newCandidates = EmojiProvider.getInstance(getContext()).getCandidates(newContent);
-
-      if (useSystemEmoji || newCandidates == null || newCandidates.size() == 0) {
-        super.setText(newContent, BufferType.NORMAL);
-      } else {
-        CharSequence emojified = EmojiProvider.getInstance(getContext()).emojify(newCandidates, newContent, this, createInBackground);
-        super.setText(emojified, BufferType.SPANNABLE);
-      }
-    }
-  }
-
-  private void ellipsizeEmojiTextForMaxLines() {
-    post(() -> {
-      if (getLayout() == null) {
-        ellipsizeEmojiTextForMaxLines();
-        return;
-      }
-
-      int maxLines = TextViewCompat.getMaxLines(EmojiTextView.this);
-      if (maxLines <= 0 && maxLength < 0) {
-        return;
-      }
-
-      int lineCount = getLineCount();
-      if (lineCount > maxLines) {
-        int overflowStart = getLayout().getLineStart(maxLines - 1);
-        CharSequence overflow = getText().subSequence(overflowStart, getText().length());
-        CharSequence ellipsized = TextUtils.ellipsize(overflow, getPaint(), getWidth(), TextUtils.TruncateAt.END);
-
-        SpannableStringBuilder newContent = new SpannableStringBuilder();
-        newContent.append(getText().subSequence(0, overflowStart))
-                  .append(ellipsized.subSequence(0, ellipsized.length()))
-                  .append(Optional.fromNullable(overflowText).or(""));
-
-        EmojiParser.CandidateList newCandidates = EmojiProvider.getInstance(getContext()).getCandidates(newContent);
-        CharSequence              emojified     = EmojiProvider.getInstance(getContext()).emojify(newCandidates, newContent, this, createInBackground);
-
-        super.setText(emojified, BufferType.SPANNABLE);
-      }
-    });
-  }
-
-  private boolean unchanged(CharSequence text, CharSequence overflowText, BufferType bufferType) {
-    return Util.equals(previousText, text)                 &&
-           Util.equals(previousOverflowText, overflowText) &&
-           Util.equals(previousBufferType, bufferType)     &&
-           useSystemEmoji == useSystemEmoji()              &&
-           !sizeChangeInProgress;
-  }
-
-  private boolean useSystemEmoji() {
-   return !forceCustom && Prefs.isSystemEmojiPreferred(getContext());
-  }
-
-  @Override
-  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-    super.onSizeChanged(w, h, oldw, oldh);
-
-    if (!sizeChangeInProgress) {
-      sizeChangeInProgress = true;
-      setText(previousText, previousBufferType);
-      sizeChangeInProgress = false;
-    }
-  }
-
-  @Override
-  public void invalidateDrawable(@NonNull Drawable drawable) {
-    if (drawable instanceof EmojiDrawable) invalidate();
-    else                                   super.invalidateDrawable(drawable);
-  }
-
-  @Override
-  public void setTextSize(float size) {
-    setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
-  }
-
-  @Override
-  public void setTextSize(int unit, float size) {
-    this.originalFontSize = TypedValue.applyDimension(unit, size, getResources().getDisplayMetrics());
-    super.setTextSize(unit, size);
-  }
-
-
-  // tools for linkify
-
-  private static final Pattern CMD_PATTERN = Pattern.compile("(?<=^|\\s)/[a-zA-Z][a-zA-Z@\\d_/.-]{0,254}");
-  private static final Pattern CUSTOM_PATTERN = Pattern.compile("(?<=^|\\s)(OPENPGP4FPR|openpgp4fpr|mumble):[^ \\n]+");
-  private static final Pattern PROXY_PATTERN = Pattern.compile("(?<=^|\\s)(SOCKS5|socks5|ss|SS):[^ \\n]+");
-
-  private static void replaceURLSpan(Spannable messageBody) {
-    URLSpan[] urlSpans = messageBody.getSpans(0, messageBody.length(), URLSpan.class);
-    for (URLSpan urlSpan : urlSpans) {
-      int start = messageBody.getSpanStart(urlSpan);
-      int end = messageBody.getSpanEnd(urlSpan);
-      // LongClickCopySpan must not be derived from URLSpan, otherwise links will be removed on the next addLinks() call
-      messageBody.setSpan(new LongClickCopySpan(urlSpan.getURL()), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    }
-  }
-
-  public static Spannable linkify(Spannable messageBody) {
-    // linkify commands such as `/echo` -
-    // do this first to avoid `/xkcd_123456` to be treated partly as a phone number
-    Linkify.addLinks(messageBody, CMD_PATTERN, "cmd:", null, null);
-    EmojiTextView.replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call
-
-    Linkify.addLinks(messageBody, CUSTOM_PATTERN, null, null, null);
-    EmojiTextView.replaceURLSpan(messageBody);
-
-    if (Linkify.addLinks(messageBody, PROXY_PATTERN, null, null, null)) {
-      EmojiTextView.replaceURLSpan(messageBody); // replace URLSpan so that it is not removed on the next addLinks() call
-    }
-
-    // linkyfiy urls etc., this removes all existing URLSpan
-    if (Linkify.addLinks(messageBody, Linkify.EMAIL_ADDRESSES|Linkify.WEB_URLS|Linkify.PHONE_NUMBERS)) {
-      EmojiTextView.replaceURLSpan(messageBody);
-    }
-
-    return messageBody;
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java

@@ -2,14 +2,14 @@ package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatImageButton;
+
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.ResUtil;
 
-public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.MediaKeyboardListener {
+public class EmojiToggle extends AppCompatImageButton {
 
   private Drawable emojiToggle;
 //  private Drawable stickerToggle;
@@ -50,10 +50,6 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
     setToMedia();
   }
 
-  public void attach(MediaKeyboard drawer) {
-    drawer.setKeyboardListener(this);
-  }
-
   public void setStickerMode(boolean stickerMode) {
     this.mediaToggle = /*stickerMode ? stickerToggle :*/ emojiToggle;
 
@@ -66,20 +62,4 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
     //return this.mediaToggle == stickerToggle;
     return false;
   }
-
-  @Override public void onShown() {
-    setToIme();
-  }
-
-  @Override public void onHidden() {
-    setToMedia();
-  }
-
-  @Override
-  public void onKeyboardProviderChanged(@NonNull MediaKeyboardProvider provider) {
-    setStickerMode(false);
-    //setStickerMode(provider instanceof StickerKeyboardProvider);
-    /*TextSecurePreferences.setMediaKeyboardMode(getContext(), (provider instanceof StickerKeyboardProvider) ? TextSecurePreferences.MediaKeyboardMode.STICKER
-                                                                                                           : TextSecurePreferences.MediaKeyboardMode.EMOJI);*/
-  }
 }

src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java

@@ -1,51 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.os.Build;
-import androidx.annotation.NonNull;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.PopupWindow;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
-
-import java.util.List;
-
-public class EmojiVariationSelectorPopup extends PopupWindow {
-
-  private final Context            context;
-  private final ViewGroup          list;
-  private final EmojiEventListener listener;
-
-  public EmojiVariationSelectorPopup(@NonNull Context context, @NonNull EmojiEventListener listener) {
-    super(LayoutInflater.from(context).inflate(R.layout.emoji_variation_selector, null),
-          ViewGroup.LayoutParams.WRAP_CONTENT,
-          ViewGroup.LayoutParams.WRAP_CONTENT);
-    this.context  = context;
-    this.listener = listener;
-    this.list     = (ViewGroup) getContentView().findViewById(R.id.emoji_variation_container);
-
-    setBackgroundDrawable(null);
-    setOutsideTouchable(true);
-
-    if (Build.VERSION.SDK_INT >= 21) {
-      setElevation(20);
-    }
-  }
-
-  public void setVariations(List<String> variations) {
-    list.removeAllViews();
-
-    for (String variation : variations) {
-      ImageView imageView = (ImageView) LayoutInflater.from(context).inflate(R.layout.emoji_variation_selector_item, list, false);
-      imageView.setImageDrawable(EmojiProvider.getInstance(context).getEmojiDrawable(variation));
-      imageView.setOnClickListener(v -> {
-        listener.onEmojiSelected(variation);
-        dismiss();
-      });
-      list.addView(imageView);
-    }
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java

@@ -1,74 +1,33 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.ViewPager;
+import androidx.core.util.Consumer;
+import androidx.emoji2.emojipicker.EmojiPickerView;
+import androidx.emoji2.emojipicker.EmojiViewItem;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.InputAwareLayout.InputView;
-import org.thoughtcrime.securesms.components.RepeatableImageKey;
-import org.thoughtcrime.securesms.mms.GlideApp;
 
-import java.util.Arrays;
-
-public class MediaKeyboard extends FrameLayout implements InputView,
-                                                          MediaKeyboardProvider.Presenter,
-                                                          MediaKeyboardProvider.Controller,
-                                                          MediaKeyboardBottomTabAdapter.EventListener
-{
+public class MediaKeyboard extends FrameLayout implements InputView, Consumer<EmojiViewItem> {
 
   private static final String TAG = MediaKeyboard.class.getSimpleName();
 
-            private RecyclerView            categoryTabs;
-            private ViewPager               categoryPager;
-            private ViewGroup               providerTabs;
-            private RepeatableImageKey      backspaceButton;
-            private RepeatableImageKey      backspaceButtonBackup;
-            private View                    searchButton;
-            private View                    addButton;
   @Nullable private MediaKeyboardListener   keyboardListener;
-            private MediaKeyboardProvider[] providers;
-            private int                     providerIndex;
+  private EmojiPickerView emojiPicker;
 
-  private final boolean tabsAtBottom;
-
-  private MediaKeyboardBottomTabAdapter categoryTabAdapter;
-
-  public MediaKeyboard(Context context) {
-    this(context, null);
+  public MediaKeyboard(@NonNull Context context) {
+    super(context);
   }
 
-  public MediaKeyboard(Context context, AttributeSet attrs) {
+  public MediaKeyboard(@NonNull Context context, @Nullable AttributeSet attrs) {
     super(context, attrs);
-
-    TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.MediaKeyboard, 0, 0);
-
-    try {
-      tabsAtBottom = typedArray.getInt(R.styleable.MediaKeyboard_tabs_gravity, 0) == 0;
-    } finally {
-      typedArray.recycle();
-    }
-  }
-
-  public void setProviders(int startIndex, MediaKeyboardProvider... providers) {
-    if (!Arrays.equals(this.providers, providers)) {
-      this.providers     = providers;
-      this.providerIndex = startIndex;
-
-      requestPresent(providers, providerIndex);
-    }
   }
 
   public void setKeyboardListener(@Nullable MediaKeyboardListener listener) {
@@ -82,8 +41,6 @@ public class MediaKeyboard extends FrameLayout implements InputView,
 
   @Override
   public void show(int height, boolean immediate) {
-    if (this.categoryPager == null) initView();
-
     ViewGroup.LayoutParams params = getLayoutParams();
     params.height = height;
     Log.i(TAG, "showing emoji drawer with height " + params.height);
@@ -93,12 +50,12 @@ public class MediaKeyboard extends FrameLayout implements InputView,
   }
 
   public void show() {
-    if (this.categoryPager == null) initView();
-
+    if (emojiPicker == null) {
+      emojiPicker = findViewById(R.id.emoji_picker);
+      emojiPicker.setOnEmojiPickedListener(this);
+    };
     setVisibility(VISIBLE);
     if (keyboardListener != null) keyboardListener.onShown();
-
-    requestPresent(providers, providerIndex);
   }
 
   @Override
@@ -109,188 +66,13 @@ public class MediaKeyboard extends FrameLayout implements InputView,
   }
 
   @Override
-  public void present(@NonNull MediaKeyboardProvider provider,
-                      @NonNull PagerAdapter pagerAdapter,
-                      @NonNull MediaKeyboardProvider.TabIconProvider tabIconProvider,
-                      @Nullable MediaKeyboardProvider.BackspaceObserver backspaceObserver,
-                      @Nullable MediaKeyboardProvider.AddObserver addObserver,
-                      @Nullable MediaKeyboardProvider.SearchObserver searchObserver,
-                      int startingIndex)
-  {
-    if (categoryPager == null) return;
-    if (!provider.equals(providers[providerIndex])) return;
-    if (keyboardListener != null) keyboardListener.onKeyboardProviderChanged(provider);
-
-    boolean isSolo = providers.length == 1;
-
-    presentProviderStrip(isSolo);
-    presentCategoryPager(pagerAdapter, tabIconProvider, startingIndex);
-    presentProviderTabs(providers, providerIndex);
-    presentSearchButton(searchObserver);
-    presentBackspaceButton(backspaceObserver, isSolo);
-    presentAddButton(addObserver);
-  }
-
-  @Override
-  public int getCurrentPosition() {
-    return categoryPager != null ? categoryPager.getCurrentItem() : 0;
-  }
-
-  @Override
-  public void requestDismissal() {
-    hide(true);
-    providerIndex = 0;
-    if (keyboardListener != null) keyboardListener.onKeyboardProviderChanged(providers[providerIndex]);
-  }
-
-  @Override
-  public boolean isVisible() {
-    return getVisibility() == View.VISIBLE;
-  }
-
-  @Override
-  public void onTabSelected(int index) {
-    if (categoryPager != null) {
-      categoryPager.setCurrentItem(index);
-      categoryTabs.smoothScrollToPosition(index);
-    }
-  }
-
-  @Override
-  public void setViewPagerEnabled(boolean enabled) {
-    if (categoryPager != null) {
-      categoryPager.setEnabled(enabled);
-    }
-  }
-
-  private void initView() {
-    final View view = LayoutInflater.from(getContext()).inflate(R.layout.media_keyboard, this, true);
-
-    RecyclerView categoryTabsTop    = view.findViewById(R.id.media_keyboard_tabs_top);
-    RecyclerView categoryTabsBottom = view.findViewById(R.id.media_keyboard_tabs);
-
-    this.categoryTabs          = tabsAtBottom ? categoryTabsBottom : categoryTabsTop;
-    this.categoryPager         = view.findViewById(R.id.media_keyboard_pager);
-    this.providerTabs          = view.findViewById(R.id.media_keyboard_provider_tabs);
-    this.backspaceButton       = view.findViewById(R.id.media_keyboard_backspace);
-    this.backspaceButtonBackup = view.findViewById(R.id.media_keyboard_backspace_backup);
-    this.searchButton          = view.findViewById(R.id.media_keyboard_search);
-    this.addButton             = view.findViewById(R.id.media_keyboard_add);
-
-    this.categoryTabAdapter = new MediaKeyboardBottomTabAdapter(GlideApp.with(this), this, tabsAtBottom);
-
-    categoryTabs.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-    categoryTabs.setAdapter(categoryTabAdapter);
-    categoryTabs.setVisibility(VISIBLE);
-  }
-
-  private void requestPresent(@NonNull MediaKeyboardProvider[] providers, int newIndex) {
-    providers[providerIndex].setController(null);
-    providerIndex = newIndex;
-
-    providers[providerIndex].setController(this);
-    providers[providerIndex].requestPresentation(this, providers.length == 1);
-  }
-
-
-  private void presentCategoryPager(@NonNull PagerAdapter pagerAdapter,
-                                    @NonNull MediaKeyboardProvider.TabIconProvider iconProvider,
-                                    int startingIndex) {
-    if (categoryPager.getAdapter() != pagerAdapter) {
-      categoryPager.setAdapter(pagerAdapter);
-    }
-
-    categoryPager.setCurrentItem(startingIndex);
-
-    categoryPager.clearOnPageChangeListeners();
-    categoryPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-      @Override
-      public void onPageScrolled(int i, float v, int i1) {
-      }
-
-      @Override
-      public void onPageSelected(int i) {
-        categoryTabAdapter.setActivePosition(i);
-        categoryTabs.smoothScrollToPosition(i);
-      }
-
-      @Override
-      public void onPageScrollStateChanged(int i) {
-      }
-    });
-
-    categoryTabAdapter.setTabIconProvider(iconProvider, pagerAdapter.getCount());
-    categoryTabAdapter.setActivePosition(startingIndex);
-  }
-
-  private void presentProviderTabs(@NonNull MediaKeyboardProvider[] providers, int selected) {
-    providerTabs.removeAllViews();
-
-    LayoutInflater inflater = LayoutInflater.from(getContext());
-
-    for (int i = 0; i < providers.length; i++) {
-      MediaKeyboardProvider provider = providers[i];
-      View                  view     = inflater.inflate(provider.getProviderIconView(i == selected), providerTabs, false);
-
-      view.setTag(provider);
-
-      final int index = i;
-      view.setOnClickListener(v -> {
-        requestPresent(providers, index);
-      });
-
-      providerTabs.addView(view);
-    }
-  }
-
-  private void presentBackspaceButton(@Nullable MediaKeyboardProvider.BackspaceObserver backspaceObserver,
-                                      boolean useBackupPosition)
-  {
-    if (backspaceObserver != null) {
-      if (useBackupPosition) {
-        backspaceButton.setVisibility(INVISIBLE);
-        backspaceButton.setOnKeyEventListener(null);
-        backspaceButtonBackup.setVisibility(VISIBLE);
-        backspaceButtonBackup.setOnKeyEventListener(backspaceObserver::onBackspaceClicked);
-      } else {
-        backspaceButton.setVisibility(VISIBLE);
-        backspaceButton.setOnKeyEventListener(backspaceObserver::onBackspaceClicked);
-        backspaceButtonBackup.setVisibility(GONE);
-        backspaceButtonBackup.setOnKeyEventListener(null);
-      }
-    } else {
-      backspaceButton.setVisibility(INVISIBLE);
-      backspaceButton.setOnKeyEventListener(null);
-      backspaceButtonBackup.setVisibility(GONE);
-      backspaceButton.setOnKeyEventListener(null);
-    }
-  }
-
-  private void presentAddButton(@Nullable MediaKeyboardProvider.AddObserver addObserver) {
-    if (addObserver != null) {
-      addButton.setVisibility(VISIBLE);
-      addButton.setOnClickListener(v -> addObserver.onAddClicked());
-    } else {
-      addButton.setVisibility(GONE);
-      addButton.setOnClickListener(null);
-    }
-  }
-
-  private void presentSearchButton(@Nullable MediaKeyboardProvider.SearchObserver searchObserver) {
-    searchButton.setVisibility(searchObserver != null ? VISIBLE : INVISIBLE);
-  }
-
-  private void presentProviderStrip(boolean isSolo) {
-    int visibility = isSolo ? View.GONE : View.VISIBLE;
-
-    searchButton.setVisibility(visibility);
-    backspaceButton.setVisibility(visibility);
-    providerTabs.setVisibility(visibility);
+  public void accept(EmojiViewItem emojiViewItem) {
+    if (keyboardListener != null) keyboardListener.onEmojiPicked(emojiViewItem.getEmoji());
   }
 
   public interface MediaKeyboardListener {
     void onShown();
     void onHidden();
-    void onKeyboardProviderChanged(@NonNull MediaKeyboardProvider provider);
+    void onEmojiPicked(String emoji);
   }
 }

src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java

@@ -1,103 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.MediaKeyboardProvider.TabIconProvider;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-
-public class MediaKeyboardBottomTabAdapter extends RecyclerView.Adapter<MediaKeyboardBottomTabAdapter.MediaKeyboardBottomTabViewHolder>  {
-
-  private final GlideRequests glideRequests;
-  private final EventListener eventListener;
-  private final boolean       highlightTop;
-
-  private TabIconProvider tabIconProvider;
-  private int             activePosition;
-  private int             count;
-
-  public MediaKeyboardBottomTabAdapter(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener, boolean highlightTop) {
-    this.glideRequests = glideRequests;
-    this.eventListener = eventListener;
-    this.highlightTop  = highlightTop;
-  }
-
-  @Override
-  public @NonNull MediaKeyboardBottomTabViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-    return new MediaKeyboardBottomTabViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.media_keyboard_bottom_tab_item, viewGroup, false),
-                                                highlightTop);
-  }
-
-  @Override
-  public void onBindViewHolder(@NonNull MediaKeyboardBottomTabViewHolder viewHolder, int i) {
-    viewHolder.bind(glideRequests, eventListener, tabIconProvider, i, i == activePosition);
-  }
-
-  @Override
-  public void onViewRecycled(@NonNull MediaKeyboardBottomTabViewHolder holder) {
-    holder.recycle();
-  }
-
-  @Override
-  public int getItemCount() {
-    return count;
-  }
-
-  public void setTabIconProvider(@NonNull TabIconProvider iconProvider, int count) {
-    this.tabIconProvider = iconProvider;
-    this.count           = count;
-
-    notifyDataSetChanged();
-  }
-
-  public void setActivePosition(int position) {
-    this.activePosition = position;
-    notifyDataSetChanged();
-  }
-
-  static class MediaKeyboardBottomTabViewHolder extends RecyclerView.ViewHolder {
-
-    private final ImageView image;
-    private final View      indicator;
-
-    public MediaKeyboardBottomTabViewHolder(@NonNull View itemView, boolean highlightTop) {
-      super(itemView);
-
-      View indicatorTop    = itemView.findViewById(R.id.media_keyboard_top_tab_indicator);
-      View indicatorBottom = itemView.findViewById(R.id.media_keyboard_bottom_tab_indicator);
-
-      this.image     = itemView.findViewById(R.id.media_keyboard_bottom_tab_image);
-      this.indicator = highlightTop ? indicatorTop : indicatorBottom;
-
-      this.indicator.setVisibility(View.VISIBLE);
-    }
-
-    void bind(@NonNull GlideRequests glideRequests,
-              @NonNull EventListener eventListener,
-              @NonNull TabIconProvider tabIconProvider,
-              int index,
-              boolean selected)
-    {
-      tabIconProvider.loadCategoryTabIcon(glideRequests, image, index);
-      image.setAlpha(selected ? 1 : 0.5f);
-      image.setSelected(selected);
-
-      indicator.setVisibility(selected ? View.VISIBLE : View.INVISIBLE);
-
-      itemView.setOnClickListener(v -> eventListener.onTabSelected(index));
-    }
-
-    void recycle() {
-      itemView.setOnClickListener(null);
-    }
-  }
-
-  interface EventListener {
-    void onTabSelected(int index);
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java

@@ -1,51 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.viewpager.widget.PagerAdapter;
-import android.widget.ImageView;
-
-import org.thoughtcrime.securesms.mms.GlideRequests;
-
-public interface MediaKeyboardProvider {
-  @LayoutRes int getProviderIconView(boolean selected);
-  /** @return True if the click was handled with provider-specific logic, otherwise false */
-  void requestPresentation(@NonNull Presenter presenter, boolean isSoloProvider);
-  void setController(@Nullable Controller controller);
-
-  interface BackspaceObserver {
-    void onBackspaceClicked();
-  }
-
-  interface AddObserver {
-    void onAddClicked();
-  }
-
-  interface SearchObserver {
-    void onSearchOpened();
-    void onSearchClosed();
-    void onSearchChanged(@NonNull String query);
-  }
-
-  interface Controller {
-    void setViewPagerEnabled(boolean enabled);
-  }
-
-  interface Presenter {
-    void present(@NonNull MediaKeyboardProvider provider,
-                 @NonNull PagerAdapter pagerAdapter,
-                 @NonNull TabIconProvider iconProvider,
-                 @Nullable BackspaceObserver backspaceObserver,
-                 @Nullable AddObserver addObserver,
-                 @Nullable SearchObserver searchObserver,
-                 int startingIndex);
-    int getCurrentPosition();
-    void requestDismissal();
-    boolean isVisible();
-  }
-
-  interface TabIconProvider {
-    void loadCategoryTabIcon(@NonNull GlideRequests glideRequests, @NonNull ImageView imageView, int index);
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java

@@ -1,105 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.AsyncTask;
-import android.preference.PreferenceManager;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import com.annimon.stream.Stream;
-import com.fasterxml.jackson.databind.type.CollectionType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.JsonUtils;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-public class RecentEmojiPageModel implements EmojiPageModel {
-  private static final String TAG            = RecentEmojiPageModel.class.getSimpleName();
-  private static final int    EMOJI_LRU_SIZE = 50;
-
-  private final SharedPreferences     prefs;
-  private final String                preferenceName;
-  private final LinkedHashSet<String> recentlyUsed;
-
-  public RecentEmojiPageModel(Context context, @NonNull String preferenceName) {
-    this.prefs          = PreferenceManager.getDefaultSharedPreferences(context);
-    this.preferenceName = preferenceName;
-    this.recentlyUsed   = getPersistedCache();
-  }
-
-  private LinkedHashSet<String> getPersistedCache() {
-    String serialized = prefs.getString(preferenceName, "[]");
-    try {
-      CollectionType collectionType = TypeFactory.defaultInstance()
-                                                 .constructCollectionType(LinkedHashSet.class, String.class);
-      return JsonUtils.getMapper().readValue(serialized, collectionType);
-    } catch (IOException e) {
-      Log.w(TAG, e);
-      return new LinkedHashSet<>();
-    }
-  }
-
-  @Override public int getIconAttr() {
-    return R.attr.emoji_category_recent;
-  }
-
-  @Override public List<String> getEmoji() {
-    List<String> emoji = new ArrayList<>(recentlyUsed);
-    Collections.reverse(emoji);
-    return emoji;
-  }
-
-  @Override public List<Emoji> getDisplayEmoji() {
-    return Stream.of(getEmoji()).map(Emoji::new).toList();
-  }
-
-  @Override public boolean hasSpriteMap() {
-    return false;
-  }
-
-  @Override public String getSprite() {
-    return null;
-  }
-
-  @Override public boolean isDynamic() {
-    return true;
-  }
-
-  public void onCodePointSelected(String emoji) {
-    recentlyUsed.remove(emoji);
-    recentlyUsed.add(emoji);
-
-    if (recentlyUsed.size() > EMOJI_LRU_SIZE) {
-      Iterator<String> iterator = recentlyUsed.iterator();
-      iterator.next();
-      iterator.remove();
-    }
-
-    final LinkedHashSet<String> latestRecentlyUsed = new LinkedHashSet<>(recentlyUsed);
-    new AsyncTask<Void, Void, Void>() {
-
-      @Override
-      protected Void doInBackground(Void... params) {
-        try {
-          String serialized = JsonUtils.toJson(latestRecentlyUsed);
-          prefs.edit()
-               .putString(preferenceName, serialized)
-               .apply();
-        } catch (IOException e) {
-          Log.w(TAG, e);
-        }
-
-        return null;
-      }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-  }
-}

src/main/java/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java

@@ -1,66 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-public class StaticEmojiPageModel implements EmojiPageModel {
-  @AttrRes  private final int         iconAttr;
-  @NonNull  private final List<Emoji> emoji;
-  @Nullable private final String      sprite;
-
-  public StaticEmojiPageModel(@AttrRes int iconAttr, @NonNull String[] strings, @Nullable String sprite) {
-    List<Emoji> emoji = new ArrayList<>(strings.length);
-    for (String s : strings) {
-      emoji.add(new Emoji(s));
-    }
-
-    this.iconAttr = iconAttr;
-    this.emoji    = emoji;
-    this.sprite   = sprite;
-  }
-
-  public StaticEmojiPageModel(@AttrRes int iconAttr, @NonNull Emoji[] emoji, @Nullable String sprite) {
-    this.iconAttr     = iconAttr;
-    this.emoji        = Arrays.asList(emoji);
-    this.sprite       = sprite;
-  }
-
-  public int getIconAttr() {
-    return iconAttr;
-  }
-
-  @Override
-  public @NonNull List<String> getEmoji() {
-    List<String> emojis = new LinkedList<>();
-    for (Emoji e : emoji) {
-      emojis.addAll(e.getVariations());
-    }
-    return emojis;
-  }
-
-  @Override
-  public @NonNull List<Emoji> getDisplayEmoji() {
-    return emoji;
-  }
-
-  @Override
-  public boolean hasSpriteMap() {
-    return sprite != null;
-  }
-
-  @Override
-  public @Nullable String getSprite() {
-    return sprite;
-  }
-
-  @Override
-  public boolean isDynamic() {
-    return false;
-  }
-}