aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDocile-Alligator <chineseperson5@gmail.com>2021-12-07 13:19:42 +0000
committerGitHub <noreply@github.com>2021-12-07 13:19:42 +0000
commit99c096e111ecb6814da9a888c28a623d198be569 (patch)
tree8781e8274eaab8301ba6698d6d7329e9aa198769 /app
parent57ab5193331b88ce4e3839aedf960403da83a023 (diff)
parent3350b31d21e8df7e2be487338aa3c2d5890c90f7 (diff)
downloadinfinity-for-reddit-99c096e111ecb6814da9a888c28a623d198be569.tar
infinity-for-reddit-99c096e111ecb6814da9a888c28a623d198be569.tar.gz
infinity-for-reddit-99c096e111ecb6814da9a888c28a623d198be569.tar.bz2
infinity-for-reddit-99c096e111ecb6814da9a888c28a623d198be569.tar.lz
infinity-for-reddit-99c096e111ecb6814da9a888c28a623d198be569.tar.xz
infinity-for-reddit-99c096e111ecb6814da9a888c28a623d198be569.tar.zst
infinity-for-reddit-99c096e111ecb6814da9a888c28a623d198be569.zip
Merge pull request #573 from scria1000/patch-3
Fix observer being triggered twice on SubredditDetail
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java54
1 files changed, 31 insertions, 23 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java
index 1ce4a44e..4402434f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java
@@ -142,7 +142,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
private static final String MESSAGE_FULLNAME_STATE = "MFS";
private static final String NEW_ACCOUNT_NAME_STATE = "NANS";
private static final int ADD_TO_MULTIREDDIT_REQUEST_CODE = 1;
-
+ public SubredditViewModel mSubredditViewModel;
@BindView(R.id.coordinator_layout_view_subreddit_detail_activity)
CoordinatorLayout coordinatorLayout;
@BindView(R.id.view_pager_view_subreddit_detail_activity)
@@ -219,7 +219,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
CustomThemeWrapper mCustomThemeWrapper;
@Inject
Executor mExecutor;
- public SubredditViewModel mSubredditViewModel;
private FragmentManager fragmentManager;
private SectionsPagerAdapter sectionsPagerAdapter;
private Call<String> subredditAutocompleteCall;
@@ -248,6 +247,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
private int fabOption;
private SlidrInterface mSlidrInterface;
private MaterialAlertDialogBuilder nsfwWarningBuilder;
+ private boolean isOnCreateActivity;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -370,6 +370,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
checkNewAccountAndBindView();
+ isOnCreateActivity = true;
fetchSubredditData();
String title = "r/" + subredditName;
@@ -590,8 +591,13 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
public void onFetchSubredditDataSuccess(SubredditData subredditData, int nCurrentOnlineSubscribers) {
mNCurrentOnlineSubscribers = nCurrentOnlineSubscribers;
nOnlineSubscribersTextView.setText(getString(R.string.online_subscribers_number_detail, nCurrentOnlineSubscribers));
- InsertSubredditData.insertSubredditData(mExecutor, new Handler(), mRedditDataRoomDatabase,
- subredditData, () -> mFetchSubredditInfoSuccess = true);
+ if (isOnCreateActivity) {
+ mFetchSubredditInfoSuccess = true;
+ isOnCreateActivity = false;
+ } else {
+ InsertSubredditData.insertSubredditData(mExecutor, new Handler(), mRedditDataRoomDatabase,
+ subredditData, () -> mFetchSubredditInfoSuccess = true);
+ }
}
@Override
@@ -633,7 +639,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
}
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_REFRESH: {
if (sectionsPagerAdapter != null) {
- sectionsPagerAdapter.refresh();
+ sectionsPagerAdapter.refresh(false);
}
break;
}
@@ -878,7 +884,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
switch (fabOption) {
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_REFRESH: {
if (sectionsPagerAdapter != null) {
- sectionsPagerAdapter.refresh();
+ sectionsPagerAdapter.refresh(false);
}
break;
}
@@ -1105,9 +1111,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
return true;
} else if (itemId == R.id.action_refresh_view_subreddit_detail_activity) {
if (sectionsPagerAdapter != null) {
- sectionsPagerAdapter.refresh();
- mFetchSubredditInfoSuccess = false;
- fetchSubredditData();
+ sectionsPagerAdapter.refresh(true);
}
return true;
} else if (itemId == R.id.action_change_post_layout_view_subreddit_detail_activity) {
@@ -1333,7 +1337,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
break;
case FABMoreOptionsBottomSheetFragment.FAB_OPTION_REFRESH:
if (sectionsPagerAdapter != null) {
- sectionsPagerAdapter.refresh();
+ sectionsPagerAdapter.refresh(false);
}
break;
case FABMoreOptionsBottomSheetFragment.FAB_OPTION_CHANGE_SORT_TYPE:
@@ -1541,6 +1545,18 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
InsertReadPost.insertReadPost(mRedditDataRoomDatabase, mExecutor, mAccountName, post.getId());
}
+ private void lockSwipeRightToGoBack() {
+ if (mSlidrInterface != null) {
+ mSlidrInterface.lock();
+ }
+ }
+
+ private void unlockSwipeRightToGoBack() {
+ if (mSlidrInterface != null) {
+ mSlidrInterface.unlock();
+ }
+ }
+
private class SectionsPagerAdapter extends FragmentStateAdapter {
SectionsPagerAdapter(FragmentActivity fa) {
@@ -1585,10 +1601,14 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
return false;
}
- public void refresh() {
+ public void refresh(boolean refreshSubredditData) {
Fragment fragment = getCurrentFragment();
if (fragment instanceof PostFragment) {
((PostFragment) fragment).refresh();
+ if (refreshSubredditData) {
+ mFetchSubredditInfoSuccess = false;
+ fetchSubredditData();
+ }
} else if (fragment instanceof SidebarFragment) {
((SidebarFragment) fragment).fetchSubredditData();
}
@@ -1658,16 +1678,4 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
return 2;
}
}
-
- private void lockSwipeRightToGoBack() {
- if (mSlidrInterface != null) {
- mSlidrInterface.lock();
- }
- }
-
- private void unlockSwipeRightToGoBack() {
- if (mSlidrInterface != null) {
- mSlidrInterface.unlock();
- }
- }
}