fix handling of subscription pushes

or-else · or-else · commit cb4a0dbdd33c · 2022-07-02T15:04:31.000-07:00
diff --git a/tinodesdk/src/main/java/co/tinode/tinodesdk/Tinode.java b/tinodesdk/src/main/java/co/tinode/tinodesdk/Tinode.java
@@ -812,9 +812,6 @@ public void oobNotification(Map<String, String> data, String authToken) {
                     if (disconnect) {
                         disconnect(true);
                     }
-                } else if (new Acs(data.get("modeGiven"), data.get("modeWant")).isNone()) {
-                    // Topic deleted.
-                    topic.expunge(false);
                 }
                 break;
             default:
@@ -863,7 +860,7 @@ public String getMyId() {
      * @param uid ID of the user to check.
      * @return true if the ID belong to the current user, false otherwise.
      */
-    public boolean isMe(String uid) {
+    public boolean isMe(@Nullable String uid) {
         return mMyUid != null && mMyUid.equals(uid);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -812,9 +812,6 @@ public void oobNotification(Map<String, String> data, String authToken) {`
`812`	`812`	`if (disconnect) {`
`813`	`813`	`disconnect(true);`
`814`	`814`	`}`
`815`		`- } else if (new Acs(data.get("modeGiven"), data.get("modeWant")).isNone()) {`
`816`		`- // Topic deleted.`
`817`		`- topic.expunge(false);`
`818`	`815`	`}`
`819`	`816`	`break;`
`820`	`817`	`default:`
`@@ -863,7 +860,7 @@ public String getMyId() {`
`863`	`860`	`* @param uid ID of the user to check.`
`864`	`861`	`* @return true if the ID belong to the current user, false otherwise.`
`865`	`862`	`*/`
`866`		`- public boolean isMe(String uid) {`
	`863`	`+ public boolean isMe(@Nullable String uid) {`
`867`	`864`	`return mMyUid != null && mMyUid.equals(uid);`
`868`	`865`	`}`
`869`	`866`