Deletes all user information after account is removed

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
nextcloud · Jul 24, 2024 · ffb471f · ffb471f
1 parent a613434
commit ffb471f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt
@@ -59,4 +59,12 @@ interface ChatBlocksDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun upsertChatBlock(chatBlock: ChatBlockEntity)
+
+    @Query(
+        """
+        DELETE FROM ChatBlocks
+        WHERE internalConversationId LIKE :pattern
+        """
+    )
+    fun clearChatBlocksForUser(pattern: String)
 }
diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt
@@ -104,4 +104,12 @@ interface ChatMessagesDao {
         """
     )
     fun getCountBetweenMessageIds(internalConversationId: String, oldestMessageId: Long, newestMessageId: Long): Int
+
+    @Query(
+        """
+        DELETE FROM chatmessages
+        WHERE internalId LIKE :pattern
+        """
+    )
+    fun clearAllMessagesForUser(pattern: String)
 }
diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ConversationsDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ConversationsDao.kt
@@ -38,4 +38,12 @@ interface ConversationsDao {
 
     @Update
     fun updateConversation(conversationEntity: ConversationEntity)
+
+    @Query(
+        """
+        DELETE FROM conversations
+        WHERE internalId LIKE :pattern
+        """
+    )
+    fun clearAllConversationsForUser(pattern: String)
 }
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java
@@ -16,6 +16,9 @@
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager;
+import com.nextcloud.talk.data.database.dao.ChatBlocksDao;
+import com.nextcloud.talk.data.database.dao.ChatMessagesDao;
+import com.nextcloud.talk.data.database.dao.ConversationsDao;
 import com.nextcloud.talk.data.user.model.User;
 import com.nextcloud.talk.models.json.generic.GenericMeta;
 import com.nextcloud.talk.models.json.generic.GenericOverall;
@@ -46,17 +49,19 @@
 public class AccountRemovalWorker extends Worker {
     public static final String TAG = "AccountRemovalWorker";
 
-    @Inject
-    UserManager userManager;
+    @Inject UserManager userManager;
 
-    @Inject
-    ArbitraryStorageManager arbitraryStorageManager;
+    @Inject ArbitraryStorageManager arbitraryStorageManager;
 
-    @Inject
-    Retrofit retrofit;
+    @Inject Retrofit retrofit;
 
-    @Inject
-    OkHttpClient okHttpClient;
+    @Inject OkHttpClient okHttpClient;
+
+    @Inject ChatMessagesDao chatMessagesDao;
+
+    @Inject ConversationsDao conversationsDao;
+
+    @Inject ChatBlocksDao chatBlocksDao;
 
     NcApi ncApi;
 
@@ -177,13 +182,22 @@ private void initiateUserDeletion(User user) {
 
             try {
                 arbitraryStorageManager.deleteAllEntriesForAccountIdentifier(user.getId());
+                deleteAllUserInfo(user);
                 deleteUser(user);
             } catch (Throwable e) {
                 Log.e(TAG, "error while trying to delete All Entries For Account Identifier", e);
             }
         }
     }
 
+    private void deleteAllUserInfo(User user) {
+        String accountId = Objects.requireNonNull(user.getId()).toString();
+        String pattern = accountId + "@%"; // ... LIKE "<accountId>@%"
+        chatMessagesDao.clearAllMessagesForUser(pattern);
+        conversationsDao.clearAllConversationsForUser(pattern);
+        chatBlocksDao.clearChatBlocksForUser(pattern);
+    }
+
     private void deleteUser(User user) {
         if (user.getId() != null) {
             String username = user.getUsername();