Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix crash in NotificationsFragment (#1119) 

* fix crash in NotificationsFragment

* don't reload notifications

* add updateAdapter()
This commit is contained in:
Konrad Pozniak 2019-03-13 09:32:59 +01:00 committed by GitHub
parent 5f390b378b
commit 08c1bbd253
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
View File

@ -47,6 +47,8 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
private lateinit var touchHelper: ItemTouchHelper private lateinit var touchHelper: ItemTouchHelper
private lateinit var addTabAdapter: TabAdapter private lateinit var addTabAdapter: TabAdapter
private var tabsChanged = false
private val selectedItemElevation by lazy { resources.getDimension(R.dimen.selected_drag_item_elevation) } private val selectedItemElevation by lazy { resources.getDimension(R.dimen.selected_drag_item_elevation) }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -188,6 +190,7 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
.subscribe() .subscribe()
} }
tabsChanged = true
} }
override fun onBackPressed() { override fun onBackPressed() {
@ -208,7 +211,9 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
eventHub.dispatch(MainTabsChangedEvent(currentTabs)) if(tabsChanged) {
eventHub.dispatch(MainTabsChangedEvent(currentTabs))
}
} }
companion object { companion object {

11
app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
View File

@ -207,14 +207,19 @@ public class NotificationsFragment extends SFragment implements
adapter.setUseAbsoluteTime(useAbsoluteTime); adapter.setUseAbsoluteTime(useAbsoluteTime);
recyclerView.setAdapter(adapter); recyclerView.setAdapter(adapter);
notifications.clear();
topLoading = false; topLoading = false;
bottomLoading = false; bottomLoading = false;
bottomId = null; bottomId = null;
((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false); updateAdapter();
sendFetchNotificationsRequest(null, null, FetchEnd.BOTTOM, -1); if (notifications.isEmpty()) {
sendFetchNotificationsRequest(null, null, FetchEnd.BOTTOM, -1);
} else {
progressBar.setVisibility(View.GONE);
}
((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false);
return rootView; return rootView;
} }