Finish MainActivity if clicking a notification for another user.

3 files changed, 3 insertions, 12 deletions

diff --git a/app/src/main/java/Account/AccountDao.java b/app/src/main/java/Account/AccountDao.java
index c05e5552..67caf71d 100644
--- a/app/src/main/java/Account/AccountDao.java
+++ b/app/src/main/java/Account/AccountDao.java
@@ -37,6 +37,9 @@ public interface AccountDao {
     @Query("SELECT * FROM accounts WHERE is_current_user = 1 LIMIT 1")
     Account getCurrentAccount();
 
+    @Query("SELECT * FROM accounts WHERE is_current_user = 1 LIMIT 1")
+    LiveData<Account> getCurrentAccountLiveData();
+
     @Query("UPDATE accounts SET profile_image_url = :profileImageUrl, banner_image_url = :bannerImageUrl, " +
             "karma = :karma WHERE username = :username")
     void updateAccountInfo(String username, String profileImageUrl, String bannerImageUrl, int karma);
diff --git a/app/src/main/java/Account/AccountRepository.java b/app/src/main/java/Account/AccountRepository.java
index 7aa77b51..573f00f8 100644
--- a/app/src/main/java/Account/AccountRepository.java
+++ b/app/src/main/java/Account/AccountRepository.java
@@ -10,19 +10,13 @@ import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 
 public class AccountRepository {
     private AccountDao mAccountDao;
-    private LiveData<Account> mAccountLiveData;
     private LiveData<List<Account>> mAccountsExceptCurrentAccountLiveData;
 
     AccountRepository(RedditDataRoomDatabase redditDataRoomDatabase, String username) {
         mAccountDao = redditDataRoomDatabase.accountDao();
-        mAccountLiveData = mAccountDao.getAccountLiveData(username);
         mAccountsExceptCurrentAccountLiveData = mAccountDao.getAccountsExceptCurrentAccountLiveData();
     }
 
-    LiveData<Account> getAccountLiveData() {
-        return mAccountLiveData;
-    }
-
     public LiveData<List<Account>> getAccountsExceptCurrentAccountLiveData() {
         return mAccountsExceptCurrentAccountLiveData;
     }
diff --git a/app/src/main/java/Account/AccountViewModel.java b/app/src/main/java/Account/AccountViewModel.java
index 15fe6143..53fb0013 100644
--- a/app/src/main/java/Account/AccountViewModel.java
+++ b/app/src/main/java/Account/AccountViewModel.java
@@ -14,20 +14,14 @@ import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 
 public class AccountViewModel extends AndroidViewModel {
     private AccountRepository mAccountRepository;
-    private LiveData<Account> mAccountLiveData;
     private LiveData<List<Account>> mAccountsExceptCurrentAccountLiveData;
 
     public AccountViewModel(Application application, RedditDataRoomDatabase redditDataRoomDatabase, String id) {
         super(application);
         mAccountRepository = new AccountRepository(redditDataRoomDatabase, id);
-        mAccountLiveData = mAccountRepository.getAccountLiveData();
         mAccountsExceptCurrentAccountLiveData = mAccountRepository.getAccountsExceptCurrentAccountLiveData();
     }
 
-    public LiveData<Account> getAccountLiveData() {
-        return mAccountLiveData;
-    }
-
     public LiveData<List<Account>> getAccountsExceptCurrentAccountLiveData() {
         return mAccountsExceptCurrentAccountLiveData;
     }