Don't try to unregister for GCM if Play Services doesn't exist

Fixes #6314 // FREEBIE
9 years ago · cb6e048070
parent 9b8719e2d5
commit cb6e048070
1 changed files with 3 additions and 1 deletions
--- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@ -234,7 +234,9 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
            Log.w(TAG, e);
          }

-          GoogleCloudMessaging.getInstance(context).unregister();
+          if (!TextSecurePreferences.isGcmDisabled(context)) {
+            GoogleCloudMessaging.getInstance(context).unregister();
+          }

          return SUCCESS;
        } catch (IOException ioe) {