add allow to enable location streaming again, remove dead code

improve mailto Intent handling in ShareActivity

.github/workflows/release.yml

@@ -0,0 +1,65 @@
+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@v2
+        with:
+          submodules: recursive
+      - uses: Swatinem/rust-cache@v1
+        with:
+          working-directory: jni/deltachat-core-rust
+      - uses: actions/setup-java@v1.4.3
+        with:
+          java-version: 11
+      - uses: android-actions/setup-android@v2
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r23c
+
+      - 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.SIGNING_KEY }} | base64 -d >> ~/app.keystore
+          echo "DC_RELEASE_STORE_FILE=$HOME/app.keystore" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }}" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_KEY_ALIAS=${{ secrets.ALIAS }}" >> ~/.gradle/gradle.properties
+          echo "DC_RELEASE_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> ~/.gradle/gradle.properties
+          ./gradlew --no-daemon assembleFossRelease
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          token: "${{ secrets.GITHUB_TOKEN }}"
+          body: "WARNING: DeltaChat Lite is not DeltaLab! it is a lightweight version of Delta Chat"
+          prerelease: ${{ contains(github.event.ref, '-beta') }}
+          fail_on_unmatched_files: true
+          files: build/outputs/apk/foss/release/*.apk

.gitmodules

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

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application' version '8.1.4'
-    id 'com.google.gms.google-services' version '4.4.1'
+//    id 'com.google.gms.google-services' version '4.4.1'
 }
 
 repositories {
@@ -45,10 +45,6 @@ android {
 
         buildConfigField "boolean", "DEV_BUILD", "false"
 
-        ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "TEST_ADDR", buildConfigProperty("TEST_ADDR"))
@@ -89,11 +85,8 @@ android {
     }
 
     buildTypes {
-        debug {
-            minifyEnabled false
-            applicationIdSuffix ".beta"
-        }
         release {
+	        applicationIdSuffix ".lite2"
             // minification and proguard disabled for now.
             //
             // when enabled, it can cut down apk size about 6%,
@@ -103,8 +96,13 @@ android {
             //
             // nb: it is highly recommended to use the same settings in debug+release -
             // otherwise problems might be noticed delayed only
-            minifyEnabled false
-            signingConfig signingConfigs.release
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+                          'proguard-rules.pro'
+
+	    if(project.hasProperty("DC_RELEASE_STORE_FILE")) {
+                signingConfig signingConfigs.release
+	    }
         }
     }
 
@@ -116,16 +114,32 @@ android {
         gplay {
             dimension "none"
             applicationId "chat.delta"
-            apply plugin: "com.google.gms.google-services"
+            //apply plugin: "com.google.gms.google-services"
             buildConfigField "boolean", "USE_PLAY_SERVICES", "true"
         }
     }
 
+    splits {
+        abi {
+            enable true
+            reset()
+            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            universalApk true
+        }
+    }
+
+    project.ext.versionCodes = ['armeabi': 1, 'armeabi-v7a': 2, 'arm64-v8a': 3, 'mips': 5, 'mips64': 6, 'x86': 8, 'x86_64': 9]
+
     android.applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = outputFileName
-                .replace("deltachat-android", "deltachat")
+        variant.outputs.all { output ->
+            output.outputFileName = output.outputFileName
+                .replace("deltalab-android", "deltachat-lite")
+		.replace("-gplay", "")
+		.replace("-release", "")
                 .replace(".apk", "-${variant.versionName}.apk")
+            output.versionCodeOverride =
+                project.ext.versionCodes.get(output.getFilter(
+                    com.android.build.OutputFile.ABI), 0) * 10000000 + android.defaultConfig.versionCode
         }
     }
 
@@ -181,7 +195,7 @@ dependencies {
     implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles
     implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity.
     implementation 'com.soundcloud.android:android-crop:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19
-    implementation 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera.
+    //implementation 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera.
     implementation 'mobi.upod:time-duration-picker:1.1.3' // Used to pick the time for inactivity.
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'  // number of unread messages,
     // the one-letter circle for the contacts (when there is not avatar) and a white background.
@@ -197,11 +211,11 @@ dependencies {
     // <https://github.com/cketti/SafeContentResolver>
     implementation 'de.cketti.safecontentresolver:safe-content-resolver-v14:1.0.0'
 
-    gplayImplementation('com.google.firebase:firebase-messaging:23.4.1') { // for PUSH notifications
-        exclude group: 'com.google.firebase', module: 'firebase-core'
-        exclude group: 'com.google.firebase', module: 'firebase-analytics'
-        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
-    }
+//    gplayImplementation('com.google.firebase:firebase-messaging:23.4.1') { // for PUSH notifications
+//        exclude group: 'com.google.firebase', module: 'firebase-core'
+//        exclude group: 'com.google.firebase', module: 'firebase-analytics'
+//        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
+//    }
 
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.assertj:assertj-core:1.7.1'

proguard-rules.pro

@@ -0,0 +1,9 @@
+# native methods
+-keep class com.b44t.messenger.** { *; }
+-keep class org.thoughtcrime.securesms.util.FileUtils* { *; }
+
+# bug with video recoder
+-keep class com.coremedia.iso.** { *; }
+
+# unused SealedData constructor needed by JsonUtils
+-keep class org.thoughtcrime.securesms.crypto.KeyStoreHelper* { *; }