Commit 81bcb2ab authored by CapsLock's avatar CapsLock

Update destroy-gcm-support.patch

parent af3b5a72
Pipeline #418 passed with stage
in 18 minutes and 24 seconds
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ae8952a55..cce9e2b9b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -503,12 +503,6 @@
<service android:name=".service.GenericForegroundService"/>
......@@ -15,10 +15,10 @@ index ae8952a55..cce9e2b9b 100644
<receiver android:name=".service.SmsListener"
android:permission="android.permission.BROADCAST_SMS"
android:enabled="true"
diff --git a/src/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java b/src/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
index c0b2521b0..33e09621e 100644
--- a/src/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
+++ b/src/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
@@ -144,18 +144,7 @@ public final class EnterPhoneNumberFragment extends BaseRegistrationFragment {
return;
}
......@@ -39,10 +39,10 @@ index c0b2521b0..33e09621e 100644
}
private void handleRequestVerification(@NonNull Context context, @NonNull String e164number, boolean fcmSupported) {
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 9c2c69044..72aa2326c 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
--- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -427,11 +427,10 @@ public class TextSecurePreferences {
}
......@@ -56,4 +56,4 @@ index 9c2c69044..72aa2326c 100644
}
public static boolean isWebrtcCallingEnabled(Context context) {
\ No newline at end of file
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