From aee4b0ff63c828113ff04a192f429a6755305f6d Mon Sep 17 00:00:00 2001 From: stom79 Date: Wed, 7 Nov 2018 18:09:21 +0100 Subject: [PATCH] Set Cardview to false by default --- .../gouv/etalab/mastodon/drawers/StatusListAdapter.java | 2 +- .../gouv/etalab/mastodon/fragments/SettingsFragment.java | 2 +- .../main/java/fr/gouv/etalab/mastodon/helper/Helper.java | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 56cb55300..4d47905fc 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -1122,7 +1122,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_pin.setVisibility(View.GONE); } - boolean display_card = sharedpreferences.getBoolean(Helper.SET_DISPLAY_CARD, true); + boolean display_card = sharedpreferences.getBoolean(Helper.SET_DISPLAY_CARD, false); if( status.getWebviewURL() != null){ holder.status_cardview_webview.loadUrl(status.getWebviewURL()); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index b9973a0eb..9c58c0a70 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -105,7 +105,7 @@ public class SettingsFragment extends Fragment { }); - boolean display_card = sharedpreferences.getBoolean(Helper.SET_DISPLAY_CARD, true); + boolean display_card = sharedpreferences.getBoolean(Helper.SET_DISPLAY_CARD, false); final CheckBox set_display_card = rootView.findViewById(R.id.set_display_card); set_display_card.setChecked(display_card); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index f25dc2307..b989328ab 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -1969,7 +1969,13 @@ public class Helper { */ public static String accountToStringStorage(Account account){ Gson gson = new Gson(); - return gson.toJson(account); + try { + return gson.toJson(account); + }catch (Exception e){ + e.printStackTrace(); + return null; + } + } /**