chore: update dependencies

Author: omg-xtao

TMessagesProj/build.gradle

@@ -234,6 +234,7 @@ android {
         }
         resources {
             excludes += ['/fabric/**', '/META-INF/*.version', '/META-INF/*.kotlin_module', '/META-INF/native-image/**', '/builddef.lst', '/*.txt', '/DebugProbesKt.bin', '/okhttp3/internal/publicsuffix/NOTICE']
+            excludes += ["META-INF/INDEX.LIST"]  // hutool
         }
 
         def lib = "libtmessages.*.so"
@@ -353,16 +354,16 @@ dependencies {
 dependencies {
     implementation "androidx.browser:browser:1.8.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
     // OSM
-    implementation "org.osmdroid:osmdroid-android:6.1.10"
+    implementation "org.osmdroid:osmdroid-android:6.1.20"
     // okhttp
-    implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.14"
+    implementation "com.squareup.okhttp3:okhttp:5.3.2"
     implementation 'dnsjava:dnsjava:3.6.3'
 
-    implementation "cn.hutool:hutool-core:5.7.13"
-    implementation "cn.hutool:hutool-crypto:5.7.13"
-    implementation 'cn.hutool:hutool-http:5.7.5'
+    implementation "cn.hutool:hutool-core:5.8.42"
+    implementation "cn.hutool:hutool-crypto:5.8.42"
+    implementation 'cn.hutool:hutool-http:5.8.42'
     implementation "com.jakewharton:process-phoenix:3.0.0"
     // openpgp
     implementation project(":openpgp-api")
@@ -373,11 +374,11 @@ dependencies {
     // add for undo and redo
     implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:6.1'
     // add splash screen
-    implementation("androidx.core:core-splashscreen:1.0.1")
+    implementation("androidx.core:core-splashscreen:1.2.0")
     // add for emoji
     implementation 'com.jaredrummler:truetypeparser-light:1.0.0'
     // add for up
-    implementation 'org.unifiedpush.android:connector:2.5.0'
+    implementation 'org.unifiedpush.android:connector:3.1.2'
 }
 
 apply plugin: "com.google.gms.google-services"

TMessagesProj/proguard-rules.pro

@@ -34,6 +34,7 @@
 -dontwarn com.google.android.gms.**
 -dontwarn com.google.common.cache.**
 -dontwarn com.google.common.primitives.**
+-dontwarn com.google.common.util.concurrent.ListenableFuture
 -dontwarn com.googlecode.mp4parser.**
 
 -keep class com.google.android.datatransport.** { *; }
@@ -158,6 +159,9 @@
 -dontwarn org.slf4j.**
 -dontwarn org.w3c.dom.bootstrap.**
 
+-dontwarn sun.misc.Unsafe
+-dontwarn org.bouncycastle.crypto.**
+-dontwarn org.bouncycastle.asn1.**
 -dontwarn sun.net.spi.nameservice.**
 -dontwarn com.sun.jna.**
 -dontwarn javax.naming.NamingException

TMessagesProj/src/main/AndroidManifest.xml

@@ -810,14 +810,12 @@
 <!--            android:permission="android.permission.BIND_REMOTEVIEWS"-->
 <!--            android:exported="false" />-->
 
-        <receiver android:exported="true" android:enabled="true" android:name=".UnifiedPushReceiver">
+        <service android:name=".UnifiedPushService"
+            android:exported="false">
             <intent-filter>
-                <action android:name="org.unifiedpush.android.connector.MESSAGE"/>
-                <action android:name="org.unifiedpush.android.connector.UNREGISTERED"/>
-                <action android:name="org.unifiedpush.android.connector.NEW_ENDPOINT"/>
-                <action android:name="org.unifiedpush.android.connector.REGISTRATION_FAILED"/>
+                <action android:name="org.unifiedpush.android.connector.PUSH_EVENT"/>
             </intent-filter>
-        </receiver>
+        </service>
         <service android:name=".GcmPushListenerService"
             android:exported="true">
             <intent-filter>

TMessagesProj/src/main/java/org/telegram/messenger/UnifiedPushListenerServiceProvider.java

@@ -5,15 +5,14 @@
 
 import org.unifiedpush.android.connector.UnifiedPush;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class UnifiedPushListenerServiceProvider implements PushListenerController.IPushListenerServiceProvider {
-    public UnifiedPushListenerServiceProvider(){};
+    public UnifiedPushListenerServiceProvider(){}
 
     @Override
     public boolean hasServices() {
-        return !UnifiedPush.getDistributors(ApplicationLoader.applicationContext, new ArrayList<>()).isEmpty();
+        return !UnifiedPush.getDistributors(ApplicationLoader.applicationContext).isEmpty();
     }
 
     @Override
@@ -38,16 +37,16 @@ public void onRequestPushToken() {
                 SharedConfig.pushStringGetTimeStart = SystemClock.elapsedRealtime();
                 SharedConfig.saveConfig();
                 if (UnifiedPush.getAckDistributor(ApplicationLoader.applicationContext) == null) {
-                    List<String> distributors = UnifiedPush.getDistributors(ApplicationLoader.applicationContext, new ArrayList<>());
-                    if (distributors.size() > 0) {
+                    List<String> distributors = UnifiedPush.getDistributors(ApplicationLoader.applicationContext);
+                    if (!distributors.isEmpty()) {
                         String distributor =  distributors.get(0);
                         UnifiedPush.saveDistributor(ApplicationLoader.applicationContext, distributor);
                     }
                 }
-                UnifiedPush.registerApp(
+                UnifiedPush.register(
                         ApplicationLoader.applicationContext,
                         "default",
-                        new ArrayList<>(),
+                        null,
                         "Telegram Simple Push"
                 );
             } catch (Throwable e) {

…egram/messenger/UnifiedPushReceiver.java …legram/messenger/UnifiedPushService.javaTMessagesProj/src/main/java/org/telegram/messenger/UnifiedPushReceiver.java renamed to TMessagesProj/src/main/java/org/telegram/messenger/UnifiedPushService.java TMessagesProj/src/main/java/org/telegram/messenger/UnifiedPushReceiver.java renamed to TMessagesProj/src/main/java/org/telegram/messenger/UnifiedPushService.java

@@ -1,22 +1,22 @@
 package org.telegram.messenger;
 
-import android.content.Context;
 import android.os.SystemClock;
 
-import androidx.annotation.NonNull;
-
 import org.telegram.tgnet.ConnectionsManager;
 
-import org.unifiedpush.android.connector.MessagingReceiver;
+import org.unifiedpush.android.connector.FailedReason;
+import org.unifiedpush.android.connector.PushService;
 import org.unifiedpush.android.connector.UnifiedPush;
+import org.unifiedpush.android.connector.data.PushEndpoint;
+import org.unifiedpush.android.connector.data.PushMessage;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.concurrent.CountDownLatch;
 
 import xyz.nextalone.nagram.NaConfig;
 
-public class UnifiedPushReceiver extends MessagingReceiver {
+public class UnifiedPushService extends PushService {
 
     private static long lastReceivedNotification = 0;
     private static long numOfReceivedNotifications = 0;
@@ -30,27 +30,26 @@ public static long getNumOfReceivedNotifications() {
     }
 
     @Override
-    public void onNewEndpoint(Context context, String endpoint, String instance){
+    public void onNewEndpoint(PushEndpoint endpoint, String instance){
         Utilities.globalQueue.postRunnable(() -> {
             SharedConfig.pushStringGetTimeEnd = SystemClock.elapsedRealtime();
 
-            String savedDistributor = UnifiedPush.getSavedDistributor(context);
+            String savedDistributor = UnifiedPush.getSavedDistributor(this);
 
-            if (savedDistributor.equals("io.heckel.ntfy")) {
-                PushListenerController.sendRegistrationToServer(PushListenerController.PUSH_TYPE_SIMPLE, endpoint);
+            if ("io.heckel.ntfy".equals(savedDistributor)) {
+                PushListenerController.sendRegistrationToServer(PushListenerController.PUSH_TYPE_SIMPLE, endpoint.getUrl());
                 return;
             }
 
             try {
-                PushListenerController.sendRegistrationToServer(PushListenerController.PUSH_TYPE_SIMPLE, NaConfig.INSTANCE.getPushServiceTypeUnifiedGateway().String() + URLEncoder.encode(endpoint, "UTF-8"));
-            } catch (UnsupportedEncodingException e) {
-                FileLog.e(e);
+                PushListenerController.sendRegistrationToServer(PushListenerController.PUSH_TYPE_SIMPLE, NaConfig.INSTANCE.getPushServiceTypeUnifiedGateway().String() + URLEncoder.encode(endpoint.getUrl(), "UTF-8"));
+            } catch (UnsupportedEncodingException ignored) {
             }
         });
     }
 
     @Override
-    public void onMessage(Context context, byte[] message, String instance){
+    public void onMessage(PushMessage message, String instance){
         final long receiveTime = SystemClock.elapsedRealtime();
         final CountDownLatch countDownLatch = new CountDownLatch(1);
 
@@ -91,7 +90,7 @@ public void onMessage(Context context, byte[] message, String instance){
     }
 
     @Override
-    public void onRegistrationFailed(Context context, String instance){
+    public void onRegistrationFailed(FailedReason reason, String instance){
         if (BuildVars.LOGS_ENABLED) {
             FileLog.d("Failed to get endpoint");
         }
@@ -104,7 +103,7 @@ public void onRegistrationFailed(Context context, String instance){
     }
 
     @Override
-    public void onUnregistered(Context context, String instance){
+    public void onUnregistered(String instance){
         SharedConfig.pushStringStatus = "__UNIFIEDPUSH_FAILED__";
         Utilities.globalQueue.postRunnable(() -> {
             SharedConfig.pushStringGetTimeEnd = SystemClock.elapsedRealtime();

build.gradle

@@ -13,7 +13,6 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
 
         //noinspection GradleDependency
-        classpath 'cn.hutool:hutool-core:5.7.13'
         classpath "io.sentry:sentry-android-gradle-plugin:5.12.2"
         // db
         classpath "io.objectbox:objectbox-gradle-plugin:5.0.1"