From 8299cae0adfa368ea7769008cb1210ea6405e314 Mon Sep 17 00:00:00 2001 From: p1gp1g Date: Mon, 4 Jan 2021 20:02:33 +0100 Subject: [PATCH] deleteApp: unregister connector --- .../java/com/github/gotify/messages/MessagesActivity.java | 5 +++++ .../java/com/github/gotify/service/MessagingDatabase.kt | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/gotify/messages/MessagesActivity.java b/app/src/main/java/com/github/gotify/messages/MessagesActivity.java index 07ea9a5..e873a2b 100644 --- a/app/src/main/java/com/github/gotify/messages/MessagesActivity.java +++ b/app/src/main/java/com/github/gotify/messages/MessagesActivity.java @@ -62,6 +62,7 @@ import com.github.gotify.messages.provider.MessageFacade; import com.github.gotify.messages.provider.MessageState; import com.github.gotify.messages.provider.MessageWithImage; import com.github.gotify.picasso.PicassoHandler; +import com.github.gotify.service.MessagingDatabase; import com.github.gotify.service.WebSocketService; import com.github.gotify.settings.SettingsActivity; import com.github.gotify.sharing.ShareActivity; @@ -588,6 +589,10 @@ public class MessagesActivity extends AppCompatActivity } private void deleteApp(Long appId) { + MessagingDatabase db = new MessagingDatabase(this); + db.forceUnregisterApp(appId); + db.close(); + ApiClient client = ClientFactory.clientToken(settings.url(), settings.sslSettings(), settings.token()); diff --git a/app/src/main/java/com/github/gotify/service/MessagingDatabase.kt b/app/src/main/java/com/github/gotify/service/MessagingDatabase.kt index 71571f9..3f4b01e 100644 --- a/app/src/main/java/com/github/gotify/service/MessagingDatabase.kt +++ b/app/src/main/java/com/github/gotify/service/MessagingDatabase.kt @@ -47,10 +47,10 @@ class MessagingDatabase(context: Context) : SQLiteOpenHelper(context, DB_NAME, n db.delete(TABLE_APPS,selection,selectionArgs) } - fun forceUnregisterApp(packageName: String){ + fun forceUnregisterApp(appId: Long){ val db = writableDatabase - val selection = "$FIELD_PACKAGE_NAME = ?" - val selectionArgs = arrayOf(packageName) + val selection = "$FIELD_APP_ID = ?" + val selectionArgs = arrayOf(appId.toString()) db.delete(TABLE_APPS,selection,selectionArgs) }