From 8decfff81800055d5bec97830f45c44331a5471c Mon Sep 17 00:00:00 2001 From: stom79 Date: Mon, 3 Sep 2018 08:20:02 +0200 Subject: [PATCH] Avoid crashes when owner account can't be retrieved (surely when shared pref is cleared). --- .../etalab/mastodon/activities/ShowConversationActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java index 3b122c0a9..87993731c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java @@ -188,6 +188,10 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); Account account = new AccountDAO(getApplicationContext(),db).getAccountByID(userId); + if( account.getAvatar() == null){ + Toast.makeText(ShowConversationActivity.this,R.string.toast_error, Toast.LENGTH_LONG).show(); + finish(); + } String url = account.getAvatar(); if( url.startsWith("/") ){ url = Helper.getLiveInstanceWithProtocol(getApplicationContext()) + account.getAvatar();