bug fix

Signed-off-by: nuclearfog <hatespirit666@gmail.com>
nuclearfog · Aug 29, 2021 · 2dbdd88 · 2dbdd88
1 parent e8618cf
commit 2dbdd88
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/UserAction.java b/app/src/main/java/org/nuclearfog/twidda/backend/UserAction.java
@@ -8,7 +8,6 @@
 import org.nuclearfog.twidda.backend.model.Relation;
 import org.nuclearfog.twidda.backend.model.User;
 import org.nuclearfog.twidda.database.AppDatabase;
-import org.nuclearfog.twidda.database.ExcludeDatabase;
 
 import java.lang.ref.WeakReference;
 
@@ -61,7 +60,6 @@ public enum Action {
     private EngineException twException;
     private WeakReference<UserProfile> callback;
     private TwitterEngine mTwitter;
-    private ExcludeDatabase excludeDb;
     private AppDatabase db;
     private long userId;
 
@@ -73,7 +71,6 @@ public UserAction(UserProfile callback, long userId) {
         super();
         this.callback = new WeakReference<>(callback);
         mTwitter = TwitterEngine.getInstance(callback);
-        excludeDb = ExcludeDatabase.getInstance(callback);
         db = new AppDatabase(callback);
         this.userId = userId;
     }
@@ -120,28 +117,24 @@ protected Relation doInBackground(Action[] action) {
                     user = mTwitter.blockUser(userId);
                     publishProgress(user);
                     db.muteUser(userId, true);
-                    excludeDb.addUser(userId);
                     break;
 
                 case ACTION_UNBLOCK:
                     user = mTwitter.unblockUser(userId);
                     publishProgress(user);
                     db.muteUser(userId, false);
-                    excludeDb.removeUser(userId);
                     break;
 
                 case ACTION_MUTE:
                     user = mTwitter.muteUser(userId);
                     publishProgress(user);
                     db.muteUser(userId, true);
-                    excludeDb.addUser(userId);
                     break;
 
                 case ACTION_UNMUTE:
                     user = mTwitter.unmuteUser(userId);
                     publishProgress(user);
                     db.muteUser(userId, false);
-                    excludeDb.removeUser(userId);
                     break;
             }
             return mTwitter.getConnection(userId);

diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/engine/TwitterEngine.java b/app/src/main/java/org/nuclearfog/twidda/backend/engine/TwitterEngine.java
@@ -498,7 +498,8 @@ public void blockUser(String name) throws EngineException {
         try {
             if (!name.startsWith("@"))
                 name = '@' + name;
-            twitter.createBlock(name);
+            twitter4j.User user = twitter.createBlock(name);
+            excludeDB.addUser(user.getId());
         } catch (Exception err) {
             throw new EngineException(err);
         }
@@ -513,7 +514,9 @@ public void blockUser(String name) throws EngineException {
      */
     public User blockUser(long UserID) throws EngineException {
         try {
-            return new User(twitter.createBlock(UserID), twitter.getId());
+            twitter4j.User user = twitter.createBlock(UserID);
+            excludeDB.addUser(UserID);
+            return new User(user, twitter.getId());
         } catch (Exception err) {
             throw new EngineException(err);
         }
@@ -528,7 +531,9 @@ public User blockUser(long UserID) throws EngineException {
      */
     public User unblockUser(long UserID) throws EngineException {
         try {
-            return new User(twitter.destroyBlock(UserID), twitter.getId());
+            twitter4j.User user = twitter.destroyBlock(UserID);
+            excludeDB.removeUser(UserID);
+            return new User(user, twitter.getId());
         } catch (Exception err) {
             throw new EngineException(err);
         }
@@ -544,7 +549,8 @@ public void muteUser(String name) throws EngineException {
         try {
             if (!name.startsWith("@"))
                 name = '@' + name;
-            twitter.createMute(name);
+            twitter4j.User user = twitter.createMute(name);
+            excludeDB.addUser(user.getId());
         } catch (Exception err) {
             throw new EngineException(err);
         }
@@ -559,7 +565,9 @@ public void muteUser(String name) throws EngineException {
      */
     public User muteUser(long UserID) throws EngineException {
         try {
-            return new User(twitter.createMute(UserID), twitter.getId());
+            twitter4j.User user = twitter.createMute(UserID);
+            excludeDB.addUser(user.getId());
+            return new User(user, twitter.getId());
         } catch (Exception err) {
             throw new EngineException(err);
         }
@@ -574,7 +582,9 @@ public User muteUser(long UserID) throws EngineException {
      */
     public User unmuteUser(long UserID) throws EngineException {
         try {
-            return new User(twitter.destroyMute(UserID), twitter.getId());
+            twitter4j.User user = twitter.destroyMute(UserID);
+            excludeDB.removeUser(user.getId());
+            return new User(user, twitter.getId());
         } catch (Exception err) {
             throw new EngineException(err);
         }