Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

some changes

This commit is contained in:
Thomas 2023-03-03 11:59:38 +01:00
parent f2c42de0ca
commit c89cabdcb4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -24,7 +24,7 @@
</queries> </queries>
<application <application
android:name="app.fedilab.android.MainApplication" android:name="app.fedilab.android.MainApplication"
android:allowBackup="false" android:allowBackup="true"
android:dataExtractionRules="@xml/extraction_rules" android:dataExtractionRules="@xml/extraction_rules"
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"

8
app/src/main/java/app/fedilab/android/BaseMainActivity.java
View File

@ -243,7 +243,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
if (b != null) { if (b != null) {
if (b.getBoolean(Helper.RECEIVE_REDRAW_TOPBAR, false)) { if (b.getBoolean(Helper.RECEIVE_REDRAW_TOPBAR, false)) {
List<MastodonList> mastodonLists = (List<MastodonList>) b.getSerializable(Helper.RECEIVE_MASTODON_LIST); List<MastodonList> mastodonLists = (List<MastodonList>) b.getSerializable(Helper.RECEIVE_MASTODON_LIST);
if (mastodonLists.size() == 0) { if (mastodonLists != null && mastodonLists.size() == 0) {
mastodonLists = null; mastodonLists = null;
} }
redrawPinned(mastodonLists); redrawPinned(mastodonLists);
@ -1228,9 +1228,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
//Fetch remote lists for the authenticated account and update them //Fetch remote lists for the authenticated account and update them
new ViewModelProvider(BaseMainActivity.this).get(TimelinesVM.class).getLists(currentInstance, currentToken) new ViewModelProvider(BaseMainActivity.this).get(TimelinesVM.class).getLists(currentInstance, currentToken)
.observe(this, mastodonLists -> { .observe(this, mastodonLists -> {
if (mastodonLists.size() == 0) { if (mastodonLists != null && mastodonLists.size() == 0) {
mastodonLists = null; mastodonLists = null;
} }
PinnedTimelineHelper.redrawTopBarPinned(BaseMainActivity.this, binding, pinned, bottomMenu, mastodonLists); PinnedTimelineHelper.redrawTopBarPinned(BaseMainActivity.this, binding, pinned, bottomMenu, mastodonLists);
} }
); );