destroy-gcm-support.patch 2.01 KB
Newer Older
1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
2
index 6ae85a346..3bbcf44db 100644
3 4
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
5
@@ -473,11 +473,11 @@
6
 
7
     <service android:name=".service.GenericForegroundService"/>
8
 
9 10 11 12 13 14 15 16 17 18 19 20 21
-    <service android:name=".gcm.FcmService">
-        <intent-filter>
-            <action android:name="com.google.firebase.MESSAGING_EVENT" />
-        </intent-filter>
-    </service>
+    <!--<service android:name=".gcm.FcmService">-->
+        <!--<intent-filter>-->
+            <!--<action android:name="com.google.firebase.MESSAGING_EVENT" />-->
+        <!--</intent-filter>-->
+    <!--</service>-->
 
     <receiver android:name=".service.SmsListener"
               android:permission="android.permission.BROADCAST_SMS"
CapsLock's avatar
CapsLock committed
22
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
CapsLock's avatar
CapsLock committed
23
index d951fb8b6..42855cf58 100644
CapsLock's avatar
CapsLock committed
24 25
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
CapsLock's avatar
CapsLock committed
26
@@ -460,18 +460,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements Verif
27
       return;
CapsLock's avatar
CapsLock committed
28
     }
29 30
 
-    PlayServicesStatus gcmStatus = PlayServicesUtil.getPlayServicesStatus(this);
CapsLock's avatar
CapsLock committed
31
-
32 33 34
-    if (gcmStatus == PlayServicesStatus.SUCCESS) {
-      handleRequestVerification(e164number, true);
-    } else if (gcmStatus == PlayServicesStatus.MISSING) {
CapsLock's avatar
CapsLock committed
35
-      handlePromptForNoPlayServices(e164number);
36 37 38 39 40 41
-    } 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));
-    }
CapsLock's avatar
CapsLock committed
42 43
+    handlePromptForNoPlayServices(e164number);
   }
44
 
CapsLock's avatar
CapsLock committed
45
   private void handleRequestVerification(@NonNull String e164number, boolean gcmSupported) {