From 310ae98b84f6c4083b05a20b9f6729c0e79f992c Mon Sep 17 00:00:00 2001
From: cuj1559 <cuj1559@gmail.com>
Date: Sat, 7 Oct 2023 17:51:02 +0900
Subject: [PATCH] Updated Play billing SDK to 6.x

---
 .idea/compiler.xml                            |   2 +-
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |   2 +-
 app/build.gradle                              |  14 +-
 .../main/java/com/noti/main/Application.java  |   6 +
 .../main/receiver/media/MediaSession.java     |   2 +-
 .../main/receiver/plugin/IAPTestActivity.java |  13 +-
 .../main/service/FirebaseMessageService.java  |   4 +-
 .../main/service/NotiListenerService.java     |   6 +-
 .../main/service/media/MediaReceiver.java     |   2 +-
 .../com/noti/main/ui/SettingsActivity.java    |  21 +--
 .../noti/main/ui/options/SendPreference.java  |   2 +-
 .../noti/main/ui/pair/PairMainFragment.java   |   1 -
 .../main/ui/prefs/HistoryViewAdapter.java     |   2 +-
 .../main/ui/prefs/custom/PluginFragment.java  |   9 +-
 .../com/noti/main/utils/BillingHelper.java    | 154 ++++++------------
 .../main/utils/{ => network}/AESCrypto.java   |   2 +-
 .../{ => network}/CompressStringUtil.java     |   2 +-
 .../main/utils/{ => network}/JsonRequest.java |   2 +-
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 21 files changed, 93 insertions(+), 161 deletions(-)
 rename app/src/main/java/com/noti/main/utils/{ => network}/AESCrypto.java (98%)
 rename app/src/main/java/com/noti/main/utils/{ => network}/CompressStringUtil.java (98%)
 rename app/src/main/java/com/noti/main/utils/{ => network}/JsonRequest.java (97%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7b46144..a33cee7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3bfd1e5..e4f0676 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -91,7 +91,7 @@
       <item index="0" class="java.lang.String" itemvalue="androidx.annotation.RequiresApi" />
     </list>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 90641a7..acd53cf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,13 +5,13 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlin {
         jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of("11"))
+            languageVersion.set(JavaLanguageVersion.of("17"))
         }
     }
 
@@ -69,7 +69,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.11.0-alpha03'
     implementation 'com.google.android.gms:play-services-auth:20.7.0'
 
-    implementation platform('com.google.firebase:firebase-bom:32.2.2')
+    implementation platform('com.google.firebase:firebase-bom:32.3.1')
     implementation 'com.google.firebase:firebase-auth'
     implementation 'com.google.firebase:firebase-messaging'
     implementation 'com.google.firebase:firebase-analytics'
@@ -78,14 +78,14 @@ dependencies {
     implementation 'com.google.firebase:firebase-config'
     implementation 'com.google.firebase:firebase-storage'
 
-    implementation 'me.pushy:sdk:1.0.93'
+    implementation 'me.pushy:sdk:1.0.97'
+    implementation "com.github.mvojtkovszky:BillingHelper:2.2.1"
     implementation 'com.android.volley:volley:1.2.1'
     implementation 'com.github.bumptech.glide:glide:4.15.1'
-    implementation 'com.anjlab.android.iab.v3:library:2.0.3'
     implementation 'com.github.isradeleon:Notify-Android:1.0.4'
     implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
     implementation 'com.joaomgcd:taskerpluginlibrary:0.4.7'
-    implementation 'com.microsoft.design:fluent-system-icons:1.1.204@aar'
+    implementation 'com.microsoft.design:fluent-system-icons:1.1.218@aar'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0'
 }
 
diff --git a/app/src/main/java/com/noti/main/Application.java b/app/src/main/java/com/noti/main/Application.java
index ff5a540..d603e91 100644
--- a/app/src/main/java/com/noti/main/Application.java
+++ b/app/src/main/java/com/noti/main/Application.java
@@ -37,4 +37,10 @@ public void onCreate() {
         applicationInstance = this;
         thisDeviceType = PairDeviceType.getThisDeviceType(applicationInstance.getApplicationContext());
     }
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        BillingHelper.getInstance().Destroy();
+    }
 }
diff --git a/app/src/main/java/com/noti/main/receiver/media/MediaSession.java b/app/src/main/java/com/noti/main/receiver/media/MediaSession.java
index 5f8ea81..569d2a8 100644
--- a/app/src/main/java/com/noti/main/receiver/media/MediaSession.java
+++ b/app/src/main/java/com/noti/main/receiver/media/MediaSession.java
@@ -26,7 +26,7 @@
 import com.noti.main.Application;
 import com.noti.main.R;
 import com.noti.main.StartActivity;
-import com.noti.main.utils.CompressStringUtil;
+import com.noti.main.utils.network.CompressStringUtil;
 import com.noti.main.utils.PowerUtils;
 
 import org.json.JSONException;
diff --git a/app/src/main/java/com/noti/main/receiver/plugin/IAPTestActivity.java b/app/src/main/java/com/noti/main/receiver/plugin/IAPTestActivity.java
index bc85398..6a174a9 100644
--- a/app/src/main/java/com/noti/main/receiver/plugin/IAPTestActivity.java
+++ b/app/src/main/java/com/noti/main/receiver/plugin/IAPTestActivity.java
@@ -19,18 +19,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             mBillingHelper = BillingHelper.initialize(this);
         } else mBillingHelper = BillingHelper.getInstance();
 
-        mBillingHelper.setBillingCallback(new BillingHelper.BillingCallback() {
-            @Override
-            public void onPurchased(String productId) {
-                finish();
-            }
-
-            @Override
-            public void onUpdatePrice(Double priceValue) {
-
-            }
-        });
-
+        mBillingHelper.setBillingCallback(productId -> finish());
         mBillingHelper.Donate(this);
     }
 }
diff --git a/app/src/main/java/com/noti/main/service/FirebaseMessageService.java b/app/src/main/java/com/noti/main/service/FirebaseMessageService.java
index d75c633..1fd3ce8 100644
--- a/app/src/main/java/com/noti/main/service/FirebaseMessageService.java
+++ b/app/src/main/java/com/noti/main/service/FirebaseMessageService.java
@@ -54,8 +54,8 @@
 import com.noti.main.ui.receive.NotificationViewActivity;
 import com.noti.main.ui.receive.SmsViewActivity;
 import com.noti.main.ui.receive.TelecomViewActivity;
-import com.noti.main.utils.AESCrypto;
-import com.noti.main.utils.CompressStringUtil;
+import com.noti.main.utils.network.AESCrypto;
+import com.noti.main.utils.network.CompressStringUtil;
 import com.noti.main.utils.PowerUtils;
 
 import org.json.JSONArray;
diff --git a/app/src/main/java/com/noti/main/service/NotiListenerService.java b/app/src/main/java/com/noti/main/service/NotiListenerService.java
index 47f970a..be106b2 100644
--- a/app/src/main/java/com/noti/main/service/NotiListenerService.java
+++ b/app/src/main/java/com/noti/main/service/NotiListenerService.java
@@ -28,9 +28,9 @@
 import com.noti.main.Application;
 import com.noti.main.BuildConfig;
 import com.noti.main.service.media.MediaReceiver;
-import com.noti.main.utils.AESCrypto;
-import com.noti.main.utils.JsonRequest;
-import com.noti.main.utils.CompressStringUtil;
+import com.noti.main.utils.network.AESCrypto;
+import com.noti.main.utils.network.JsonRequest;
+import com.noti.main.utils.network.CompressStringUtil;
 import com.noti.main.service.IntervalQueries.*;
 import com.noti.main.utils.PowerUtils;
 
diff --git a/app/src/main/java/com/noti/main/service/media/MediaReceiver.java b/app/src/main/java/com/noti/main/service/media/MediaReceiver.java
index 85141b5..0dd1b0e 100644
--- a/app/src/main/java/com/noti/main/service/media/MediaReceiver.java
+++ b/app/src/main/java/com/noti/main/service/media/MediaReceiver.java
@@ -21,7 +21,7 @@
 import com.google.firebase.storage.UploadTask;
 import com.noti.main.Application;
 import com.noti.main.service.NotiListenerService;
-import com.noti.main.utils.CompressStringUtil;
+import com.noti.main.utils.network.CompressStringUtil;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/app/src/main/java/com/noti/main/ui/SettingsActivity.java b/app/src/main/java/com/noti/main/ui/SettingsActivity.java
index 3731d3e..f0d40dd 100644
--- a/app/src/main/java/com/noti/main/ui/SettingsActivity.java
+++ b/app/src/main/java/com/noti/main/ui/SettingsActivity.java
@@ -123,22 +123,14 @@ protected void onCreate(Bundle savedInstanceState) {
             mBillingHelper = BillingHelper.initialize(this);
         } else mBillingHelper = BillingHelper.getInstance();
 
-        mBillingHelper.setBillingCallback(new BillingHelper.BillingCallback() {
-            @Override
-            public void onPurchased(String productId) {
-                if (productId.equals(BillingHelper.SubscribeID)) {
-                    ServiceToggle.setEnabled(!prefs.getString("UID", "").equals(""));
-                    new RegisterForPushNotificationsAsync(SettingsActivity.this).execute();
-                }
-
-                if (SettingsActivity.onPurchasedListener != null) {
-                    SettingsActivity.onPurchasedListener.onPurchased(productId);
-                }
+        mBillingHelper.setBillingCallback(productId -> {
+            if (productId.equals(BillingHelper.SubscribeID)) {
+                ServiceToggle.setEnabled(!prefs.getString("UID", "").equals(""));
+                new RegisterForPushNotificationsAsync(SettingsActivity.this).execute();
             }
 
-            @Override
-            public void onUpdatePrice(Double priceValue) {
-
+            if (SettingsActivity.onPurchasedListener != null) {
+                SettingsActivity.onPurchasedListener.onPurchased(productId);
             }
         });
 
@@ -487,7 +479,6 @@ protected void onPostExecute(Void aVoid) {
     protected void onDestroy() {
         super.onDestroy();
         monet = null;
-        mBillingHelper.Destroy();
     }
 
     private void updateProfileImage() {
diff --git a/app/src/main/java/com/noti/main/ui/options/SendPreference.java b/app/src/main/java/com/noti/main/ui/options/SendPreference.java
index da05af5..4bc7191 100644
--- a/app/src/main/java/com/noti/main/ui/options/SendPreference.java
+++ b/app/src/main/java/com/noti/main/ui/options/SendPreference.java
@@ -34,7 +34,7 @@
 import com.noti.main.utils.BillingHelper;
 import com.noti.main.utils.ui.ToastHelper;
 import com.noti.main.ui.prefs.BlacklistActivity;
-import com.noti.main.utils.AESCrypto;
+import com.noti.main.utils.network.AESCrypto;
 
 import java.util.Set;
 
diff --git a/app/src/main/java/com/noti/main/ui/pair/PairMainFragment.java b/app/src/main/java/com/noti/main/ui/pair/PairMainFragment.java
index 6e332f1..35f3850 100644
--- a/app/src/main/java/com/noti/main/ui/pair/PairMainFragment.java
+++ b/app/src/main/java/com/noti/main/ui/pair/PairMainFragment.java
@@ -11,7 +11,6 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/noti/main/ui/prefs/HistoryViewAdapter.java b/app/src/main/java/com/noti/main/ui/prefs/HistoryViewAdapter.java
index 309b107..752f0ea 100644
--- a/app/src/main/java/com/noti/main/ui/prefs/HistoryViewAdapter.java
+++ b/app/src/main/java/com/noti/main/ui/prefs/HistoryViewAdapter.java
@@ -26,7 +26,7 @@
 import com.noti.main.R;
 import com.noti.main.service.NotiListenerService;
 import com.noti.main.utils.ui.ToastHelper;
-import com.noti.main.utils.CompressStringUtil;
+import com.noti.main.utils.network.CompressStringUtil;
 import com.noti.main.utils.ThreadProxy;
 
 import org.json.JSONArray;
diff --git a/app/src/main/java/com/noti/main/ui/prefs/custom/PluginFragment.java b/app/src/main/java/com/noti/main/ui/prefs/custom/PluginFragment.java
index 410276a..6736600 100644
--- a/app/src/main/java/com/noti/main/ui/prefs/custom/PluginFragment.java
+++ b/app/src/main/java/com/noti/main/ui/prefs/custom/PluginFragment.java
@@ -45,7 +45,7 @@
 import com.noti.main.receiver.plugin.PluginPrefs;
 import com.noti.main.receiver.plugin.PluginReceiver;
 import com.noti.main.updater.tasks.Version;
-import com.noti.main.utils.JsonRequest;
+import com.noti.main.utils.network.JsonRequest;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -236,13 +236,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             pluginListLayout.addView(layout);
         };
 
-        boolean isTelephonyPluginInstalled = isAppInstalled("com.noti.plugin.telephony");
-        boolean isLibraryTestPluginInstalled = isAppInstalled("com.noti.plugin.showcase");
-
-        if (isTelephonyPluginInstalled && isLibraryTestPluginInstalled) {
-            pluginSuggestLayout.setVisibility(View.GONE);
-        }
-
         String API_URL = "https://api.github.com/repos/choiman1559/NotiSender-PluginMarket/git/trees/master";
         JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(API_URL, response -> {
             try {
diff --git a/app/src/main/java/com/noti/main/utils/BillingHelper.java b/app/src/main/java/com/noti/main/utils/BillingHelper.java
index c2edc5c..abfe0f8 100644
--- a/app/src/main/java/com/noti/main/utils/BillingHelper.java
+++ b/app/src/main/java/com/noti/main/utils/BillingHelper.java
@@ -1,5 +1,6 @@
 package com.noti.main.utils;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 
@@ -7,29 +8,51 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.view.ContextThemeWrapper;
 
-import com.anjlab.android.iab.v3.BillingProcessor;
-import com.anjlab.android.iab.v3.PurchaseInfo;
-import com.anjlab.android.iab.v3.SkuDetails;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.common.collect.ImmutableList;
+
 import com.noti.main.Application;
 import com.noti.main.BuildConfig;
 import com.noti.main.R;
 
-import java.util.List;
+import com.vojtkovszky.billinghelper.BillingEvent;
+import com.vojtkovszky.billinghelper.BillingListener;
+
+import java.util.Objects;
 
-public class BillingHelper implements BillingProcessor.IBillingHandler {
+@SuppressLint("StaticFieldLeak")
+public class BillingHelper implements BillingListener {
 
     public static BillingHelper instance;
     public static final String SubscribeID = "sub_pro";
     public static final String DonateID = "donate_3";
+    private static boolean isNeedToConsume = false;
 
+    private Context mContext;
     private BillingCallback mBillingCallback;
-    private BillingProcessor mBillingProcessor;
+    private com.vojtkovszky.billinghelper.BillingHelper mBillingHelper;
+    private String lastPurchasedItem = "";
+
+    @Override
+    public void onBillingEvent(@NonNull BillingEvent billingEvent, @Nullable String s, @Nullable Integer integer) {
+        if (billingEvent == BillingEvent.PURCHASE_COMPLETE) {
+            if(!lastPurchasedItem.isEmpty()) {
+                instance.mBillingCallback.onPurchased(instance.lastPurchasedItem);
+                if(instance.lastPurchasedItem.equals(DonateID)) {
+                    isNeedToConsume = true;
+                    instance.mBillingHelper.endClientConnection();
+                    instance = initialize(mContext);
+                }
+                lastPurchasedItem = "";
+            }
+        } else if(billingEvent == BillingEvent.QUERY_OWNED_PURCHASES_COMPLETE && isNeedToConsume) {
+            instance.mBillingHelper.consumePurchase(Objects.requireNonNull(instance.mBillingHelper.getPurchaseWithProductName(DonateID)));
+            isNeedToConsume = false;
+        }
+    }
 
     public interface BillingCallback {
         void onPurchased(String productId);
-
-        void onUpdatePrice(Double priceValue);
     }
 
     public static BillingHelper getInstance() throws IllegalStateException {
@@ -38,41 +61,48 @@ public static BillingHelper getInstance() throws IllegalStateException {
 
     @Nullable
     public static BillingHelper getInstance(boolean needThrow) throws IllegalStateException {
-        if (instance != null && instance.mBillingProcessor.isConnected()) return instance;
-        else if(needThrow) throw new IllegalStateException("BillingHelper is not initialized");
+        if (instance != null && !instance.mBillingHelper.isConnectionFailure()) return instance;
+        else if (needThrow) throw new IllegalStateException("BillingHelper is not initialized");
         else return null;
     }
 
     public static BillingHelper initialize(Context mContext) {
-        String APIKey = mContext.getSharedPreferences(Application.PREFS_NAME, Context.MODE_PRIVATE).getString("ApiKey_Billing", "");
         BillingHelper billingHelper = new BillingHelper();
-        billingHelper.mBillingProcessor = new BillingProcessor(mContext, APIKey, billingHelper);
-        billingHelper.mBillingProcessor.initialize();
+        String APIKey = mContext.getSharedPreferences(Application.PREFS_NAME, Context.MODE_PRIVATE).getString("ApiKey_Billing", "");
+        if (APIKey.isEmpty()) throw new IllegalStateException("IAP API key is required");
 
+        billingHelper.mBillingHelper = new com.vojtkovszky.billinghelper.BillingHelper(
+                mContext,
+                ImmutableList.of(DonateID),
+                ImmutableList.of(SubscribeID),
+                true, APIKey, true, true, true,
+                BuildConfig.DEBUG, billingHelper
+        );
+
+        billingHelper.mContext = mContext;
         instance = billingHelper;
         return billingHelper;
     }
 
     public void setBillingCallback(BillingCallback callback) {
-        this.mBillingCallback = callback;
+        instance.mBillingCallback = callback;
     }
 
     public void Subscribe(Activity mContext) {
-        if (mBillingProcessor != null && mBillingProcessor.isInitialized()) {
-            mBillingProcessor.subscribe(mContext, SubscribeID);
-        }
+        instance.lastPurchasedItem = SubscribeID;
+        instance.mBillingHelper.launchPurchaseFlow(mContext, SubscribeID, null, null, null, 0);
     }
 
     public boolean isSubscribed() {
-        return mBillingProcessor.isSubscribed(SubscribeID);
+        return instance.mBillingHelper.isPurchased(SubscribeID);
     }
 
     public boolean isSubscribedOrDebugBuild() {
-        return  isSubscribed() || BuildConfig.DEBUG;
+        return isSubscribed() || BuildConfig.DEBUG;
     }
 
     public static void showSubscribeInfoDialog(Activity mContext, String cause) {
-        showSubscribeInfoDialog(mContext, cause, true,(d, w) -> {
+        showSubscribeInfoDialog(mContext, cause, true, (d, w) -> {
         });
     }
 
@@ -88,88 +118,12 @@ public static void showSubscribeInfoDialog(Activity mContext, String cause, bool
     }
 
     public void Donate(Activity mContext) {
-        if (mBillingProcessor != null && mBillingProcessor.isInitialized()) {
-            if (mBillingProcessor.isPurchased(DonateID)) {
-                mBillingProcessor.consumePurchaseAsync(DonateID, new BillingProcessor.IPurchasesResponseListener() {
-                    @Override
-                    public void onPurchasesSuccess() {
-                    }
-
-                    @Override
-                    public void onPurchasesError() {
-                    }
-                });
-            } else {
-                mBillingProcessor.purchase(mContext, DonateID);
-            }
-        }
+        instance.lastPurchasedItem = DonateID;
+        instance.mBillingHelper.launchPurchaseFlow(mContext, DonateID, null, null, null, 0);
     }
 
     public void Destroy() {
-        if (mBillingProcessor != null) {
-            mBillingProcessor.release();
-        }
-    }
-
-    @Override
-    public void onBillingInitialized() {
-        mBillingProcessor.getSubscriptionListingDetailsAsync(SubscribeID, new BillingProcessor.ISkuDetailsResponseListener() {
-            @Override
-            public void onSkuDetailsResponse(@Nullable List<SkuDetails> products) {
-                if (products != null && products.size() > 0) {
-                    SkuDetails Details = products.get(0);
-                    if (mBillingCallback != null && Details != null) {
-                        mBillingCallback.onUpdatePrice(Details.priceValue);
-                    }
-                    mBillingProcessor.loadOwnedPurchasesFromGoogleAsync(new BillingProcessor.IPurchasesResponseListener() {
-                        @Override
-                        public void onPurchasesSuccess() {
-                        }
-
-                        @Override
-                        public void onPurchasesError() {
-                        }
-                    });
-                }
-            }
-
-            @Override
-            public void onSkuDetailsError(String error) {
-            }
-        });
-    }
-
-    @Override
-    public void onProductPurchased(@NonNull String productId, @Nullable PurchaseInfo details) {
-        if (mBillingCallback != null) {
-            mBillingCallback.onPurchased(productId);
-        }
-        mBillingProcessor.loadOwnedPurchasesFromGoogleAsync(new BillingProcessor.IPurchasesResponseListener() {
-            @Override
-            public void onPurchasesSuccess() {
-            }
-
-            @Override
-            public void onPurchasesError() {
-            }
-        });
-    }
-
-    @Override
-    public void onPurchaseHistoryRestored() {
-        mBillingProcessor.loadOwnedPurchasesFromGoogleAsync(new BillingProcessor.IPurchasesResponseListener() {
-            @Override
-            public void onPurchasesSuccess() {
-            }
-
-            @Override
-            public void onPurchasesError() {
-            }
-        });
-    }
-
-    @Override
-    public void onBillingError(int errorCode, Throwable error) {
-
+        instance.mBillingHelper.endClientConnection();
+        instance.mBillingCallback = null;
     }
 }
diff --git a/app/src/main/java/com/noti/main/utils/AESCrypto.java b/app/src/main/java/com/noti/main/utils/network/AESCrypto.java
similarity index 98%
rename from app/src/main/java/com/noti/main/utils/AESCrypto.java
rename to app/src/main/java/com/noti/main/utils/network/AESCrypto.java
index 5977e15..f2bf4a5 100644
--- a/app/src/main/java/com/noti/main/utils/AESCrypto.java
+++ b/app/src/main/java/com/noti/main/utils/network/AESCrypto.java
@@ -1,4 +1,4 @@
-package com.noti.main.utils;
+package com.noti.main.utils.network;
 
 import android.util.Base64;
 
diff --git a/app/src/main/java/com/noti/main/utils/CompressStringUtil.java b/app/src/main/java/com/noti/main/utils/network/CompressStringUtil.java
similarity index 98%
rename from app/src/main/java/com/noti/main/utils/CompressStringUtil.java
rename to app/src/main/java/com/noti/main/utils/network/CompressStringUtil.java
index 3bfa835..e41c662 100644
--- a/app/src/main/java/com/noti/main/utils/CompressStringUtil.java
+++ b/app/src/main/java/com/noti/main/utils/network/CompressStringUtil.java
@@ -1,4 +1,4 @@
-package com.noti.main.utils;
+package com.noti.main.utils.network;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/app/src/main/java/com/noti/main/utils/JsonRequest.java b/app/src/main/java/com/noti/main/utils/network/JsonRequest.java
similarity index 97%
rename from app/src/main/java/com/noti/main/utils/JsonRequest.java
rename to app/src/main/java/com/noti/main/utils/network/JsonRequest.java
index 5c787be..1024dc7 100644
--- a/app/src/main/java/com/noti/main/utils/JsonRequest.java
+++ b/app/src/main/java/com/noti/main/utils/network/JsonRequest.java
@@ -1,4 +1,4 @@
-package com.noti.main.utils;
+package com.noti.main.utils.network;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/build.gradle b/build.gradle
index 666ce25..9cdf819 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 080a01d..9361a2b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 19 18:36:26 KST 2023
+#Sat Oct 07 13:29:29 KST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists