From c2bc15f5bacd636d3a6ffefe43c057022018e1d2 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 22 Sep 2014 11:00:13 +0200 Subject: added 'model' to selectable resources. fixed #461 --- src/eu/siacs/conversations/ui/SettingsActivity.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/eu/siacs/conversations/ui') diff --git a/src/eu/siacs/conversations/ui/SettingsActivity.java b/src/eu/siacs/conversations/ui/SettingsActivity.java index c522e058a..fc361fb82 100644 --- a/src/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/eu/siacs/conversations/ui/SettingsActivity.java @@ -1,20 +1,27 @@ package eu.siacs.conversations.ui; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Locale; import eu.siacs.conversations.entities.Account; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; +import android.os.Build; import android.os.Bundle; +import android.preference.ListPreference; import android.preference.PreferenceManager; public class SettingsActivity extends XmppActivity implements OnSharedPreferenceChangeListener { + private SettingsFragment mSettingsFragment; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + mSettingsFragment = new SettingsFragment(); getFragmentManager().beginTransaction() - .replace(android.R.id.content, new SettingsFragment()).commit(); + .replace(android.R.id.content,mSettingsFragment).commit(); } @Override @@ -27,6 +34,13 @@ public class SettingsActivity extends XmppActivity implements super.onStart(); PreferenceManager.getDefaultSharedPreferences(this) .registerOnSharedPreferenceChangeListener(this); + ListPreference resources = (ListPreference) mSettingsFragment.findPreference("resource"); + if (resources!=null) { + ArrayList entries = new ArrayList(Arrays.asList(resources.getEntries())); + entries.add(0,Build.MODEL); + resources.setEntries(entries.toArray(new CharSequence[entries.size()])); + resources.setEntryValues(entries.toArray(new CharSequence[entries.size()])); + } } @Override -- cgit v1.2.3