Commit 4794d8e0 authored by CapsLock's avatar CapsLock

Merge branch 'v4.21.6' into 'master'

V4.21.6

See merge request !3
parents d8e6525e 5a4f5338
Pipeline #109 canceled with stage
in 9 minutes and 57 seconds
......@@ -14,7 +14,7 @@ patch_and_build_signal:
- "export JAVA_OPTS=\"-Xmx3096M\""
- "export GRADLE_OPTS=\"-Dorg.gradle.jvmargs=-Xmx4608M\""
- "export ANDROID_HOME=\"/sdk-tools-linux\"" # set ANDROID_HOME env var
- "git clone https://github.com/WhisperSystems/Signal-Android.git && cd Signal-Android && git checkout v4.20.2" # get signal sources
- "git clone https://github.com/WhisperSystems/Signal-Android.git && cd Signal-Android && git checkout v4.21.6" # get signal sources
- "for f in res/values*/strings.xml; do sed -i 's/<string.*name=\"app_name\".*>.*<\\/string>/<string name=\"app_name\">Langis<\\/string>/g' \"$f\"; done" # app rename
- "./gradlew clean" # cleanup
- "git apply $CI_PROJECT_DIR/destroy-gcm-support.patch" # apply our patch
......
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e7aac6f..436312d 100644
index 7478ebc6..8b0d55ae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -87,9 +87,9 @@
@@ -88,9 +88,9 @@
<uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
......@@ -13,7 +13,7 @@ index e7aac6f..436312d 100644
+ <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" /-->
<application android:name=".ApplicationContext"
android:icon="@drawable/icon"
android:icon="@mipmap/ic_launcher"
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index 282714f..08ed168 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment