TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-04 22:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

another minor pref tweak for mms fallback

Browse Source 
1) fix summary for outgoing sms/mms
2) disable mms option when TS-users is unselected, same as the fallback
   approval option.

// FREEBIE
This commit is contained in:
Jake McGinty 2014-12-11 22:46:59 -08:00
parent 761049d6f8
commit c448a833f5
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@ -698,7 +698,8 @@
<string name="preferences__sms_fallback">Outgoing SMS/MMS</string> <string name="preferences__sms_fallback">Outgoing SMS/MMS</string>
<string name="preferences__submit_debug_log">Submit debug log</string> <string name="preferences__submit_debug_log">Submit debug log</string>
<string name="preferences__sms_outgoing_push_users">TextSecure users</string> <string name="preferences__sms_outgoing_push_users">TextSecure users</string>
<string name="preferences__sms_fallback_push_users_ask">(ask first)</string> <string name="preferences__sms_fallback_push_users_ask">ask first</string>
<string name="preferences__sms_fallback_push_users_no_mms">no MMS</string>
<string name="preferences__sms_outgoing_push_users_description">Send secure SMS if data connectivity is lost</string> <string name="preferences__sms_outgoing_push_users_description">Send secure SMS if data connectivity is lost</string>
<string name="preferences__sms_fallback_ask_before_sending_sms_mms">Ask before sending SMS/MMS</string> <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Ask before sending SMS/MMS</string>
<string name="preferences__sms_fallback_never_send_mms">Never send MMS</string> <string name="preferences__sms_fallback_never_send_mms">Never send MMS</string>

7
src/org/thoughtcrime/securesms/components/OutgoingSmsPreference.java
View File

@ -38,11 +38,16 @@ public class OutgoingSmsPreference extends DialogPreference {
dataUsers.setOnClickListener(new View.OnClickListener() { dataUsers.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
askForFallback.setEnabled(dataUsers.isChecked()); updateEnabledViews();
} }
}); });
updateEnabledViews();
}
private void updateEnabledViews() {
askForFallback.setEnabled(dataUsers.isChecked()); askForFallback.setEnabled(dataUsers.isChecked());
neverFallbackMms.setEnabled(dataUsers.isChecked());
} }
@Override @Override

16
src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
View File

@ -12,6 +12,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v4.preference.PreferenceFragment; import android.support.v4.preference.PreferenceFragment;
import android.text.TextUtils;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.MmsPreferencesFragment; import org.thoughtcrime.securesms.MmsPreferencesFragment;
@ -20,6 +21,9 @@ import org.thoughtcrime.securesms.components.OutgoingSmsPreference;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import java.util.LinkedList;
import java.util.List;
public class SmsMmsPreferenceFragment extends PreferenceFragment { public class SmsMmsPreferenceFragment extends PreferenceFragment {
private static final String KITKAT_DEFAULT_PREF = "pref_set_default"; private static final String KITKAT_DEFAULT_PREF = "pref_set_default";
private static final String OUTGOING_SMS_PREF = "pref_outgoing_sms"; private static final String OUTGOING_SMS_PREF = "pref_outgoing_sms";
@ -92,11 +96,21 @@ public class SmsMmsPreferenceFragment extends PreferenceFragment {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
final boolean dataFallback = TextSecurePreferences.isFallbackSmsAllowed(getActivity()); final boolean dataFallback = TextSecurePreferences.isFallbackSmsAllowed(getActivity());
final boolean dataFallbackAsk = TextSecurePreferences.isFallbackSmsAskRequired(getActivity()); final boolean dataFallbackAsk = TextSecurePreferences.isFallbackSmsAskRequired(getActivity());
final boolean mmsFallback = TextSecurePreferences.isFallbackMmsEnabled(getActivity());
final boolean nonData = TextSecurePreferences.isDirectSmsAllowed(getActivity()); final boolean nonData = TextSecurePreferences.isDirectSmsAllowed(getActivity());
if (dataFallback) { if (dataFallback) {
builder.append(getString(R.string.preferences__sms_outgoing_push_users)); builder.append(getString(R.string.preferences__sms_outgoing_push_users));
if (dataFallbackAsk) builder.append(" ").append(getString(R.string.preferences__sms_fallback_push_users_ask));
List<String> fallbackOptions = new LinkedList<>();
if (dataFallbackAsk) fallbackOptions.add(getString(R.string.preferences__sms_fallback_push_users_ask));
if (!mmsFallback) fallbackOptions.add(getString(R.string.preferences__sms_fallback_push_users_no_mms));
if (fallbackOptions.size() > 0) {
builder.append(" (")
.append(TextUtils.join(", ", fallbackOptions))
.append(")");
}
} }
if (nonData) { if (nonData) {
if (dataFallback) builder.append(", "); if (dataFallback) builder.append(", ");