Commit 2d395e1c authored by CapsLock's avatar CapsLock

Update destroy-gcm-support.patch

parent 21086799
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 796b4ef6..05f58b14 100644
index e7aac6f..436312d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -90,8 +90,8 @@
<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
@@ -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"
- android:protectionLevel="signature" />
+<!-- <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
+ android:protectionLevel="signature" />-->
<uses-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" /-->
<application android:name=".ApplicationContext"
android:icon="@drawable/icon"
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index b30bafee..3cbd777f 100644
index 282714f..08ed168 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -210,16 +210,16 @@ public class RegistrationActivity extends BaseActionBarActivity {
PlayServicesStatus gcmStatus = checkPlayServices(self);
- if (gcmStatus == PlayServicesStatus.SUCCESS) {
- promptForRegistrationStart(self, e164number, true);
- } else if (gcmStatus == PlayServicesStatus.MISSING) {
+ //if (gcmStatus == PlayServicesStatus.SUCCESS) {
+ // promptForRegistrationStart(self, e164number, true);
+ //} else if (gcmStatus == PlayServicesStatus.MISSING) {
promptForNoPlayServices(self, e164number);
- } else if (gcmStatus == PlayServicesStatus.NEEDS_UPDATE) {
- GoogleApiAvailability.getInstance().getErrorDialog(self, ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0).show();
- } else {
- Dialogs.showAlertDialog(self, 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(self, ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0).show();
+ //} else {
+ // Dialogs.showAlertDialog(self, getString(R.string.RegistrationActivity_play_services_error),
+ // getString(R.string.RegistrationActivity_google_play_services_is_updating_or_unavailable));
+ //}
@@ -308,18 +308,19 @@ public class RegistrationActivity extends BaseActionBarActivity implements Verif
return;
}
private void promptForRegistrationStart(final Context context, final String e164number, final boolean gcmSupported) {
- 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")
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