From 950d99b5deb5b2e2badb55f48a6657e1bd7e8b5d Mon Sep 17 00:00:00 2001 From: Thomas Date: Sat, 2 Jan 2021 18:20:36 +0100 Subject: [PATCH] Prevent to check notifications for remote accounts --- .../fedilab/fedilabtube/sqlite/AccountDAO.java | 17 +++++++++++++++++ .../fedilabtube/worker/NotificationsWorker.java | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java b/app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java index 5167ec4..38d498d 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java +++ b/app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java @@ -236,6 +236,23 @@ public class AccountDAO { } + /** + * Returns all Peertube Account only in db + * + * @return Account List + */ + public List getAllPeertubeAccount() { + + try { + Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, Sqlite.COL_SOFTWARE + "=? OR " + Sqlite.COL_SOFTWARE + "is null", new String[]{"PEERTUBE"}, null, null, Sqlite.COL_INSTANCE + " ASC", null); + return cursorToListUser(c); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** * Returns an Account by token * diff --git a/app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java b/app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java index 96a1841..7fa75da 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java +++ b/app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java @@ -79,7 +79,7 @@ public class NotificationsWorker extends Worker { public Result doWork() { Context applicationContext = getApplicationContext(); SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); - List accounts = new AccountDAO(applicationContext, db).getAllAccount(); + List accounts = new AccountDAO(applicationContext, db).getAllPeertubeAccount(); if (accounts == null || accounts.size() == 0) { return Result.success(); } @@ -92,7 +92,7 @@ public class NotificationsWorker extends Worker { @SuppressWarnings({"SwitchStatementWithoutDefaultBranch", "DuplicateBranchesInSwitch"}) private void fetchNotification() { SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); - List accounts = new AccountDAO(getApplicationContext(), db).getAllAccount(); + List accounts = new AccountDAO(getApplicationContext(), db).getAllPeertubeAccount(); SharedPreferences sharedpreferences = getApplicationContext().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); SharedPreferences.Editor editor = sharedpreferences.edit(); for (AccountData.Account account : accounts) {