From 3de106a3800c38340420e5df6201fc2a75b15bd7 Mon Sep 17 00:00:00 2001
From: ggg <2499528095@qq.com>
Date: Thu, 15 May 2025 10:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E7=AC=A6=E5=8F=B7?=
 =?UTF-8?q?=20notification.setLatestEventInfo...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../notes/gtask/remote/GTaskASyncTask.java    | 38 ++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e061ed5..ecae1dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Notesmaster"
+        android:theme="@style/NoteActionBarStyle"
         tools:targetApi="31">
 
         <activity
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index b3b61e7..719f867 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -63,22 +63,42 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
         });
     }
 
+//    private void showNotification(int tickerId, String content) {
+//        Notification notification = new Notification(R.drawable.notification, mContext
+//                .getString(tickerId), System.currentTimeMillis());
+//        notification.defaults = Notification.DEFAULT_LIGHTS;
+//        notification.flags = Notification.FLAG_AUTO_CANCEL;
+//        PendingIntent pendingIntent;
+//        if (tickerId != R.string.ticker_success) {
+//            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+//                    NotesPreferenceActivity.class), 0);
+//
+//        } else {
+//            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+//                    NotesListActivity.class), 0);
+//        }
+//        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+//                pendingIntent);
+//        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+//    }
+
     private void showNotification(int tickerId, String content) {
-        Notification notification = new Notification(R.drawable.notification, mContext
-                .getString(tickerId), System.currentTimeMillis());
-        notification.defaults = Notification.DEFAULT_LIGHTS;
-        notification.flags = Notification.FLAG_AUTO_CANCEL;
         PendingIntent pendingIntent;
         if (tickerId != R.string.ticker_success) {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesPreferenceActivity.class), 0);
-
+                    NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE);
         } else {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesListActivity.class), 0);
+                    NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE);
         }
-        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
-                pendingIntent);
+        Notification.Builder builder = new Notification.Builder(mContext)
+                .setAutoCancel(true)
+                .setContentTitle(mContext.getString(R.string.app_name))
+                .setContentText(content)
+                .setContentIntent(pendingIntent)
+                .setWhen(System.currentTimeMillis())
+                .setOngoing(true);
+        Notification notification=builder.getNotification();
         mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
     }
 
-- 
2.34.1