Messaging: Fix mms expiry preferences.

  MmsUtils utilizes BuglePrefs#getSubscriptionPrefs
  to retrieve shared preferences specific to a subscription
  id (this is visible in the FactoryImpl of Messaging). Thus,
  its entirely wrong to have multiple options, per slot, per
  subscription id.

TICKET: CYNGNOS-2520
Change-Id: I33e49160ed64ebf38f55022bc1f5293704815399

6 files changed, 1 insertions, 71 deletions

diff --git a/res/values/cm_constants.xml b/res/values/cm_constants.xml
index 93fb461..18d0104 100644
--- a/res/values/cm_constants.xml
+++ b/res/values/cm_constants.xml
@@ -30,8 +30,6 @@
     <!-- Subscription-specific settings. The values of these pref keys must be prefixed with
      "buglesub_" to allow for runtime sanity checks -->
     <string name="expiry_mms_pref_key" translatable="false">buglesub_expiry_mms_pref_key</string>
-    <string name="expiry_slot1_mms_pref_key" translatable="false">buglesub_expiry_slot1_mms_pref_key</string>
-    <string name="expiry_slot2_mms_pref_key" translatable="false">buglesub_expiry_slot2_mms_pref_key</string>
     <string name="delivery_reports_mms_pref_key" translatable="false">buglesub_delivery_reports_mms_pref_key</string>
     <bool name="def_mms_delivery_reports">false</bool>
     <string name="read_reports_mms_pref_key" translatable="false">buglesub_read_reports_mms_pref_key</string>
diff --git a/res/xml-v21/preferences_application.xml b/res/xml-v21/preferences_application.xml
index 533e692..8acbae1 100644
--- a/res/xml-v21/preferences_application.xml
+++ b/res/xml-v21/preferences_application.xml
@@ -105,7 +105,6 @@
         android:entryValues="@array/entries_sms_validity_period_value"
         android:title="@string/validity_period_slot2_pref_title" />
 
-
     <SwitchPreference
         android:key="pref_show_emoticons"
         android:title="@string/show_emoticons_pref_title"
diff --git a/res/xml-v21/preferences_per_subscription.xml b/res/xml-v21/preferences_per_subscription.xml
index 5e0513f..6625233 100644
--- a/res/xml-v21/preferences_per_subscription.xml
+++ b/res/xml-v21/preferences_per_subscription.xml
@@ -62,22 +62,6 @@
             android:entryValues="@array/save_time_values"
             android:defaultValue="0" />
 
-        <ListPreference android:key="@string/expiry_slot1_mms_pref_key"
-            android:title="@string/validity_period_slot1_pref_title"
-            android:dialogTitle="@string/validity_period_pref_title"
-            android:summary="%s"
-            android:entries="@array/save_time"
-            android:entryValues="@array/save_time_values"
-            android:defaultValue="0" />
-
-        <ListPreference android:key="@string/expiry_slot2_mms_pref_key"
-            android:title="@string/validity_period_pref_title"
-            android:dialogTitle="@string/validity_period_pref_title"
-            android:summary="%s"
-            android:entries="@array/save_time"
-            android:entryValues="@array/save_time_values"
-            android:defaultValue="0" />
-
         <ListPreference android:key="@string/priority_mms_pref_key"
             android:title="@string/priority_pref_title"
             android:dialogTitle="@string/priority_pref_title"
diff --git a/res/xml/preferences_per_subscription.xml b/res/xml/preferences_per_subscription.xml
index 63c6ee7..ee377b2 100644
--- a/res/xml/preferences_per_subscription.xml
+++ b/res/xml/preferences_per_subscription.xml
@@ -62,22 +62,6 @@
             android:entryValues="@array/save_time_values"
             android:defaultValue="0" />
 
-        <ListPreference android:key="@string/expiry_slot1_mms_pref_key"
-            android:title="@string/validity_period_slot1_pref_title"
-            android:dialogTitle="@string/validity_period_pref_title"
-            android:summary="%s"
-            android:entries="@array/save_time"
-            android:entryValues="@array/save_time_values"
-            android:defaultValue="0" />
-
-        <ListPreference android:key="@string/expiry_slot2_mms_pref_key"
-            android:title="@string/validity_period_slot2_pref_title"
-            android:dialogTitle="@string/validity_period_pref_title"
-            android:summary="%s"
-            android:entries="@array/save_time"
-            android:entryValues="@array/save_time_values"
-            android:defaultValue="0" />
-
         <ListPreference android:key="@string/priority_mms_pref_key"
             android:title="@string/priority_pref_title"
             android:dialogTitle="@string/priority_pref_title"
diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java
index d938b49..3d1629f 100644
--- a/src/com/android/messaging/sms/MmsUtils.java
+++ b/src/com/android/messaging/sms/MmsUtils.java
@@ -2554,23 +2554,7 @@ public class MmsUtils {
         final Resources res = Factory.get().getApplicationContext().getResources();
         final BuglePrefs prefs = BuglePrefs.getSubscriptionPrefs(subId);
         final String expiryStr = res.getString(R.string.expiry_mms_pref_key);
-        final String expiryStr1 = res.getString(R.string.expiry_slot1_mms_pref_key);
-        final String expiryStr2 = res.getString(R.string.expiry_slot2_mms_pref_key);
-        final int mPhoneId = SubscriptionManager.getPhoneId(subId);
-
-        // Expiry.
-        long expiryTime = 0;
-
-        if (PhoneUtils.getDefault().isMultiSimEnabledMms()) {
-            expiryTime = Long.parseLong(
-                    prefs.getString((mPhoneId == 0) ?
-                            expiryStr1:
-                            expiryStr2, "0"));
-        } else {
-            expiryTime = Long.parseLong(
-                    prefs.getString(expiryStr, "0"));
-        }
-
+        final long expiryTime = Long.parseLong(prefs.getString(expiryStr, "0"));
         return expiryTime != 0 ? expiryTime : DEFAULT_EXPIRY_TIME_IN_SECONDS;
     }
 
@@ -2582,8 +2566,6 @@ public class MmsUtils {
         return Integer.parseInt(priority);
     }
 
-
-
     public static int sendSmsMessage(final String recipient, final String messageText,
             final Uri requestUri, final int subId,
             final String smsServiceCenter, final boolean requireDeliveryReport) {
diff --git a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
index 52ff485..cd83ccc 100644
--- a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
+++ b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
@@ -81,9 +81,6 @@ public class PerSubscriptionSettingsActivity extends BugleActionBarActivity {
             implements OnSharedPreferenceChangeListener {
         private PhoneNumberPreference mPhoneNumberPreference;
         private Preference mGroupMmsPreference;
-        private ListPreference mMmsExpiryPref;
-        private ListPreference mMmsExpiryCard1Pref;
-        private ListPreference mMmsExpiryCard2Pref;
 
         private String mGroupMmsPrefKey;
         private String mPhoneNumberKey;
@@ -190,20 +187,6 @@ public class PerSubscriptionSettingsActivity extends BugleActionBarActivity {
                         findPreference(getString(R.string.delivery_reports_pref_key));
                 deliveryReportsPreference.setEnabled(false);
             }
-
-            mMmsExpiryPref = (ListPreference)
-                    findPreference(getString(R.string.expiry_mms_pref_key));
-            mMmsExpiryCard1Pref = (ListPreference)
-                    findPreference(getString(R.string.expiry_slot1_mms_pref_key));
-            mMmsExpiryCard2Pref = (ListPreference)
-                    findPreference(getString(R.string.expiry_slot2_mms_pref_key));
-
-            if (PhoneUtils.getDefault().isMultiSimEnabledMms()) {
-                mmsCategory.removePreference(mMmsExpiryPref);
-            } else {
-                mmsCategory.removePreference(mMmsExpiryCard1Pref);
-                mmsCategory.removePreference(mMmsExpiryCard2Pref);
-            }
         }
 
         private boolean isCellBroadcastAppLinkEnabled() {