1 files changed, 9 insertions, 77 deletions

diff --git a/src/com/android/mms/transaction/SimFullReceiver.java b/src/com/android/mms/transaction/SimFullReceiver.java
index ac46e4da..59ae6e41 100644
--- a/src/com/android/mms/transaction/SimFullReceiver.java
+++ b/src/com/android/mms/transaction/SimFullReceiver.java
@@ -25,109 +25,41 @@ import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
 import android.provider.Telephony;
-import android.telephony.SubscriptionManager;
-import android.util.Log;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.R;
 import com.android.mms.ui.ManageSimMessages;
-import com.android.mms.ui.MessagingPreferenceActivity;
-import com.android.mms.ui.SubSelectActivity;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
 
 /**
  * Receive Intent.SIM_FULL_ACTION.  Handle notification that SIM is full.
  */
 public class SimFullReceiver extends BroadcastReceiver {
 
-    private static final String TAG = "SimFullReceiver";
-    // After user view SIM messages of one SIM card, APP should remove this SIM
-    // from SIM-FULL notification
-    public static final String SIM_FULL_VIEWED_ACTION = "com.android.mms.ui.SIM_FULL_VIEWED";
-    // Store SMS full SIM cards in a Set
-    private static TreeSet<Integer> sFullSubIdSet = null;
-
     @Override
     public void onReceive(Context context, Intent intent) {
         if (Settings.Global.getInt(context.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 0) == 1) {
+            Settings.Global.DEVICE_PROVISIONED, 0) == 1 &&
+            Telephony.Sms.Intents.SIM_FULL_ACTION.equals(intent.getAction())) {
 
             NotificationManager nm = (NotificationManager)
                 context.getSystemService(Context.NOTIFICATION_SERVICE);
-            String action = intent.getAction();
-            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                    SubscriptionManager.INVALID_SUB_ID);
-            if (!SubscriptionManager.isValidSubId(subId)) {
-                Log.e(TAG, "subId is invalid");
-                return;
-            }
-            if (sFullSubIdSet == null) {
-                sFullSubIdSet = new TreeSet<Integer>();
-            }
-            // prepare full Subs list to refresh SIM full notification
-            if (Telephony.Sms.Intents.SIM_FULL_ACTION.equals(action)) {
-                // Receive a new SIM full intent, need store it into list
-                sFullSubIdSet.add(subId);
-            } else if (SIM_FULL_VIEWED_ACTION.equals(action)) {
-                // Already viewed by user, need remove it from list
-                sFullSubIdSet.remove(subId);
-            }
 
-            PendingIntent pendingIntent = null;
-            nm.cancel(ManageSimMessages.SIM_FULL_NOTIFICATION_ID);
-            if (sFullSubIdSet.size() == 0) {
-                // All full subs are viewed by user, no need create notification
-                return;
-            } else if (sFullSubIdSet.size() == 1) {
-                // Only 1 full sub need view. Directly view it in
-                // ManageSimMessages
-                Intent viewSimIntent = new Intent(context, ManageSimMessages.class);
-                viewSimIntent.setAction(Intent.ACTION_VIEW);
-                viewSimIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                viewSimIntent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, sFullSubIdSet.first());
-                pendingIntent = PendingIntent.getActivity(context, 0, viewSimIntent, 0);
-            } else {
-                // More than 1 full subs need view. Need select sub after
-                // click the notification
-                Intent selectSubIntent = new Intent(context, SubSelectActivity.class);
-                selectSubIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                selectSubIntent.putExtra(MessagingPreferenceActivity.PREFERENCE_KEY,
-                        MessagingPreferenceActivity.MANAGE_SIM_MESSAGE_MODE);
-                selectSubIntent.putExtra(MessagingPreferenceActivity.PREFERENCE_TITLE_ID,
-                        R.string.pref_summary_manage_sim_messages);
-                int[] fullSubArray = getIntArrayFromSet(sFullSubIdSet);
-                selectSubIntent.putExtra(SubSelectActivity.EXTRA_APPOINTED_SUBS,
-                        fullSubArray);
-                pendingIntent = PendingIntent.getActivity(context, 0, selectSubIntent,
-                        PendingIntent.FLAG_UPDATE_CURRENT);
-            }
+            Intent viewSimIntent = new Intent(context, ManageSimMessages.class);
+            viewSimIntent.setAction(Intent.ACTION_VIEW);
+            viewSimIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            PendingIntent pendingIntent = PendingIntent.getActivity(
+                    context, 0, viewSimIntent, 0);
 
             Notification notification = new Notification();
             notification.icon = R.drawable.stat_sys_no_sim;
             notification.tickerText = context.getString(R.string.sim_full_title);
-            if (Telephony.Sms.Intents.SIM_FULL_ACTION.equals(action)) {
-                notification.defaults = Notification.DEFAULT_ALL;
-            }
+            notification.defaults = Notification.DEFAULT_ALL;
 
             notification.setLatestEventInfo(
                     context, context.getString(R.string.sim_full_title),
                     context.getString(R.string.sim_full_body),
                     pendingIntent);
             nm.notify(ManageSimMessages.SIM_FULL_NOTIFICATION_ID, notification);
-        }
+       }
     }
 
-    private int[] getIntArrayFromSet(Set<Integer> set) {
-        int size = set.size();
-        int[] result = new int[size];
-        Iterator<Integer> interator = set.iterator();
-        for (int i = 0; i < size; i++) {
-            result[i] = interator.next();
-        }
-        return result;
-    }
 }