Attempted to fix crash on U+.

Author: 23rd

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

@@ -340,15 +340,25 @@ public static void startPushService() {
             editorCA.commit();
             ConnectionsManager.getInstance(UserConfig.selectedAccount).setPushConnectionEnabled(true);
         }
+        int pendingIntentFlags;
+        if (Build.VERSION.SDK_INT >= 34) {
+            pendingIntentFlags = PendingIntent.FLAG_IMMUTABLE;
+        } else {
+            pendingIntentFlags = PendingIntent.FLAG_MUTABLE;
+        }
         if (enabled) {
             Log.d("TFOSS", "Trying to start push service every minute");
             // Telegram-FOSS: unconditionally enable push service
             AlarmManager am = (AlarmManager) applicationContext.getSystemService(Context.ALARM_SERVICE);
             Intent i = new Intent(applicationContext, NotificationsService.class);
-            pendingIntent = PendingIntent.getBroadcast(applicationContext, 0, i, PendingIntent.FLAG_MUTABLE);
+            try {
+            pendingIntent = PendingIntent.getBroadcast(applicationContext, 0, i, pendingIntentFlags);
 
             am.cancel(pendingIntent);
             am.setRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), 60000, pendingIntent);
+            } catch (Throwable ignore) {
+                Log.d("Fork Client", "Failed to set intent");
+            }
             try {
                 Log.d("TFOSS", "Starting push service...");
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -361,13 +371,16 @@ public static void startPushService() {
             }
         } else {
             applicationContext.stopService(new Intent(applicationContext, NotificationsService.class));
-
+            try {
             PendingIntent pintent = PendingIntent.getService(applicationContext, 0, new Intent(applicationContext, NotificationsService.class), PendingIntent.FLAG_MUTABLE);
             AlarmManager alarm = (AlarmManager)applicationContext.getSystemService(Context.ALARM_SERVICE);
             alarm.cancel(pintent);
-	        if (pendingIntent != null) {
-	            alarm.cancel(pendingIntent);
-	        }
+            if (pendingIntent != null) {
+                alarm.cancel(pendingIntent);
+            }
+            } catch (Throwable ignore) {
+                Log.d("Fork Client", "Failed to set intent");
+            }
         }
     }
 

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

@@ -20,6 +20,7 @@
 import android.os.Build;
 import android.os.IBinder;
 import androidx.core.app.NotificationCompat;
+import android.util.Log;
 
 public class NotificationsService extends Service {
 
@@ -28,20 +29,30 @@ public void onCreate() {
         super.onCreate();
         ApplicationLoader.postInitApplication();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            int pendingIntentFlags;
+            if (Build.VERSION.SDK_INT >= 34) {
+                pendingIntentFlags = PendingIntent.FLAG_IMMUTABLE;
+            } else {
+                pendingIntentFlags = PendingIntent.FLAG_MUTABLE;
+            }
             String CHANNEL_ID = "push_service_channel";
             NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
             NotificationChannel channel = new NotificationChannel(CHANNEL_ID,"Push Notifications Service",NotificationManager.IMPORTANCE_DEFAULT);
             notificationManager.createNotificationChannel(channel);
             Intent explainIntent = new Intent("android.intent.action.VIEW");
             explainIntent.setData(Uri.parse("https://github.com/Telegram-FOSS-Team/Telegram-FOSS/blob/master/Notifications.md"));
-            PendingIntent explainPendingIntent = PendingIntent.getActivity(this, 0, explainIntent, PendingIntent.FLAG_MUTABLE);
+            try {
+            PendingIntent explainPendingIntent = PendingIntent.getActivity(this, 0, explainIntent, pendingIntentFlags);
             Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
                     .setContentIntent(explainPendingIntent)
                     .setShowWhen(false)
                     .setOngoing(true)
                     .setSmallIcon(R.drawable.notification)
                     .setContentText("Push service: tap to learn more").build();
             startForeground(9999,notification);
+            } catch (Throwable ignore) {
+                Log.d("Fork Client", "Failed to set intent");
+            }
         }
     }