destroy-gcm-support.patch 2.67 KB
Newer Older
1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
CapsLock's avatar
CapsLock committed
2
index 7478ebc6..8b0d55ae 100644
3 4
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
CapsLock's avatar
CapsLock committed
5
@@ -88,9 +88,9 @@
6
     <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
7
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
8
 
9
-    <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
10 11 12 13 14
+    <!--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
     <application android:name=".ApplicationContext"
CapsLock's avatar
CapsLock committed
16
                  android:icon="@mipmap/ic_launcher"
CapsLock's avatar
CapsLock committed
17
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
18
index 282714f..08ed168 100644
CapsLock's avatar
CapsLock committed
19 20
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
21 22
@@ -308,18 +308,19 @@ public class RegistrationActivity extends BaseActionBarActivity implements Verif
       return;
CapsLock's avatar
CapsLock committed
23
     }
24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
 
-    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);
-    } 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));
+    //}
   }
 
   @SuppressLint("StaticFieldLeak")