GCM: fix display of uninstalled apps, do not allow registration if GCM is disabled (it won't succeed anyway)

play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java

@@ -22,6 +22,7 @@ import android.app.IntentService;
 import android.content.Intent;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.preference.PreferenceManager;
 import android.support.v4.content.WakefulBroadcastReceiver;
 import android.util.Log;
 
@@ -53,6 +54,7 @@ public class CheckinService extends IntentService {
     @Override
     protected void onHandleIntent(Intent intent) {
         try {
+            if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(TriggerReceiver.PREF_ENABLE_CHECKIN, false)) {
                 LastCheckinInfo info = CheckinManager.checkin(this, intent.getBooleanExtra(EXTRA_FORCE_CHECKIN, false));
                 if (info != null) {
                     Log.d(TAG, "Checked in as " + Long.toHexString(info.androidId));
@@ -65,6 +67,7 @@ public class CheckinService extends IntentService {
                         startService((Intent) intent.getParcelableExtra(EXTRA_CALLBACK_INTENT));
                     }
                 }
+            }
         } catch (Exception e) {
             Log.w(TAG, e);
         } finally {

play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java

@@ -26,7 +26,7 @@ import android.util.Log;
 
 public class TriggerReceiver extends WakefulBroadcastReceiver {
     private static final String TAG = "GmsCheckinTrigger";
-    private static final String PREF_ENABLE_CHECKIN = "checkin_enable_service";
+    public static final String PREF_ENABLE_CHECKIN = "checkin_enable_service";
     private static final long REGULAR_CHECKIN_INTERVAL = 12 * 60 * 60 * 1000; // 12 hours
 
     @Override

play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java

@@ -99,6 +99,7 @@ public class PackageUtils {
 
     @SuppressWarnings("deprecation")
     public static String packageFromPendingIntent(PendingIntent pi) {
+        if (pi == null) return null;
         if (SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
             return pi.getTargetPackage();
         } else {

play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterService.java

@@ -101,6 +101,7 @@ public class PushRegisterService extends IntentService {
     protected void onHandleIntent(Intent intent) {
         Log.d(TAG, "onHandleIntent: " + intent);
         Log.d(TAG, "onHandleIntent: " + intent.getExtras());
+        if (GcmPrefs.get(this).isGcmEnabled()) {
             if (LastCheckinInfo.read(this).lastCheckin > 0) {
                 try {
                     if (ACTION_C2DM_UNREGISTER.equals(intent.getAction()) ||
@@ -120,6 +121,10 @@ public class PushRegisterService extends IntentService {
                 subIntent.putExtra(CheckinService.EXTRA_CALLBACK_INTENT, intent);
                 startService(subIntent);
             }
+        } else {
+            // GCM is disabled, deny registration
+            replyNotAvailable(this, intent);
+        }
     }
 
     private void register(final Intent intent) {
@@ -146,7 +151,19 @@ public class PushRegisterService extends IntentService {
         }
     }
 
+    public static void replyNotAvailable(Context context, Intent intent) {
+        replyNotAvailable(context, intent, null);
+    }
+
     public static void replyNotAvailable(Context context, Intent intent, String packageName) {
+        if (packageName == null) {
+            PendingIntent pendingIntent = intent.getParcelableExtra(EXTRA_APP);
+            packageName = PackageUtils.packageFromPendingIntent(pendingIntent);
+        }
+        if (packageName == null) {
+            // skip reply
+            return;
+        }
         Intent outIntent = new Intent(ACTION_C2DM_REGISTRATION);
         outIntent.putExtra(EXTRA_ERROR, ERROR_SERVICE_NOT_AVAILABLE);
         Log.d(TAG, "registration not allowed");

play-services-core/src/main/java/org/microg/gms/ui/GcmAppFragment.java

@@ -7,6 +7,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.annotation.StringRes;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
@@ -123,34 +124,7 @@ public class GcmAppFragment extends ResourceSettingsFragment {
                     if (!(boolean) newValue) {
                         final List<GcmDatabase.Registration> registrations = database.getRegistrationsByApp(packageName);
                         if (!registrations.isEmpty()) {
-                            new AlertDialog.Builder(getContext())
+                            showUnregisterConfirm(registrations, getString(R.string.gcm_unregister_after_deny_message));
-                                    .setTitle(String.format(getString(R.string.gcm_unregister_confirm_title), appName))
-                                    .setMessage(R.string.gcm_unregister_after_deny_message)
-                                    .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            new Thread(new Runnable() {
-                                                @Override
-                                                public void run() {
-                                                    for (GcmDatabase.Registration registration : registrations) {
-                                                        PushRegisterService.unregister(getContext(), registration.packageName, registration.signature, null, null);
-                                                    }
-                                                    getActivity().runOnUiThread(new Runnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            updateAppDetails();
-                                                        }
-                                                    });
-                                                }
-                                            }).start();
-                                        }
-                                    })
-                                    .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            // Do nothing
-                                        }
-                                    }).show();
                         }
                     }
                     database.setAppAllowRegister(packageName, (Boolean) newValue);
@@ -182,9 +156,28 @@ public class GcmAppFragment extends ResourceSettingsFragment {
             registerDetails.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
+                    showUnregisterConfirm(registrations, getString(R.string.gcm_unregister_confirm_message));
+                    return true;
+                }
+            });
+        }
+
+        Preference messageDetails = root.findPreference(PREF_MESSAGE_DETAILS);
+        if (app.totalMessageCount == 0) {
+            messageDetails.setSummary(R.string.gcm_no_message_yet);
+        } else {
+            String s = getString(R.string.gcm_messages_counter, app.totalMessageCount, app.totalMessageBytes);
+            if (app.lastMessageTimestamp != 0) {
+                s += "\n" + getString(R.string.gcm_last_message_at, DateUtils.getRelativeDateTimeString(getContext(), app.lastMessageTimestamp, MINUTE_IN_MILLIS, WEEK_IN_MILLIS, FORMAT_SHOW_TIME));
+            }
+            messageDetails.setSummary(s);
+        }
+    }
+
+    private void showUnregisterConfirm(final List<GcmDatabase.Registration> registrations, String unregisterConfirmDesc) {
         new AlertDialog.Builder(getContext())
-                            .setTitle(String.format(getString(R.string.gcm_unregister_confirm_title), appName))
+                .setTitle(getString(R.string.gcm_unregister_confirm_title, appName))
-                            .setMessage(R.string.gcm_unregister_confirm_message)
+                .setMessage(unregisterConfirmDesc)
                 .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -210,21 +203,6 @@ public class GcmAppFragment extends ResourceSettingsFragment {
                         // Do nothing
                     }
                 }).show();
-                    return true;
-                }
-            });
-        }
-
-        Preference messageDetails = root.findPreference(PREF_MESSAGE_DETAILS);
-        if (app.totalMessageCount == 0) {
-            messageDetails.setSummary(R.string.gcm_no_message_yet);
-        } else {
-            String s = getString(R.string.gcm_messages_counter, app.totalMessageCount, app.totalMessageBytes);
-            if (app.lastMessageTimestamp != 0) {
-                s += "\n" + getString(R.string.gcm_last_message_at, DateUtils.getRelativeDateTimeString(getContext(), app.lastMessageTimestamp, MINUTE_IN_MILLIS, WEEK_IN_MILLIS, FORMAT_SHOW_TIME));
-            }
-            messageDetails.setSummary(s);
-        }
     }
 
     public static class AsActivity extends AbstractSettingsActivity {

play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java

@@ -213,6 +213,7 @@ public class GcmFragment extends ResourceSettingsFragment implements SwitchBar.O
                 setIcon(packageManager.getApplicationIcon(applicationInfo));
             } catch (PackageManager.NameNotFoundException e) {
                 setTitle(app.packageName);
+                setIcon(android.R.drawable.sym_def_app_icon);
             }
             setOnPreferenceClickListener(this);
             updateViewDetails();