Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 429a4e6a authored by kuci's avatar kuci Committed by Michael Bestas
Browse files

Settings: Add some more entries into 'SMS message limit' menu

* Add None, 5 and 10 entries into 'SMS message limit' menu.
* Properly write limit value to Settings.Global
* The default SMS limit for Android 4.2.2 upwards is 30 per minute.
  Update string to reflect the correct time interval

Change-Id: I8b206ae6c9f73378da65b09e68898de31439cc59
parent 17a4c793
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -406,13 +406,19 @@

    <!-- Sms security limit -->
    <string-array name="sms_security_check_limit_entries" translatable="false">
        <item>@string/sms_security_check_limit_default</item>
        <item>@string/sms_security_check_limit_none</item>
        <item>5</item>
        <item>10</item>
        <item>30</item>
        <item>50</item>
        <item>100</item>
        <item>200</item>
    </string-array>

    <string-array name="sms_security_check_limit_values" translatable="false">
        <item>0</item>
        <item>5</item>
        <item>10</item>
        <item>30</item>
        <item>50</item>
        <item>100</item>
+3 −2
Original line number Diff line number Diff line
@@ -793,8 +793,9 @@
    <!-- Sms security limit -->
    <string name="app_security_title">App security</string>
    <string name="sms_security_check_limit_title">SMS message limit</string>
    <string name="sms_security_check_limit_summary">Display an alert dialog to prevent applications from sending SMS messages too frequently. Current limit: %d messages in 15 minutes</string>
    <string name="sms_security_check_limit_default">30 (Default)</string>
    <string name="sms_security_check_limit_summary">Apps can send %d messages in 1 minute before requiring confirmation</string>
    <string name="sms_security_check_limit_summary_none">Apps are not allowed to send any messages without confirmation</string>
    <string name="sms_security_check_limit_none">None</string>

    <!-- Notification spamfilter -->
    <string name="spam_added_title">Added %1$s</string>
+5 −3
Original line number Diff line number Diff line
@@ -554,8 +554,10 @@ public class SecuritySettings extends SettingsPreferenceFragment
        }
    }

    private void updateSmsSecuritySummary(int i) {
        String message = getString(R.string.sms_security_check_limit_summary, i);
    private void updateSmsSecuritySummary(int selection) {
        String message = selection > 0
                ? getString(R.string.sms_security_check_limit_summary, selection)
                : getString(R.string.sms_security_check_limit_summary_none);
        mSmsSecurityCheck.setSummary(message);
    }

@@ -752,7 +754,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
            }
        } else if (KEY_SMS_SECURITY_CHECK_PREF.equals(key)) {
            int smsSecurityCheck = Integer.valueOf((String) value);
            Settings.Secure.putInt(getContentResolver(), Settings.Global.SMS_OUTGOING_CHECK_MAX_COUNT,
            Settings.Global.putInt(getContentResolver(), Settings.Global.SMS_OUTGOING_CHECK_MAX_COUNT,
                    smsSecurityCheck);
            updateSmsSecuritySummary(smsSecurityCheck);
        }