Merge pull request #327 from appdevforall/feat/ADFA-4988-getmore-unified-routing

ADFA-4988: Books confirm lands on the downloads screen, not back on Get More

Author: luisguzman-adfa

controller/app/src/main/java/org/iiab/controller/redesign/SetupLibraryActivity.java

@@ -329,18 +329,14 @@ public void startBooksDownload() {
             titles.add(v != null && v.length > 0 ? v[0] : "");
             urls.add(v != null && v.length > 2 ? v[2] : "");
         }
-        int count = ids.size();
         booksCart.clear();
         BooksDownloadService.start(getApplicationContext(),
                 ids.toArray(new String[0]), titles.toArray(new String[0]), urls.toArray(new String[0]));
-        // ADFA-4910: mirror the wizard's confirm — hand the picks to the background service and
-        // return to the Get More home (drop landing + confirm off the stack), instead of stranding
-        // the user on the downloads screen. The download keeps running; the landing's "View
-        // downloads" link (and the notification) let them check progress later.
-        getSupportFragmentManager().popBackStack("getmore_books",
-                androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
-        android.widget.Toast.makeText(this,
-                getString(R.string.k2go_books_dl_started_fmt, count), android.widget.Toast.LENGTH_SHORT).show();
+        // ADFA-4988: go to the downloads screen (its per-item list with download -> done checks),
+        // matching ZIM/maps/modules — instead of returning to Get More and downloading invisibly.
+        // Hint "books": the index opens the books detail when books is the only stream, else the cards.
+        startActivity(new Intent(this, SetupProgressActivity.class)
+                .putExtra(SetupProgressActivity.EXTRA_HINT_STREAM, "books"));
     }
 
     /** ADFA-4850: Books landing -> the download manager screen (per-book checklist + retry). */

controller/app/src/main/java/org/iiab/controller/redesign/SetupProgressActivity.java

@@ -45,6 +45,9 @@ public class SetupProgressActivity extends AppCompatActivity implements org.iiab
      *  ("books" -> BooksDownloadsFragment, "zim" -> ZimPreparingFragment). */
     public static final String EXTRA_OPEN_STREAM = "openStream";
 
+    /** ADFA-4988: hint from a content confirm — open this stream's detail iff it is the only active one. */
+    public static final String EXTRA_HINT_STREAM = "hintStream";
+
     private static final long READY_POLL_MS = 2000L;
     private static final long REDIRECT_MS = 3000L;
     // ADFA-4900: if the maps module queue never reports RUNNING/DONE this long after hand-off, treat
@@ -134,13 +137,28 @@ protected void onCreate(@Nullable Bundle s) {
         // so a proot-only install could finish without the index ever updating to Finish/redirect.
         ModuleQueueRepository.get().state().observe(this, st -> render());
 
-        // ADFA-4987: a download notification tapped -> land on that stream's detail (not the legacy UI).
+        // ADFA-4987: a download notification tapped -> force that stream's detail (not the legacy UI).
+        // ADFA-4988: a content confirm hints its stream -> open its detail only when it is the sole
+        // active stream, otherwise show the index.
         if (s == null) {
             String openStream = getIntent().getStringExtra(EXTRA_OPEN_STREAM);
+            String hintStream = getIntent().getStringExtra(EXTRA_HINT_STREAM);
             if (openStream != null && !openStream.isEmpty()) openDetail(openStream);
+            else if (hintStream != null && !hintStream.isEmpty()) openHintedStream(hintStream);
         }
     }
 
+    /** ADFA-4988: open the just-confirmed REST stream's detail directly when it is the ONLY active work;
+     *  otherwise keep the index. The hinted stream may not have registered its session yet (it just
+     *  started), so trust the hint and inspect only the OTHER streams, which started earlier. */
+    private void openHintedStream(String hint) {
+        boolean otherProot = mapsInSession() || moduleInSession();
+        boolean otherZim = !"zim".equals(hint) && (ZimDownloadService.hasSession() || ZimWishlist.size(this) > 0);
+        boolean otherBooks = !"books".equals(hint) && (BooksDownloadService.hasSession() || BooksWishlist.size(this) > 0);
+        if (otherProot || otherZim || otherBooks) return;   // several streams -> keep the index
+        openDetail(hint);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();