Updated Play billing SDK to 6.x

choiman1559 · Oct 7, 2023 · 310ae98 · 310ae98
1 parent 96a2539
commit 310ae98
Show file tree

Hide file tree

Showing 21 changed files with 93 additions and 161 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {