From 68262542c8037eab503df698b1a657cfee08fb1e Mon Sep 17 00:00:00 2001 From: stom79 Date: Fri, 8 Dec 2017 07:22:42 +0100 Subject: [PATCH] Fixes issue #95 - Content not refreshed when an account is added --- .../fr/gouv/etalab/mastodon/activities/BaseMainActivity.java | 3 +++ .../etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java | 2 +- app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java index f6afe0e2f..56650d9b4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java @@ -98,6 +98,7 @@ import fr.gouv.etalab.mastodon.fragments.DisplayStatusFragment; import fr.gouv.etalab.mastodon.fragments.TabLayoutSettingsFragment; import fr.gouv.etalab.mastodon.sqlite.AccountDAO; +import static fr.gouv.etalab.mastodon.helper.Helper.ADD_USER_INTENT; import static fr.gouv.etalab.mastodon.helper.Helper.CHANGE_THEME_INTENT; import static fr.gouv.etalab.mastodon.helper.Helper.CHANGE_USER_INTENT; import static fr.gouv.etalab.mastodon.helper.Helper.HOME_TIMELINE_INTENT; @@ -1022,6 +1023,8 @@ public abstract class BaseMainActivity extends AppCompatActivity if( !toolbar_search.isIconified() ) { toolbar_search.setIconified(true); } + }else if (extras.getInt(INTENT_ACTION) == ADD_USER_INTENT){ + this.recreate(); } }else if( Intent.ACTION_SEND.equals(action) && type != null ) { if ("text/plain".equals(type)) { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java index 85ef9c66e..cd06466ea 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java @@ -76,7 +76,7 @@ public class UpdateAccountInfoAsyncTask extends AsyncTask { protected void onPostExecute(Void result) { Intent mainActivity = new Intent(this.contextReference.get(), MainActivity.class); - mainActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mainActivity.putExtra(Helper.INTENT_ACTION, Helper.ADD_USER_INTENT); this.contextReference.get().startActivity(mainActivity); ((Activity) this.contextReference.get()).finish(); 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 22f64ab9e..f55a3247d 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 @@ -190,6 +190,7 @@ public class Helper { public static final int HOME_TIMELINE_INTENT = 2; public static final int CHANGE_THEME_INTENT = 3; public static final int CHANGE_USER_INTENT = 4; + public static final int ADD_USER_INTENT = 5; //Settings public static final String SET_TOOTS_PER_PAGE = "set_toots_per_page"; public static final String SET_ACCOUNTS_PER_PAGE = "set_accounts_per_page";