Commit b40be375 authored by CapsLock's avatar CapsLock

Merge branch 'v4.32.8' into 'master'

V4.32.8

See merge request !15
parents f7166fc5 6b9a3157
Pipeline #169 passed with stage
in 27 minutes and 26 seconds
image: "debian:latest"
variables:
signal_version: "v4.32.8"
stages:
- build
patch_and_build_signal:
......@@ -10,21 +12,20 @@ patch_and_build_signal:
- "wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" # download android sdk
- "echo '92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 sdk-tools-linux-4333796.zip' |sha256sum -c"
- "unzip sdk-tools-linux-4333796.zip -d /sdk-tools-linux" # unzip android sdk
- "/sdk-tools-linux/tools/bin/sdkmanager --update"
- "export JAVA_OPTS=\"-Xmx3096M\""
- "export GRADLE_OPTS=\"-Dorg.gradle.jvmargs=-Xmx4608M\""
- "export ANDROID_HOME=\"/sdk-tools-linux\"" # set ANDROID_HOME env var
- "mkdir -p $ANDROID_HOME/licenses/"
# sdkmanager --list
# sdkmanager --install "build-tools;27.0.3" ...
# hashes are available at ~/Android/Sdk/licenses/android-sdk-license
- "echo $ANDROID_HOME"
- "mkdir -p $ANDROID_HOME/licenses"
- "echo d56f5187479451eabf01fb78af6dfcb131a6481e > $ANDROID_HOME/licenses/android-sdk-license"
- "echo 8933bad161af4178b1185d1a37fbf41ea5269c55 >> $ANDROID_HOME/licenses/android-sdk-license"
- "yes | /sdk-tools-linux/tools/bin/sdkmanager --licenses || true" # to accept licenses
- "yes | sdkmanager 'build-tools;27.0.3' 'platforms;android-28' 'platform-tools'||true"
- "git clone https://github.com/WhisperSystems/Signal-Android.git && cd Signal-Android && git checkout v4.31.6" # get signal sources
- "yes | /sdk-tools-linux/tools/bin/sdkmanager 'build-tools;27.0.3' 'platforms;android-28' 'platform-tools' > /dev/null ||true"
- "git clone https://github.com/WhisperSystems/Signal-Android.git && cd Signal-Android && git checkout $signal_version" # 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 7478ebc6..8b0d55ae 100644
index 937986b06..ce403d6bc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -88,9 +88,9 @@
@@ -87,9 +87,9 @@
<uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
- <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
+ <!--permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
+ <!--<permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
android:protectionLevel="signature" />
- <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
+ <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" /-->
......@@ -15,36 +15,26 @@ index 7478ebc6..8b0d55ae 100644
<application android:name=".ApplicationContext"
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
index 7dae4c66f..c8365cd9f 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -308,18 +308,19 @@ public class RegistrationActivity extends BaseActionBarActivity implements Verif
@@ -461,18 +461,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements Verif
return;
}
- PlayServicesStatus gcmStatus = PlayServicesUtil.getPlayServicesStatus(this);
+ //PlayServicesStatus gcmStatus = PlayServicesUtil.getPlayServicesStatus(this);
-
- if (gcmStatus == PlayServicesStatus.SUCCESS) {
- handleRequestVerification(e164number, true);
- } else if (gcmStatus == PlayServicesStatus.MISSING) {
+ //if (gcmStatus == PlayServicesStatus.SUCCESS) {
+ // handleRequestVerification(e164number, true);
+ //} else if (gcmStatus == PlayServicesStatus.MISSING) {
handlePromptForNoPlayServices(e164number);
- handlePromptForNoPlayServices(e164number);
- } else if (gcmStatus == PlayServicesStatus.NEEDS_UPDATE) {
- GoogleApiAvailability.getInstance().getErrorDialog(this, ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0).show();
- } else {
- Dialogs.showAlertDialog(this, getString(R.string.RegistrationActivity_play_services_error),
- getString(R.string.RegistrationActivity_google_play_services_is_updating_or_unavailable));
- }
+ //}
+ //else if (gcmStatus == PlayServicesStatus.NEEDS_UPDATE) {
+ // GoogleApiAvailability.getInstance().getErrorDialog(this, ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0).show();
+ //} else {
+ // Dialogs.showAlertDialog(this, getString(R.string.RegistrationActivity_play_services_error),
+ // getString(R.string.RegistrationActivity_google_play_services_is_updating_or_unavailable));
+ //}
+ handlePromptForNoPlayServices(e164number);
}
@SuppressLint("StaticFieldLeak")
private void handleRequestVerification(@NonNull String e164number, boolean gcmSupported) {
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