update build.gradle

Update core to 2.20.0

.editorconfig

@@ -0,0 +1,24 @@
+# EditorConfig (https://editorconfig.org/)
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+
+[*.java]
+indent_style = space
+indent_size = 2
+
+[*.c]
+indent_style = space
+indent_size = 4
+
+[*.gradle]
+indent_style = space
+indent_size = 4
+
+[*.sh]
+indent_style = space
+indent_size = 4

.github/CONTRIBUTING.md

@@ -1,31 +0,0 @@
-# Thank you for contributing to Delta Chat.
-
-If you like to discuss a **new feature** or submit suggestions,
-please use the community forum:
-
-* <https://support.delta.chat>
-
-If you intend to send a **bug report** for Delta Chat, 
-search for existing bugs first:
-
-* [Core](https://github.com/deltachat/deltachat-core/issues?&q=is%3Aissue)
-* [Android](https://github.com/deltachat/deltachat-android-ii/issues?&q=is%3Aissue)
-* [iOS](https://github.com/deltachat/deltachat-ios/issues?&q=is%3Aissue)
-* [Desktop](https://github.com/deltachat/deltachat-ios/issues?&q=is%3Aissue)
-* [Node](https://github.com/deltachat/deltachat-node/issues?&q=is%3Aissue)
-
-In short, the Android/iOS/Desktop parts are about the User Interface.
-The Core part is about handling the connection to the mail server and the chat 
-or e-mail messages as well as providing secure communication by using 
-[Autocrypt](https://autocrypt.org/en/latest/).
-
-A _bug_ is a reproducable misbehaviour, 
-when something happens but something else should happen instead. 
-
-Please try to create your issue in the respective issue tracker.
-
-Did you know there is a [Help](https://delta.chat/en/help) page for Delta Chat?
-
-To ask questions, you are also invited to join our IRC channel #deltachat
-on [Freenode](https://kiwiirc.com/nextclient/#irc://irc.freenode.net/deltachat).
-

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+ko_fi: adbenitez
+liberapay: adbenitez
+custom: "https://arcanechat.me/#contribute"

.github/ISSUE_TEMPLATE.md

@@ -1,48 +0,0 @@
-<!--
-Please read the guidelines linked above, especially when you are a first time contributor. Remove this text and provide some basic informations below, if applicable. Remove template content which is not applicable.
-
-This is a bug report forum, if you like to discuss a new feature or submit suggestions, please use the community forum at https://support.delta.chat
--->
-
-**Delta Chat version**
-
-<!-- See settings dialog … -->
-
-**Expected behavior**
-
-<!-- What is the expected output? -->
-
-**Actual behavior**
-
-<!-- What do you see instead? -->
-
-**Steps to reproduce the problem**
-
-1. …
-2. …
-
-**Screen snapshots**
-
-<!-- If applicable … -->
-
-**Debug logs**
-<details>
-<summary>Logs</summary>
-
-```
-
-<!--
-If applicable, debug logs can be copied from within the Delta Chat app: 
-
-Open the _Settings_ menu -> _About_ -> _version number|Info_.
-
-Alternatively from the Android system log:
-
-` adb logcat -v time -s DeltaChat `
-
-This log contains private data (e.g. mail address, provider information) which shall be removed or anonymised prior to posting.
--->
-
-```
-</details>
-

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Report something that isn't working.
+title: ''
+assignees: ''
+labels: bug
+---
+
+<!--
+Please fill out as much of this form as you can (leaving out stuff that is not applicable is ok).
+-->
+
+- Android version:
+- Device:
+- ArcaneChat version:
+- Expected behavior:
+- Actual behavior:
+- Steps to reproduce the problem:
+- Screenshots:
+- Logs:
+
+<!--
+Debug logs can be copied from within the app with
+Settings menu -> Advanced -> View log
+
+Logs may contain private data 
+which shall be removed or anonymised prior to posting.
+-->
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Request a new feature.
+title: ''
+assignees: ''
+labels: enhancement
+---
+
+<!--
+Please fill out as much of this form as you can (leaving out stuff that is not applicable is ok).
+-->
+
+### Describe your feature:
+
+### Why do you think it is useful:

.github/ISSUE_TEMPLATE/other.md

@@ -0,0 +1,6 @@
+---
+name: Other
+about: Start with a new blank issue.
+title: ''
+assignees: ''
+---

.github/mergeable.yml

@@ -0,0 +1,22 @@
+version: 2
+mergeable:
+  - when: pull_request.*
+    name: "Changelog check"
+    validate:
+      - do: or
+        validate:
+        - do: description
+          must_include:
+            regex: '#skip-changelog'
+        - do: and
+          validate:
+            - do: dependent
+              changed:
+                file: '**/*.java'
+                required: ['CHANGELOG.md']
+    fail:
+      - do: checks
+        status: 'action_required'
+        payload:
+          title: CHANGELOG.md might need an update
+          summary: "Please update CHANGELOG.md or add #skip-changelog to the description"

.github/workflows/artifacts.yml

@@ -0,0 +1,20 @@
+name: add artifact links to pull request
+on:
+  workflow_run:
+    workflows: ["Upload Preview APK"]
+    types: [completed]
+
+jobs:
+  artifacts-url-comments:
+    name: add artifact links to pull request
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: add artifact links to pull request
+        uses: tonyhallett/artifacts-url-comments@v1.1.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          prefix: "**To test the changes in this pull request, install this apk:**"
+          format: "[📦 {name}]({url})"
+          addTo: pull

.github/workflows/preview-apk.yml

@@ -0,0 +1,57 @@
+name: Upload Preview APK
+
+on: pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  build:
+    name: Upload Preview APK
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: recursive
+      - name: Validate Fastlane Metadata
+        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
+      - uses: Swatinem/rust-cache@v2
+        with:
+          working-directory: jni/deltachat-core-rust
+      - uses: actions/setup-java@v5
+        with:
+          java-version: 17
+          distribution: 'temurin'
+      - uses: android-actions/setup-android@v3
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r27
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - name: Compile core
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
+          scripts/install-toolchains.sh && scripts/ndk-make.sh armeabi-v7a
+
+      - name: Build APK
+        run: ./gradlew --no-daemon -PABI_FILTER=armeabi-v7a assembleFossDebug
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-preview.apk
+          path: 'build/outputs/apk/foss/debug/*.apk'

.github/workflows/release.yml

@@ -0,0 +1,70 @@
+name: Upload Release APK
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    outputs:
+      match: ${{ steps.check-tag.outputs.match }}
+    steps:
+      - id: check-tag
+        run: |
+          if [[ "${{ github.event.ref }}" =~ ^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
+              echo ::set-output name=match::true
+          fi
+
+  build:
+    needs: check
+    if: needs.check.outputs.match == 'true'
+    name: Upload Release APK
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: Swatinem/rust-cache@v2
+        with:
+          working-directory: jni/deltachat-core-rust
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'temurin'
+      - uses: android-actions/setup-android@v3
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r27
+
+      - name: Compile core
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}"
+          ./scripts/install-toolchains.sh && ./scripts/ndk-make.sh
+
+      - name: Build APK
+        run: |
+          mkdir -p ~/.gradle
+          echo -n ${{ secrets.KEYSTORE_FILE }} | base64 -d >> ~/keystore.jks
+          echo "DC_RELEASE_STORE_FILE=$HOME/keystore.jks" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_STORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_KEY_ALIAS_FDROID=${{ secrets.ALIAS_FDROID }}" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_KEY_ALIAS_GPLAY=${{ secrets.ALIAS_GPLAY }}" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_KEY_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> ~/.gradle/gradle.properties
+          ./gradlew assembleFossRelease
+          rm build/outputs/apk/foss/release/*universal*
+          ./gradlew assembleGplayRelease
+          mv build/outputs/apk/gplay/release/*universal* build/outputs/apk/foss/release/ArcaneChat-gplay.apk
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          token: "${{ secrets.GITHUB_TOKEN }}"
+          body: '[<img src="store/get-it-on-gplay.png" alt="Get it on Google Play" height="48">](https://play.google.com/store/apps/details?id=com.github.arcanechat) [<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite) [<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)'
+          prerelease: ${{ contains(github.event.ref, '-beta') }}
+          fail_on_unmatched_files: true
+          files: build/outputs/apk/foss/release/*.apk

.gitignore

@@ -1,9 +1,11 @@
+*.keystore
 .classpath
 project.properties
 .project
 .settings
 bin/
 gen/
+/gplay/
 .idea/
 *.iml
 *.so
@@ -24,6 +26,26 @@ ffpr
 test/androidTestEspresso/res/values/arrays.xml
 obj/
 jni/libspeex/.deps/
+ndkArch
+
+# ignore debug symbols created by ./tools/upload-release.sh
+*-symbols.zip
 
 # ignore private scripts and directories, eg. local2github.prv.sh
 *.prv*
+
+# contains files for ndk-build when done from gradle.
+.externalNativeBuild
+
+# no vi tmp files
+*.swp
+
+jni/x86
+jni/x86_64
+jni/armeabi
+jni/armeabi-v7a
+jni/arm64-v8a
+
+artwork/drawable*/
+artwork/mipmap-*/
+*~

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "jni/messenger-backend"]
-	path = jni/messenger-backend
-	url = https://github.com/deltachat/deltachat-core
+[submodule "jni/deltachat-core-rust"]
+	path = jni/deltachat-core-rust
+	url = https://github.com/ArcaneChat/core

.tx/config

@@ -1,10 +1,10 @@
 [main]
-host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,he:iw,id:in,lt_LT:lt,km_KH:km-rKH,th_TH:th
+host     = https://www.transifex.com
+lang_map = id: in, ja_JP: ja, nl_NL: nl, pt_BR: pt-rBR, zh_CN: zh-rCN, zh_TW: zh-rTW
 
-[signal-android.master]
-file_filter = res/values-<lang>/strings.xml
-source_file = res/values/strings.xml
+[o:delta-chat:p:delta-chat-app:r:stringsxml]
+file_filter = src/main/res/values-<lang>/strings.xml
+source_file = src/main/res/values/strings.xml
 source_lang = en
-type = ANDROID
+type        = ANDROID
 

AndroidManifest.xml

@@ -1,487 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="org.thoughtcrime.securesms">
-
-    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message,com.takisoft.colorpicker,android.support.v14.preference"/>
-
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
-    <uses-feature android:name="android.hardware.location" android:required="false"/>
-    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
-    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
-    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
-    <uses-feature android:name="android.hardware.portrait" android:required="false"/>
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-
-    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-    <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
-    <uses-permission android:name="android.permission.READ_PROFILE"/>
-    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
-    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"
-                     tools:ignore="ProtectedPermissions"/>
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
-    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
-
-    <!-- For sending/receiving events -->
-    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
-
-
-    <!-- Normal -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-
-    <!-- So we can add a TextSecure 'Account' -->
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
-
-    <!-- For conversation 'shortcuts' on the desktop -->
-    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
-
-    <!-- For fixing MMS -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-
-    <!-- Set image as wallpaper -->
-    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-
-    <application android:name=".ApplicationContext"
-                 android:icon="@mipmap/ic_launcher_dev"
-                 android:label="@string/app_name"
-                 android:supportsRtl="true"
-                 tools:replace="android:allowBackup"
-                 android:allowBackup="false"
-                 android:theme="@style/TextSecure.LightTheme"
-                 android:largeHeap="true">
-
-    <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>
-
-    <meta-data android:name="com.google.android.gms.version"
-               android:value="@integer/google_play_services_version" />
-
-    <meta-data android:name="com.google.android.gms.car.application"
-               android:resource="@xml/automotive_app_desc" />
-
-    <activity android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
-              android:excludeFromRecents="true"
-              android:screenOrientation="portrait"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
-              android:launchMode="singleTask"/>
-
-    <activity android:name=".InviteActivity"
-              android:theme="@style/TextSecure.HighlightTheme"
-              android:windowSoftInputMode="stateHidden"
-              android:parentActivityName=".ConversationListActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <meta-data
-            android:name="android.support.PARENT_ACTIVITY"
-            android:value="org.thoughtcrime.securesms.ConversationListActivity" />
-    </activity>
-
-    <activity android:name=".ShareActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:excludeFromRecents="true"
-              android:launchMode="singleTask"
-              android:taskAffinity=""
-              android:noHistory="true"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-
-        <intent-filter>
-            <action android:name="android.intent.action.SEND" />
-            <category android:name="android.intent.category.DEFAULT"/>
-            <data android:mimeType="audio/*" />
-            <data android:mimeType="image/*" />
-            <data android:mimeType="text/plain" />
-            <data android:mimeType="video/*" />
-            <data android:mimeType="application/*"/>
-            <data android:mimeType="text/*"/>
-            <data android:mimeType="*/*"/>
-        </intent-filter>
-
-        <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value=".service.DirectShareService" />
-
-    </activity>
-
-    <activity android:name=".ConversationListActivity"
-              android:label="@string/app_name"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:exported="true" />
-
-    <activity-alias android:name=".RoutingActivity"
-                    android:targetActivity=".ConversationListActivity"
-                    android:exported="true">
-
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-            <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
-        </intent-filter>
-
-        <meta-data android:name="com.sec.minimode.icon.portrait.normal"
-                   android:resource="@mipmap/ic_launcher" />
-        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
-                   android:resource="@mipmap/ic_launcher" />
-
-    </activity-alias>
-
-    <activity android:name=".ConversationListArchiveActivity"
-              android:label="@string/AndroidManifest_archived_conversations"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".ConversationListActivity">
-        <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
-    </activity>
-
-    <activity android:name=".ConversationActivity"
-              android:windowSoftInputMode="stateUnchanged"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".ConversationListActivity">
-        <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
-    </activity>
-
-    <activity android:name=".ConversationPopupActivity"
-              android:windowSoftInputMode="stateVisible"
-              android:launchMode="singleTask"
-              android:taskAffinity=""
-              android:excludeFromRecents="true"
-              android:theme="@style/TextSecure.LightTheme.Popup"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-    <activity android:name=".GroupCreateActivity"
-          android:windowSoftInputMode="stateVisible"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".DatabaseUpgradeActivity"
-              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphraseCreateActivity"
-              android:label="@string/AndroidManifest__create_passphrase"
-              android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphrasePromptActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightIntroTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".NewConversationActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:windowSoftInputMode="stateAlwaysVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ContactMultiSelectionActivity"
-          android:label="@string/AndroidManifest__select_contacts"
-          android:windowSoftInputMode="stateHidden"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".giph.ui.GiphyActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphraseChangeActivity"
-              android:label="@string/AndroidManifest__change_passphrase"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".VerifyIdentityActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ApplicationPreferencesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".WelcomeActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".RegistrationActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".LogSubmitActivity"
-              android:label="@string/AndroidManifest__log_submit"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".MediaPreviewActivity"
-              android:label="@string/AndroidManifest__media_preview"
-              android:windowSoftInputMode="stateHidden"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".MediaOverviewActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".DummyActivity"
-              android:theme="@android:style/Theme.NoDisplay"
-              android:enabled="true"
-              android:allowTaskReparenting="true"
-              android:noHistory="true"
-              android:excludeFromRecents="true"
-              android:alwaysRetainTaskState="false"
-              android:stateNotNeeded="true"
-              android:clearTaskOnLaunch="true"
-              android:finishOnTaskLaunch="true" />
-
-    <activity android:name=".RecipientPreferenceActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".BlockedContactsActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".scribbles.ScribbleActivity"
-              android:theme="@style/TextSecure.ScribbleTheme"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".scribbles.StickerSelectActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
-
-    <activity android:name=".CreateProfileActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:windowSoftInputMode="stateVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".QrScanActivity"
-            android:theme="@style/TextSecure.LightTheme"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-     <activity android:name=".QrShowActivity"
-            android:theme="@style/TextSecure.LightTheme"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ClearProfileAvatarActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:icon="@drawable/clear_profile_avatar"
-              android:label="@string/AndroidManifest_remove_photo">
-
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
-    </activity>
-
-    <activity android:name=".contactshare.ContactShareEditActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.ContactNameEditActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.SharedContactDetailsActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".preferences.ChatBackgroundActivity"
-        android:theme="@style/TextSecure.LightTheme"
-        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
-    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
-    <service android:enabled="true" android:name=".service.MessageRetrievalService"/>
-
-    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
-        <intent-filter>
-            <action android:name="android.accounts.AccountAuthenticator" />
-        </intent-filter>
-        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
-    </service>
-
-    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
-        <intent-filter>
-            <action android:name="android.content.SyncAdapter"/>
-        </intent-filter>
-        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
-        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
-    </service>
-
-    <service android:name=".service.DirectShareService"
-             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
-        <intent-filter>
-            <action android:name="android.service.chooser.ChooserTargetService" />
-        </intent-filter>
-    </service>
-
-    <service android:name=".service.GenericForegroundService"/>
-
-    <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
-        <intent-filter>
-            <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            <category android:name="org.thoughtcrime.securesms" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.MarkReadReceiver"
-              android:enabled="true"
-              android:exported="false">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.notifications.CLEAR"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.RemoteReplyReceiver"
-              android:enabled="true"
-              android:exported="false">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.AndroidAutoHeardReceiver"
-              android:exported="false">
-        <intent-filter>
-          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.AndroidAutoReplyReceiver"
-              android:exported="false">
-        <intent-filter>
-          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.ExpirationListener" />
-
-    <receiver android:name=".jobmanager.requirements.BackoffReceiver" />
-
-    <provider android:name=".providers.PartProvider"
-              android:grantUriPermissions="true"
-              android:exported="false"
-              android:authorities="${applicationId}.provider.securesms" />
-
-    <provider android:name=".providers.MmsBodyProvider"
-              android:grantUriPermissions="true"
-              android:exported="false"
-              android:authorities="${applicationId}.provider.securesms.mms" />
-
-    <provider android:name="android.support.v4.content.FileProvider"
-              android:authorities="${applicationId}.fileprovider"
-              android:exported="false"
-              android:grantUriPermissions="true">
-
-        <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_provider_paths" />
-
-    </provider>
-
-    <provider
-        android:name=".connect.AttachmentsContentProvider"
-        android:authorities="${applicationId}.attachments"
-        android:grantUriPermissions="true"
-        android:exported="false">
-    </provider>
-
-    <receiver android:name=".service.BootReceiver">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED"/>
-            <action android:name="org.thoughtcrime.securesms.RESTART"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.DirectoryRefreshListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.RotateSignedPreKeyListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-        <receiver android:name=".service.PersistentConnectionBootListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.DeleteNotificationReceiver">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver
-        android:name=".service.PanicResponderListener"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="info.guardianproject.panic.action.TRIGGER" />
-        </intent-filter>
-    </receiver>
-
-    <uses-library android:name="com.sec.android.app.multiwindow" android:required="false"/>
-    <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
-    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:value="632.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:value="598.0dip" />
-
-</application>
-</manifest>

BUILDING.md

@@ -1,74 +0,0 @@
-Building Signal
-===============
-
-Basics
-------
-
-Signal uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.  However, you needn't install it yourself; the
-"gradle wrapper" `gradlew`, mentioned below, will do that for you.
-
-Building Signal
----------------
-
-The following steps should help you (re)build Signal from the command line.
-
-1. Checkout the Signal-Android project source with the command:
-
-        git clone https://github.com/signalapp/Signal-Android.git
-
-2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
-3. Ensure that the following packages are installed from the Android SDK manager:
-    * Android SDK Build Tools (see buildToolsVersion in build.gradle)
-    * SDK Platform (All API levels)
-    * Android Support Repository
-    * Google Repository
-4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
-
-        sdk.dir=/Application/android-sdk-macosx
-
-5. Using Java 8 
-
-6. Execute Gradle:
-
-        ./gradlew build
-
-Visual assets
-----------------------
-
-Source assets tend to be large binary blobs, which are best stored outside of git repositories. Some source files are SVGs that can be auto-colored and sized using a tool like [android-res-utils](https://github.com/sebkur/android-res-utils).
-
-Sample command for generating our audio placeholder image:
-
-```bash
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #000 --opacity 0.54 --suffix _light
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #fff --opacity 1.00 --suffix _light
-```
-
-Setting up a development environment
-------------------------------------
-
-[Android Studio](https://developer.android.com/sdk/installing/studio.html) is the recommended development environment.
-
-1. Install Android Studio.
-2. Open Android Studio. On a new installation, the Quickstart panel will appear. If you have open projects, close them using "File > Close Project" to see the Quickstart panel.
-3. From the Quickstart panel, choose "Configure" then "SDK Manager".
-4. In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel.
-5. From the Quickstart panel, choose "Checkout from Version Control" then "git".
-6. Paste the URL for the Signal-Android project when prompted (https://github.com/signalapp/Signal-Android.git).
-7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
-9. Default config options should be good enough.
-9. Project initialisation and build should proceed.
-
-Contributing code
------------------
-
-Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).
-
-Mailing list
-------------
-
-Development discussion happens on the whispersystems mailing list.
-[To join](https://lists.riseup.net/www/info/whispersystems)
-Send emails to whispersystems@lists.riseup.net
-

CONTRIBUTING.md

@@ -0,0 +1,153 @@
+# Contributing Guidelines
+
+Thank you for looking for ways to help on Delta Chat Android!
+
+This document tries to outline some conventions that may not be obvious
+and aims to give a good starting point to new contributors.
+
+
+## Reporting Bugs
+
+If you found a bug, [report it on Github](https://github.com/deltachat/deltachat-android/issues).
+
+Project maintainers may transfer bugs that are not UI specific
+(eg. network, database or encryption related)
+to [Delta Chat Core](https://github.com/deltachat/deltachat-core-rust/issues).
+If you assume beforehand, that the bug you've found belongs to Core,
+you can report there directly.
+
+Please search both open and closed issues to make sure your bug report is not a duplicate.
+
+For community interactions around Delta Chat
+please read our [Community Standards](https://delta.chat/community-standards).
+
+
+## Proposing Features
+
+If you have a feature request,
+create a new topic on the [Forum](https://support.delta.chat/c/features/6).
+
+
+## Rough UX Philosophy
+
+Some rough ideas, that may be helpful when thinking about how to enhance things:
+
+- Work hard to avoid options and up-front choices.
+  Thinking about concrete user stories may help on that.
+- Avoid to speak about keys and other hard to understand things in the primary UI.
+- The app shall work offline as well as with bad network.
+- Users do not read (much).
+- Consistency matters.
+- Offer only things that are highly useful to many people in primary UI.
+  If really needed, bury other things eg. in some menus.
+- The app should be for the many, not for the few.
+
+
+## Contributing Code
+
+The [README](./README.md) explains in detail how to set up the build environment.
+Please follow all steps precisely.
+If you run into troubles,
+ask on one of the [communication channels](https://delta.chat/contribute) for help.
+
+To contribute code,
+[open a Pull Request](https://github.com/deltachat/deltachat-android/pulls).
+
+If you have write access to the repository,
+push a branch named `<username>/<feature>`
+so it is clear who is responsible for the branch,
+and open a PR proposing to merge the change.
+Otherwise fork the repository and create a branch in your fork.
+
+Please add a meaningful description to your PR
+so that reviewers get an idea about what the modifications are supposed to do.
+
+A meaningful PR title is helpful for [updating `CHANGELOG.md` on releases](./RELEASE.md)
+(CHANGELOG.md is updated manually
+to only add things that are at least roughly understandable by the end user)
+
+If the changes affect the user interface,
+screenshots are very helpful,
+esp. before/after screenshots.
+
+
+### Coding Conventions
+
+Source files are partly derived from different other open source projects
+and may follow different coding styles and conventions.
+
+If you do a PR fixing a bug or adding a feature,
+please embrace the coding convention you see in the corresponding files,
+so that the result fits well together.
+
+Do not refactor or rename things in the same PR
+to make the diff small and the PR easy to review.
+
+Project language is Java.
+
+By using [Delta Chat Core](https://github.com/deltachat/deltachat-core-rust)
+there is already a strong separation between "UI" and "Model".
+Further separations and abstraction layers are often not helpful
+and only add more complexity.
+
+Try to avoid premature optimisation
+and complexity because it "may be needed in some future".
+Usually, it is not.
+
+Readable code is better than having some Java paradigms fulfilled.
+Classic Java has a strong drive to add lots of classes, factories, one-liner-functions.
+Try to not follow these patterns and keep things really on point and simple.
+If this gets in conflict with embracing existing style, however,
+consistency with existing code is more important.
+
+The "Delta Chat Core" is a high-level interface to what the UI actually needs,
+data should be served in a form that the UI do not need much additional work.
+If this is not the case, consider a feature proposal to "Delta Chat Core".
+
+
+### Merging Conventions
+
+PR are merged usually to the branch `main` from which [releases](./RELEASE.md) are done.
+
+As a default, do a `git rebase main` in case feature branches and `main` differ too much.
+
+Once a PR has an approval, unless stated otherwise, it can be merged by the author.
+A PR may be approved but postponed to be merged eg. because of an ongoing release.
+
+To ensure the correct merge merge strategy, merging left up to the PR author:
+
+- Usually, PR are squash-merged
+  as UI development often results in tiny tweak commits that are not that meaningful on their own.
+- If all commits are meaningful and have a well-written description,
+  they can be rebased-merged.
+
+If you do not have write access to the repository,
+you may leave a note in the PR about the desired merge strategy.
+
+
+## Translations
+
+Translations are done via [Transifex](https://explore.transifex.com/delta-chat/),
+you can log in there with your E-Mail Address or with a Github or Google handle.
+You find two projects there:
+- "Delta Chat App" contains the strings used in the app's UI
+- "Delta Chat Website" contains the offline help from "Settings / Help"
+  as well as the pages used on <https://delta.chat>
+
+Most strings and the whole help are used for all systems
+(Android, iOS, Linux, Windows, macOS)
+and should be formulated accordingly.
+
+If you want to change the english sources,
+do a PR to [`strings.xml`](https://github.com/deltachat/deltachat-android/blob/main/res/values/strings.xml)
+or to [`help.md`](https://github.com/deltachat/deltachat-pages/blob/master/en/help.md).
+Again, please do not mix adding things and refactorings, esp. for `help.md`,
+this would require retranslations and should be considered carefully.
+
+
+## Other Ways To Contribute
+
+For other ways to contribute, refer to the [website](https://delta.chat/contribute).
+
+If you think, something important is missed in this overview,
+please do a PR to this document :)

Dockerfile

@@ -1,25 +1,44 @@
-FROM ubuntu:17.04
+FROM docker.io/debian:12.4
 
-RUN dpkg --add-architecture i386 && \
-    apt-get update -y && \
-    apt-get install -y software-properties-common && \
-    apt-get update -y && \
-    apt-get install -y libc6:i386=2.24-9ubuntu2.2 libncurses5:i386=6.0+20160625-1ubuntu1 libstdc++6:i386=6.3.0-12ubuntu2 lib32z1=1:1.2.11.dfsg-0ubuntu1 wget openjdk-8-jdk=8u131-b11-2ubuntu1.17.04.3 git unzip && \
-    rm -rf /var/lib/apt/lists/* && \
-    apt-get autoremove -y && \
-    apt-get clean
+# Install Android Studio requirements
+# See https://developer.android.com/studio/install#linux
+RUN apt-get update -y \
+&& apt-get install -y --no-install-recommends \
+wget \
+curl \
+unzip \
+openjdk-17-jre \
+file \
+build-essential \
+&& rm -rf /var/lib/apt/lists/*
 
-ENV ANDROID_SDK_FILENAME android-sdk_r24.4.1-linux.tgz
-ENV ANDROID_SDK_URL https://dl.google.com/android/${ANDROID_SDK_FILENAME}
-ENV ANDROID_API_LEVELS android-27
-ENV ANDROID_BUILD_TOOLS_VERSION 27.0.1
-ENV ANDROID_HOME /usr/local/android-sdk-linux
-ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-RUN cd /usr/local/ && \
-    wget -q ${ANDROID_SDK_URL} && \
-    tar -xzf ${ANDROID_SDK_FILENAME} && \
-    rm ${ANDROID_SDK_FILENAME} 
-RUN echo y | android update sdk --no-ui -a --filter ${ANDROID_API_LEVELS}
-RUN echo y | android update sdk --no-ui -a --filter extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository
-RUN echo y | android update sdk --no-ui -a --filter tools,platform-tools,build-tools-${ANDROID_BUILD_TOOLS_VERSION}
-RUN rm -rf ${ANDROID_HOME}/tools && unzip ${ANDROID_HOME}/temp/*.zip -d ${ANDROID_HOME}
+ARG USER=deltachat
+ARG UID=1000
+ARG GID=1000
+
+RUN groupadd -g $GID -o $USER
+RUN useradd -m -u $UID -g $GID -o $USER
+USER $USER
+
+ENV ANDROID_SDK_ROOT /home/${USER}/android-sdk
+RUN mkdir ${ANDROID_SDK_ROOT}
+WORKDIR $ANDROID_SDK_ROOT
+RUN wget -q https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip && \
+  unzip commandlinetools-linux-8512546_latest.zip && \
+  rm commandlinetools-linux-8512546_latest.zip
+
+RUN yes | ${ANDROID_SDK_ROOT}/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses
+
+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 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/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
+ENV PATH ${PATH}:/home/${USER}/.cargo/bin

NOTICE

@@ -1,34 +0,0 @@
-TextSecure provides encrypted text messages for Android.
-Copyright 2011 Whisper Systems
-
-This software has the follow third party dependencies:
-
-Bouncy Castle 1.42
-http://www.bouncycastle.org/
-MIT License
-
-Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-ZXing
-http://code.google.com/p/zxing/
-Apache License 2.0
-
-Copyright 2009 ZXing authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

README.md

@@ -1,82 +1,33 @@
-## Delta Chat Android Client
+## ArcaneChat Android Client
 
-This is the android client for Delta Chat.  For the core library and other common
-information, please refer to [Delta Chat Core Library](https://github.com/deltachat/deltachat-core).
-For ready-to-use binaries, please go to https://delta.chat .
+A [Delta Chat](https://delta.chat/) client for Android. Learn more at: https://arcanechat.me
 
-![Logo](https://delta.chat/assets/features/start-img4.png)
-
-[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="75"/>](https://f-droid.org/packages/com.b44t.messenger)
+[<img src="store/get-it-on-gplay.png" alt="Get it on Google Play" height="48">](https://play.google.com/store/apps/details?id=com.github.arcanechat)
+[<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite)
+[<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)
 
 
-# Build
+<img alt="Screenshot" src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="298" /> <img alt="Screenshot" src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="298" />
 
-When checking out _deltachat-android-ii_, make sure also to check out the
-subproject _deltachat-core_:
+# WebXDC
 
-- When using Git, you can can do this initially by
-  `$ git clone --recursive https://github.com/deltachat/deltachat-android-ii`
-  or later by `git submodule update --init --recursive`. If you do this in your
-  home directory, this results in the folder `~/deltachat-android-ii` which is just fine.
-
-- Alternatively, you can download the [deltachat-android zip-file](https://github.com/deltachat/deltachat-android-ii/archive/master.zip); in this case, also download the [deltachat-core zip-file](https://github.com/deltachat/deltachat-core/archive/master.zip) and place its contents to `jni/messenger-backend` 
-
-Then, call `ndk-build` in the root directory to build the C-part; 
-this also builds deltachat-core.  Afterwards run the project in Android Studio.
-The project requires API 25.
-
-With chance, that's it :) - if not, read on how to setup a proper development
-environment.
-
-
-# Install Development Environment
-
-1. Some libs required by Android Studio may be missing on 64 bit Linux machines 
-   [[Source](https://developer.android.com/studio/install.html)], so for Ubuntu execute  
-   `$ sudo apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 libbz2-1.0:i386`  
-   and for Fedora execute  
-   `$ sudo yum install zlib.i686 ncurses-libs.i686 bzip2-libs.i686`
-  
-2. Download Android Studio from <https://developer.android.com> (android-studio-ide-...-linux.zip)
-   and unpack the archive which contains a single folder called `android-studio`; 
-   move this folder eg. to `~/android-studio` 
-
-3. To launch Android Studio for the first time, open a terminal, navigate to 
-   `~/android-studio/bin`, execute `./studio.sh` and use all standard values
-   from the wizard.
-   
-4. Android Studio now ask you if you want to download an existing project; 
-   choose `~/deltachat-android` as created in the "Build" chapter (Android Studio starts to
-   build the project, however, there are some steps missing before this will
-   succeed).
-   
-5. As Delta Chat uses API 25 for some reasons, click on the corresponding error
-   message and install "Nougat 7.1.1 (API 25)" and the "Build-Tools" (you should
-   also find the option at "Tools / Android / SDK Manager / SDK Platforms").
-   Now the build should succeed - but the app still misses the native part.
-
-6. Download Android NDK Revision 14b from
-   [NDK Archives](https://developer.android.com/ndk/downloads/older_releases)
-   (Newer releases shall not be used currently, they are not compatible,
-   see issues #197, #220, #248) and unzip the archive which contains a single folder
-   called `android-ndk-r...`; move this folder eg. to `~/android-ndk-r...`
-   
-7. Export the folder path to your environment as ANDROID_NDK and add it to PATH.
-   You can archive this eg. by adding the following lines to `.bashrc`  
-   `export ANDROID_NDK=/home/bpetersen/android-ndk-r...`  
-   `export PATH=$PATH:$ANDROID_NDK`
-   
-The last two steps may be omitted by using the new Android Studio NDK options,
-however, thus far, we have not found the time to do so.
+This app has some extended support for WebXDC apps:
 
+- `window.webxdc.arcanechat` a string with the ArcaneChat version and can be used by app developers
+  to detect when they can use the ArcaneChat-specific features.
+- `sendToChat()`: extra property `subject` can be set to a text string to set message/email's subject.
+- `sendToChat()`: extra property `html` can be set to a string of html markup to set the HTML part of the email/message.
+- `sendToChat()`: the file object parameter also accepts a `type` field that can be one of:
+  * `"sticker"`
+  * `"image"`
+  * `"audio"`
+  * `"video"`
+  * `"file"` (default if `type` field is not present)
+- Inside apps, clicking external links is supported, ex. to open in browser, so you can include links to your website or donation pages.
+- `manifest.toml` field: `orientation`, if you set it to `"landscape"` your app will be launched in landscape mode.
 
 # Credits
 
-The user interface classes are based on the Signal messenger.
+This app is based on the [official Delta Chat client](https://github.com/deltachat/deltachat-android) with several improvements.
 
-
-# License
-
-Licensed under the GPLv3, see LICENSE file for details.
-
-Copyright © 2017, 2018 Delta Chat contributors
+This app uses a [modified](https://github.com/ArcaneChat/core) version of the [Chatmail Core Library](https://github.com/chatmail/core).

RELEASE.md

@@ -0,0 +1,150 @@
+# Android Release Checklist
+
+
+## Generate APKs
+
+on the command-line, in a PR called "update-core-and-stuff-DATE":
+
+1. update core:
+   ```
+   ./scripts/update-core.sh               # shows used branch
+   ./scripts/update-core.sh BRANCH_OR_TAG # update to tag or latest commit of branch
+   ./scripts/clean-core.sh                # helps on weird issues, do also "Build / Clean"
+   ./scripts/ndk-make.sh
+   ```
+
+a) Update `CHANGELOG.md`
+      from <https://github.com/chatmail/core/blob/main/CHANGELOG.md>,
+      do not just copy and avoid technical terms.
+      The changelog is for the end user and shall show impacts form that angle.
+      Add used core version to end of changelog entry
+      as `update to core 1.2.3` or `using core 1.2.3`
+
+
+2. update translations and local help:
+   ```
+   ./scripts/tx-pull-translations.sh
+   ./scripts/create-local-help.sh  # requires deltachat-pages checked out at ../deltachat-pages
+   ```
+
+the following steps are done in a PR called `prep-VERSION` (no leading "v"):
+
+3. Update `CHANGELOG.md`:
+   Rename header with version number and add date as `YYYY-MM`
+
+   in case previous entries of the changelog refer to betas or to not officially released versions,
+   the entries can be summarized.
+   this makes it easier for the end user to follow changes by showing major changes atop.
+
+4. add a device message to `ConversationListActivity::onCreate()` or remove the old one.
+   do not repeat the CHANGELOG here: write what really is the ux outcome
+   in a few lines of easy speak without technical terms.
+   if there is time for a translation round, do `./scripts/tx-push-source.sh`
+   **ping tangible translators** and start over at step 2.
+
+5. bump `versionCode` _and_ `versionName` (no leading "v") in `build.gradle`
+
+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`.
+      this APK will go to the stores and is located at `gplay/release`
+
+
+## Push Test Releases
+
+7. a) `./scripts/upload-beta.sh VERSION` uploads both APKs to testrun.org and drafts a message.  
+   b) add things critically to be tested to the message (this is not the changelog nor the device message)  
+   c) post the message to relevant testing channels, **ping testers**  
+   d) make sure, the `prep-VERSION` PR **gets merged**
+
+On serious deteriorations, **ping devs**, make sure they get fixed, and start over at step 1.
+
+
+## Release on get.delta.chat
+
+Take care the APK used here and in the following steps
+are binary-wise the same as pushed to testers and not overwritten by subsequent builds.
+
+8. a) `./scripts/upload-release.sh VERSION`  
+   b) do a PR to bump `VERSION_ANDROID` (without leading `v`) on
+      `https://github.com/deltachat/deltachat-pages/blob/master/_includes/download-boxes.html`  
+   c) make sure, **the PR gets merged**
+      and the correct APK is finally available on get.delta.chat
+
+only afterwards, push the APK to stores. **consider a blog post.**
+
+
+## Release on Play Store
+
+on <https://play.google.com/apps/publish/>:
+
+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 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
+
+10. make sure, everything is pushed, then:  
+    $ git tag v1.2.1 COMMIT; git push --tags
+    
+F-Droid picks on the tags starting with "v" and builds the version.
+This may take some days.
+
+11. a) on <https://github.com/deltachat/deltachat-android/releases>,
+       tap "Draft a new Release", choose just created tag, fill changelog
+	b) add APK from above using "Attach binary".
+	c) tap "Publish release"
+
+
+## Release on Amazon Appstore
+
+on <https://developer.amazon.com/dashboard>:
+
+12. a) click "App List", 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" and "Step 3" pages, hit "Next"
+    e) on "Step 4" page: "Submit app"
+
+
+## Release on Huawei AppGallery
+
+on <https://developer.huawei.com/consumer/en/appgallery>:
+
+13. a) go to "Upload your app / Android / Delta Chat / Update", again "Update" upper right
+    b) "Manage Packages / Upload", upload the APK from above, hit "Save"
+    c) Update "App Information / New Features", hit "Save", then "Next"
+    d) Hit "Submit"; on the next page, confirm version and language
+
+
+## Releases on other stores (ex. Passkoocheh)
+
+These stores are not under our control.
+On important updates **ping store maintainers** and ask to update.
+
+
+## Testing checklist
+
+Only some rough ideas, ideally, this should result into a simple checklist
+that can be checked before releasing.
+However, although it would be nice to test "everything", we should keep in mind
+that the test should be doable in, say, 10~15 minutes.
+- create new account with (one of?): gmail, yandex, other
+  or (?) test an existing account
+- send and receive a message
+- create a group
+- do a contact verification
+- join a group via a qr scan

apkdiff/apkdiff.py

@@ -1,78 +0,0 @@
-#! /usr/bin/env python
-
-import sys
-from zipfile import ZipFile
-
-class ApkDiff:
-
-    IGNORE_FILES = ["META-INF/CERT.RSA", "META-INF/CERT.SF", "META-INF/MANIFEST.MF"]
-
-    def compare(self, sourceApk, destinationApk):
-        sourceZip      = ZipFile(sourceApk, 'r')
-        destinationZip = ZipFile(destinationApk, 'r')
-
-        if self.compareManifests(sourceZip, destinationZip) and self.compareEntries(sourceZip, destinationZip) == True:
-            print "APKs match!"
-        else:
-            print "APKs don't match!"
-
-    def compareManifests(self, sourceZip, destinationZip):
-        sourceEntrySortedList      = sorted(sourceZip.namelist())
-        destinationEntrySortedList = sorted(destinationZip.namelist())
-
-        for ignoreFile in self.IGNORE_FILES:
-            while ignoreFile in sourceEntrySortedList: sourceEntrySortedList.remove(ignoreFile)
-            while ignoreFile in destinationEntrySortedList: destinationEntrySortedList.remove(ignoreFile)
-                    
-        if len(sourceEntrySortedList) != len(destinationEntrySortedList):
-            print "Manifest lengths differ!"
-        
-        for (sourceEntryName, destinationEntryName) in zip(sourceEntrySortedList, destinationEntrySortedList):
-            if sourceEntryName != destinationEntryName:
-                print "Sorted manifests don't match, %s vs %s" % (sourceEntryName, destinationEntryName)   
-                return False
-
-        return True
-            
-    def compareEntries(self, sourceZip, destinationZip):
-        sourceInfoList      = filter(lambda sourceInfo: sourceInfo.filename not in self.IGNORE_FILES, sourceZip.infolist())
-        destinationInfoList = filter(lambda destinationInfo: destinationInfo.filename not in self.IGNORE_FILES, destinationZip.infolist())
-        
-        if len(sourceInfoList) != len(destinationInfoList):
-            print "APK info lists of different length!"
-            return False
-
-        for sourceEntryInfo in sourceInfoList:
-            for destinationEntryInfo in list(destinationInfoList):
-                if sourceEntryInfo.filename == destinationEntryInfo.filename:
-                    sourceEntry      = sourceZip.open(sourceEntryInfo, 'r')
-                    destinationEntry = destinationZip.open(destinationEntryInfo, 'r')
-
-                    if self.compareFiles(sourceEntry, destinationEntry) != True:
-                        print "APK entry %s does not match %s!" % (sourceEntryInfo.filename, destinationEntryInfo.filename)
-                        return False
-
-                    destinationInfoList.remove(destinationEntryInfo)
-                    break
-                
-        return True
-
-    def compareFiles(self, sourceFile, destinationFile):
-        sourceChunk      = sourceFile.read(1024)
-        destinationChunk = destinationFile.read(1024)
-
-        while sourceChunk != "" or destinationChunk != "":
-            if sourceChunk != destinationChunk:
-                return False
-
-            sourceChunk      = sourceFile.read(1024)
-            destinationChunk = destinationFile.read(1024)
-
-        return True
-
-if __name__ == '__main__':
-    if len(sys.argv) != 3:
-        print "Usage: apkdiff <pathToFirstApk> <pathToSecondApk>"
-        sys.exit(1)
-
-    ApkDiff().compare(sys.argv[1], sys.argv[2])

apntool/.gitignore

@@ -1,2 +0,0 @@
-*.db
-*.db.gz

apntool/apntool.py

@@ -1,106 +0,0 @@
-import sys
-import re
-import argparse
-import sqlite3
-import gzip
-from progressbar import ProgressBar, Counter, Timer
-from lxml import etree
-
-parser = argparse.ArgumentParser(prog='apntool', description="""Process Android's apn xml files and drop them into an
-                                                             easily queryable SQLite db. Tested up to version 9 of
-                                                             their APN file.""")
-parser.add_argument('-v', '--version', action='version', version='%(prog)s v1.1')
-parser.add_argument('-i', '--input', help='the xml file to parse', default='apns.xml', required=False)
-parser.add_argument('-o', '--output', help='the sqlite db output file', default='apns.db', required=False)
-parser.add_argument('--quiet', help='do not show progress or verbose instructions', action='store_true', required=False)
-parser.add_argument('--no-gzip', help="do not gzip after creation", action='store_true', required=False)
-args = parser.parse_args()
-
-
-def normalized(target):
-    o2_typo = re.compile(r"02\.co\.uk")
-    port_typo = re.compile(r"(\d+\.\d+\.\d+\.\d+)\.(\d+)")
-    leading_zeros = re.compile(r"(/|\.|^)0+(\d+)")
-    subbed = o2_typo.sub(r'o2.co.uk', target)
-    subbed = port_typo.sub(r'\1:\2', subbed)
-    subbed = leading_zeros.sub(r'\1\2', subbed)
-    return subbed
-
-try:
-    connection = sqlite3.connect(args.output)
-    cursor = connection.cursor()
-    cursor.execute('SELECT SQLITE_VERSION()')
-    version = cursor.fetchone()
-    if not args.quiet:
-        print("SQLite version: %s" % version)
-        print("Opening %s" % args.input)
-
-    cursor.execute("PRAGMA legacy_file_format=ON")
-    cursor.execute("PRAGMA journal_mode=DELETE")
-    cursor.execute("PRAGMA page_size=32768")
-    cursor.execute("VACUUM")
-    cursor.execute("DROP TABLE IF EXISTS apns")
-    cursor.execute("""CREATE TABLE apns(_id INTEGER PRIMARY KEY, mccmnc TEXT, mcc TEXT, mnc TEXT, carrier TEXT,
-                apn TEXT, mmsc TEXT, port INTEGER, type TEXT, protocol TEXT, bearer TEXT, roaming_protocol TEXT,
-                carrier_enabled INTEGER, mmsproxy TEXT, mmsport INTEGER, proxy TEXT,  mvno_match_data TEXT,
-                mvno_type TEXT, authtype INTEGER, user TEXT, password TEXT, server TEXT)""")
-
-    apns = etree.parse(args.input)
-    root = apns.getroot()
-    pbar = None
-    if not args.quiet:
-        pbar = ProgressBar(widgets=['Processed: ', Counter(), ' apns (', Timer(), ')'], maxval=len(list(root))).start()
-
-    count = 0
-    for apn in root.iter("apn"):
-        if apn.get("mmsc") is None:
-            continue
-        sqlvars = ["?" for x in apn.attrib.keys()] + ["?"]
-        mccmnc = "%s%s" % (apn.get("mcc"), apn.get("mnc"))
-        normalized_mmsc = normalized(apn.get("mmsc"))
-        if normalized_mmsc != apn.get("mmsc"):
-            print("normalize MMSC: %s => %s" % (apn.get("mmsc"), normalized_mmsc))
-            apn.set("mmsc", normalized_mmsc)
-
-        if not apn.get("mmsproxy") is None:
-            normalized_mmsproxy = normalized(apn.get("mmsproxy"))
-            if normalized_mmsproxy != apn.get("mmsproxy"):
-                print("normalize proxy: %s => %s" % (apn.get("mmsproxy"), normalized_mmsproxy))
-                apn.set("mmsproxy", normalized_mmsproxy)
-
-        values = [apn.get(attrib) for attrib in apn.attrib.keys()] + [mccmnc]
-        keys = apn.attrib.keys() + ["mccmnc"]
-
-        cursor.execute("SELECT 1 FROM apns WHERE mccmnc = ? AND apn = ?", [mccmnc, apn.get("apn")])
-        if cursor.fetchone() is None:
-            statement = "INSERT INTO apns (%s) VALUES (%s)" % (", ".join(keys), ", ".join(sqlvars))
-            cursor.execute(statement, values)
-
-        count += 1
-        if not args.quiet:
-            pbar.update(count)
-
-    if not args.quiet:
-        pbar.finish()
-    connection.commit()
-    print("Successfully written to %s" % args.output)
-
-    if not args.no_gzip:
-        gzipped_file = "%s.gz" % (args.output,)
-        with open(args.output, 'rb') as orig:
-            with gzip.open(gzipped_file, 'wb') as gzipped:
-                gzipped.writelines(orig)
-        print("Successfully gzipped to %s" % gzipped_file)
-
-    if not args.quiet:
-        print("\nTo include this in the distribution, copy it to the project's assets/databases/ directory.")
-        print("If you support API 10 or lower, you must use the gzipped version to avoid corruption.")
-
-except sqlite3.Error, e:
-    if connection:
-        connection.rollback()
-    print("Error: %s" % e.args[0])
-    sys.exit(1)
-finally:
-    if connection:
-        connection.close()

apntool/requirements.txt

@@ -1,3 +0,0 @@
-argparse>=1.2.1
-lxml>=3.3.3
-progressbar-latest>=2.4