From 9b29503b1717d5bd1ea530dfeb80180c500fa9a1 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Mon, 27 Jul 2026 10:08:16 +0500
Subject: [PATCH] mobile: added onRestored() that migrates each stored note in
 the appPreview prefs from its old widget ID key to the new one.

---
 .../android/app/src/main/AndroidManifest.xml  |  1 +
 .../notesnook/NotePreviewWidget.java          | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/apps/mobile/android/app/src/main/AndroidManifest.xml b/apps/mobile/android/app/src/main/AndroidManifest.xml
index 4f46df45c..877df5eca 100644
--- a/apps/mobile/android/app/src/main/AndroidManifest.xml
+++ b/apps/mobile/android/app/src/main/AndroidManifest.xml
@@ -88,6 +88,7 @@
             android:label="@string/note">
             <intent-filter>"
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_RESTORED" />
             </intent-filter>
 
             <meta-data
diff --git a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java
index 111a4b23a..f153e9f3b 100644
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java
@@ -12,6 +12,9 @@ import android.widget.RemoteViews;
 import com.google.gson.Gson;
 import com.streetwriters.notesnook.datatypes.Note;
 
+import java.util.HashSet;
+import java.util.Set;
+
 
 public class NotePreviewWidget extends AppWidgetProvider {
     static String OpenNoteId = "com.streetwriters.notesnook.OpenNoteId";
@@ -43,6 +46,44 @@ public class NotePreviewWidget extends AppWidgetProvider {
         super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
     }
 
+    /**
+     * The note shown by each widget is stored in the "appPreview" preferences under its widget id.
+     * When the system restores our widgets it hands out fresh ids, so unless we move the stored
+     * notes over to the new ids the widgets are left permanently blank with no way to recover
+     * other than removing and re-adding them.
+     *
+     * AppWidgetProvider calls onUpdate() with the new ids right after this, which re-renders them.
+     */
+    @Override
+    public void onRestored(Context context, int[] oldWidgetIds, int[] newWidgetIds) {
+        super.onRestored(context, oldWidgetIds, newWidgetIds);
+        if (oldWidgetIds == null || newWidgetIds == null) return;
+
+        int count = Math.min(oldWidgetIds.length, newWidgetIds.length);
+        SharedPreferences preferences = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE);
+
+        // Read everything up front: an old id can collide with the new id of another widget.
+        String[] notes = new String[count];
+        Set<String> newKeys = new HashSet<>();
+        for (int i = 0; i < count; i++) {
+            notes[i] = preferences.getString(String.valueOf(oldWidgetIds[i]), "");
+            newKeys.add(String.valueOf(newWidgetIds[i]));
+        }
+
+        SharedPreferences.Editor edit = preferences.edit();
+        for (int i = 0; i < count; i++) {
+            String oldKey = String.valueOf(oldWidgetIds[i]);
+            if (!newKeys.contains(oldKey)) {
+                edit.remove(oldKey);
+            }
+        }
+        for (int i = 0; i < count; i++) {
+            if (notes[i].isEmpty()) continue;
+            edit.putString(String.valueOf(newWidgetIds[i]), notes[i]);
+        }
+        edit.apply();
+    }
+
     @Override
     public void onDeleted(Context context, int[] appWidgetIds) {
         super.onDeleted(context, appWidgetIds);