From 90564d9b2d164d50a68c62df5d19f35e7173a291 Mon Sep 17 00:00:00 2001 From: tom79 Date: Mon, 11 Sep 2017 07:01:59 +0200 Subject: [PATCH] Fixes potential crashes --- .../fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java | 2 +- app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java | 3 ++- 2 files changed, 3 insertions(+), 2 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 57fb935bb..cca007b66 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 @@ -465,7 +465,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf //Redraws top icons (boost/reply) final float scale = context.getResources().getDisplayMetrics().density; - if( !status.getIn_reply_to_account_id().equals("null") || !status.getIn_reply_to_id().equals("null") ){ + if( (status.getIn_reply_to_account_id()!= null && !status.getIn_reply_to_account_id().equals("null")) || (status.getIn_reply_to_id() != null && !status.getIn_reply_to_id().equals("null")) ){ Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_reply); img.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (15 * iconSizePercent/100 * scale + 0.5f)); holder.status_account_displayname.setCompoundDrawables( img, null, null, null); 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 7f684d329..92f295f49 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 @@ -1665,7 +1665,8 @@ public class Helper { Gson gson = new Gson(); String json = sharedpreferences.getString(Helper.SET_TEMP_STATUS + userId, null); Type type = new TypeToken>() {}.getType(); - return gson.fromJson(json, type); + ArrayList statuses = gson.fromJson(json, type); + return (statuses != null)?statuses:new ArrayList(); }