From 56a6a6de03ed01c2c4885074c445ae591866abfa Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 23 May 2023 23:03:10 +0300
Subject: [PATCH] fixed messages issue

---
 app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java | 2 +-
 app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java b/app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java
index bff8d055f..43a29097c 100644
--- a/app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java
+++ b/app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java
@@ -9,7 +9,7 @@ import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LifecycleUtils;
 
 public class BannerHook {
-    public static JSONObject convBar(JSONObject orig) throws JSONException {
+    public static JSONObject convBar(JSONObject orig) {
         return ImBanner.convBar(orig);
     }
 
diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java b/app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java
index b07f148d9..385da46cc 100644
--- a/app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java
+++ b/app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java
@@ -8,10 +8,11 @@ import org.json.JSONObject;
 public class ImBanner {
     private static final String TAG = "ImBanner";
 
-    public static JSONObject convBar(JSONObject orig) throws JSONException {
-        var user_id = orig.getJSONObject("peer").getInt("id");
+    public static JSONObject convBar(JSONObject orig) {
+        var user = orig.optJSONObject("peer");
+        var user_id = user != null ? user.optInt("id") : 0;
 
-        if (!UsersList.hasBanner(user_id) || user_id == 0) {
+        if (user_id == 0 || !UsersList.hasBanner(user_id)) {
             return null;
         }