Merge pull request #618 from appdevforall/feat/K2GO-441-addons-incremental-refresh

K2GO-441 feat(addons): catalog-driven incremental refresh with an "up to date" report

Author: luisguzman-adfa

controller/app/src/main/java/org/appdevforall/k2go/addons/data/AddonsRefreshClient.java

@@ -13,7 +13,7 @@
  *
  *               Contract:
  *                 POST /k2go-api/addons/refresh         -> 202 { state:"running" }
- *                 GET  /k2go-api/addons/refresh/status   -> { state, lines, downloaded, failed }
+ *                 GET  /k2go-api/addons/refresh/status   -> { state, lines, downloaded, reused, failed, upToDate }
  *                 POST /k2go-api/addons/refresh/cancel    -> { state:"cancelled" }
  * ============================================================================
  */
@@ -58,12 +58,17 @@ public interface Listener {
 
     /** The last status-tail line handed to the listener, so a poll that did not advance stays quiet. */
     private String lastEmitted;
-    private int lastDownloaded = -1, lastFailed = -1;
+    private int lastDownloaded = -1, lastReused = -1, lastFailed = -1;
+    private boolean lastUpToDate = false;
 
     /** Files downloaded in the last refresh; -1 if the box did not report it. */
     public int lastDownloaded() { return lastDownloaded; }
+    /** Files reused unchanged in the last refresh; -1 if the box did not report it (K2GO-441). */
+    public int lastReused() { return lastReused; }
     /** Files the last refresh could not fetch or verify; -1 if the box did not report it. */
     public int lastFailed() { return lastFailed; }
+    /** K2GO-441: true when the published set was unchanged, so the refresh downloaded nothing. */
+    public boolean lastUpToDate() { return lastUpToDate; }
 
     /**
      * Start the refresh if it is not already running, then poll to a terminal state. Each refresh is
@@ -127,7 +132,9 @@ private String readState(@Nullable Listener l) {
             if (!ok) return null;
             JSONObject j = new JSONObject(text.isEmpty() ? "{}" : text);
             if (j.has("downloaded")) lastDownloaded = j.optInt("downloaded", lastDownloaded);
+            if (j.has("reused")) lastReused = j.optInt("reused", lastReused);
             if (j.has("failed")) lastFailed = j.optInt("failed", lastFailed);
+            if (j.has("upToDate")) lastUpToDate = j.optBoolean("upToDate", lastUpToDate);
             if (l != null) {
                 JSONArray lines = j.optJSONArray("lines");
                 if (lines != null && lines.length() > 0) {

controller/app/src/main/java/org/appdevforall/k2go/addons/presentation/AddonsRefresh.java

@@ -128,20 +128,24 @@ private static void run(@NonNull View trigger) {
                 main.post(() -> { if (liveLine.isAttachedToWindow()) liveLine.setText(shown); });
             });
             final int failed = client.lastFailed();
+            final boolean upToDate = client.lastUpToDate();
             main.post(() -> {
                 if (!trigger.isAttachedToWindow()) return;
                 parent.removeView(progress);
                 trigger.setEnabled(true);
-                Snackbars.make(trigger, ctx.getString(messageFor(r, failed))).show();
+                Snackbars.make(trigger, ctx.getString(messageFor(r, failed, upToDate))).show();
             });
         });
     }
 
     /** Map the refresh outcome to a user message covering every state. */
-    private static int messageFor(AddonsRefreshClient.Result r, int failed) {
+    private static int messageFor(AddonsRefreshClient.Result r, int failed, boolean upToDate) {
         if (r == AddonsRefreshClient.Result.CANCELLED) return R.string.k2go_code_addons_update_cancelled;
         if (r != AddonsRefreshClient.Result.DONE) return R.string.k2go_code_addons_update_failed;   // box unreachable
         if (failed > 0) return R.string.k2go_code_addons_update_some_failed;   // some files could not be fetched
+        // K2GO-441: the box is the single source for "nothing changed" (result: up-to-date). A box that
+        // does not report it (pre-1.3.9) ran the old full mirror, so "updated" is the correct default.
+        if (upToDate) return R.string.k2go_code_addons_update_none;
         return R.string.k2go_code_addons_update_done;
     }
 }

controller/app/src/main/res/values-ar/strings.xml

@@ -1383,6 +1383,7 @@
     <string name="k2go_code_addons_update_cancelling">جارٍ الإلغاء...</string>
     <string name="k2go_code_addons_update_cancelled">تم إلغاء تحديث الإضافات</string>
     <string name="k2go_code_addons_update_done">تم تحديث الإضافات</string>
+    <string name="k2go_code_addons_update_none">الإضافات محدَّثة بالفعل</string>
     <string name="k2go_code_addons_update_failed">تعذّر تحديث الإضافات</string>
     <string name="k2go_code_addons_update_some_failed">تعذّر تحديث بعض الإضافات</string>
 </resources>

controller/app/src/main/res/values-az/strings.xml

@@ -1403,6 +1403,7 @@
     <string name="k2go_code_addons_update_cancelling">Ləğv edilir...</string>
     <string name="k2go_code_addons_update_cancelled">Əlavələrin yenilənməsi ləğv edildi</string>
     <string name="k2go_code_addons_update_done">Əlavələr yeniləndi</string>
+    <string name="k2go_code_addons_update_none">Əlavələr artıq günceldir</string>
     <string name="k2go_code_addons_update_failed">Əlavələri yeniləmək mümkün olmadı</string>
     <string name="k2go_code_addons_update_some_failed">Bəzi əlavələri yeniləmək mümkün olmadı</string>
 </resources>

controller/app/src/main/res/values-bg/strings.xml

@@ -1390,6 +1390,7 @@
     <string name="k2go_code_addons_update_cancelling">Отказване...</string>
     <string name="k2go_code_addons_update_cancelled">Актуализирането на добавките е отменено</string>
     <string name="k2go_code_addons_update_done">Добавките са актуализирани</string>
+    <string name="k2go_code_addons_update_none">Добавките вече са актуални</string>
     <string name="k2go_code_addons_update_failed">Добавките не могат да бъдат актуализирани</string>
     <string name="k2go_code_addons_update_some_failed">Някои добавки не можаха да бъдат актуализирани</string>
 </resources>

controller/app/src/main/res/values-bn/strings.xml

@@ -1396,6 +1396,7 @@
     <string name="k2go_code_addons_update_cancelling">বাতিল করা হচ্ছে...</string>
     <string name="k2go_code_addons_update_cancelled">অ্যাড-অন আপডেট বাতিল করা হয়েছে</string>
     <string name="k2go_code_addons_update_done">অ্যাড-অন আপডেট করা হয়েছে</string>
+    <string name="k2go_code_addons_update_none">অ্যাড-অনগুলি ইতিমধ্যে হালনাগাদ</string>
     <string name="k2go_code_addons_update_failed">অ্যাড-অন আপডেট করা যায়নি</string>
     <string name="k2go_code_addons_update_some_failed">কিছু অ্যাড-অন আপডেট করা যায়নি</string>
 </resources>

controller/app/src/main/res/values-cs/strings.xml

@@ -1390,6 +1390,7 @@
     <string name="k2go_code_addons_update_cancelling">Rušení...</string>
     <string name="k2go_code_addons_update_cancelled">Aktualizace doplňků zrušena</string>
     <string name="k2go_code_addons_update_done">Doplňky aktualizovány</string>
+    <string name="k2go_code_addons_update_none">Doplňky jsou již aktuální</string>
     <string name="k2go_code_addons_update_failed">Doplňky se nepodařilo aktualizovat</string>
     <string name="k2go_code_addons_update_some_failed">Některé doplňky se nepodařilo aktualizovat</string>
 </resources>

controller/app/src/main/res/values-de/strings.xml

@@ -1383,6 +1383,7 @@
     <string name="k2go_code_addons_update_cancelling">Wird abgebrochen...</string>
     <string name="k2go_code_addons_update_cancelled">Add-on-Aktualisierung abgebrochen</string>
     <string name="k2go_code_addons_update_done">Add-ons aktualisiert</string>
+    <string name="k2go_code_addons_update_none">Add-ons sind bereits aktuell</string>
     <string name="k2go_code_addons_update_failed">Add-ons konnten nicht aktualisiert werden</string>
     <string name="k2go_code_addons_update_some_failed">Einige Add-ons konnten nicht aktualisiert werden</string>
 </resources>

controller/app/src/main/res/values-el/strings.xml

@@ -1390,6 +1390,7 @@
     <string name="k2go_code_addons_update_cancelling">Ακύρωση...</string>
     <string name="k2go_code_addons_update_cancelled">Η ενημέρωση προσθέτων ακυρώθηκε</string>
     <string name="k2go_code_addons_update_done">Τα πρόσθετα ενημερώθηκαν</string>
+    <string name="k2go_code_addons_update_none">Τα πρόσθετα είναι ήδη ενημερωμένα</string>
     <string name="k2go_code_addons_update_failed">Δεν ήταν δυνατή η ενημέρωση των προσθέτων</string>
     <string name="k2go_code_addons_update_some_failed">Ορισμένα πρόσθετα δεν ήταν δυνατό να ενημερωθούν</string>
 </resources>

controller/app/src/main/res/values-es/strings.xml

@@ -1459,6 +1459,7 @@
     <string name="k2go_code_addons_update_cancelling">Cancelando...</string>
     <string name="k2go_code_addons_update_cancelled">Actualización de complementos cancelada</string>
     <string name="k2go_code_addons_update_done">Complementos actualizados</string>
+    <string name="k2go_code_addons_update_none">Complementos ya actualizados</string>
     <string name="k2go_code_addons_update_failed">No se pudieron actualizar los complementos</string>
     <string name="k2go_code_addons_update_some_failed">Algunos complementos no se pudieron actualizar</string>
 </resources>