Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-28 00:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements

Browse Source
This commit is contained in:
M66B
2018-11-10 10:45:03 +00:00
parent 439a1cc627
commit a9450edc3f
6 changed files with 58 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@@ -60,7 +60,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -104,21 +103,6 @@ public class FragmentSetup extends FragmentEx {
Manifest.permission.READ_CONTACTS
};
static final List<String> EXPORT_SETTINGS = Arrays.asList(
"enabled",
"compact",
"avatars",
"identicons",
"preview",
"light",
"browse",
"swipe",
"navigation",
"sender",
"insecure",
"sort"
);
@Override
@Nullable
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -582,7 +566,7 @@ public class FragmentSetup extends FragmentEx {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
JSONArray jsettings = new JSONArray();
for (String key : prefs.getAll().keySet())
if (EXPORT_SETTINGS.contains(key)) {
if (!"pro".equals(key)) {
JSONObject jsetting = new JSONObject();
jsetting.put("key", key);
jsetting.put("value", prefs.getAll().get(key));
@@ -688,10 +672,14 @@ public class FragmentSetup extends FragmentEx {
for (int s = 0; s < jsettings.length(); s++) {
JSONObject jsetting = (JSONObject) jsettings.get(s);
String key = jsetting.getString("key");
if (EXPORT_SETTINGS.contains(key)) {
if (!"pro".equals(key)) {
Object value = jsetting.get("value");
if (value instanceof Boolean)
editor.putBoolean(key, (Boolean) value);
else if (value instanceof Integer)
editor.putInt(key, (Integer) value);
else if (value instanceof Long)
editor.putLong(key, (Long) value);
else if (value instanceof String)
editor.putString(key, (String) value);
else