diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java index 9c5d23450..6bce52c28 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java @@ -157,7 +157,7 @@ public class CacheController{ return; } }catch(IOException x){ - Log.w(TAG, "getHomeTimeline: corrupted status object in database", x); + Log.w(TAG, "getConversationsTimeline: corrupted status object in database", x); } } new GetConversationsTimeline(maxID, null, count, null) @@ -393,15 +393,18 @@ public class CacheController{ )"""); createRecentSearchesTable(db); createPostsNotificationsTable(db); + createConversationsTimelineTable(db); } @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion){ if(oldVersion==1){ createRecentSearchesTable(db); + createConversationsTimelineTable(db); } if(oldVersion==2){ createPostsNotificationsTable(db); + createConversationsTimelineTable(db); } } @@ -423,6 +426,15 @@ public class CacheController{ `type` INTEGER NOT NULL )"""); } + + private void createConversationsTimelineTable(SQLiteDatabase db){ + db.execSQL(""" + CREATE TABLE `conversations_timeline` ( + `id` VARCHAR(25) NOT NULL PRIMARY KEY, + `json` TEXT NOT NULL, + `flags` INTEGER NOT NULL DEFAULT 0 + )"""); + } } @FunctionalInterface diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java index 40eabd5ab..6f3532220 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java @@ -92,7 +92,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc } else if (item.getItemId() == R.id.clear_notifications) { UiUtils.confirmDeleteNotification(getActivity(), accountID, null, ()->{ for (int i = 0; i < tabViews.length; i++) { - getFragmentForPage(i).reload(); +// getFragmentForPage(i).reload(); } }); return true; @@ -202,7 +202,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc @Override public void scrollToTop(){ - getFragmentForPage(pager.getCurrentItem()).scrollToTop(); +// getFragmentForPage(pager.getCurrentItem()).scrollToTop(); } public void loadData(){