Merge branch 'release/1.16.1'

Author: io7m

README-CHANGES.xml

@@ -651,7 +651,7 @@
         </c:change>
       </c:changes>
     </c:release>
-    <c:release date="2025-05-20T08:40:27+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.16.0">
+    <c:release date="2025-05-28T09:56:23+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.16.1">
       <c:changes>
         <c:change date="2025-04-28T00:00:00+00:00" summary="Completely rewrite all catalog views.">
           <c:tickets>
@@ -668,7 +668,7 @@
             <c:ticket id="PP-1855"/>
           </c:tickets>
         </c:change>
-        <c:change date="2025-05-20T08:40:27+00:00" summary="New book details page.">
+        <c:change date="2025-05-20T00:00:00+00:00" summary="New book details page.">
           <c:tickets>
             <c:ticket id="PP-1087"/>
           </c:tickets>

gradle.properties

@@ -11,7 +11,7 @@ POM_SCM_CONNECTION=scm:git:git://github.com/ThePalaceProject/android-core
 POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/ThePalaceProject/android-core
 POM_SCM_URL=http://github.com/ThePalaceProject/android-core
 POM_URL=http://github.com/ThePalaceProject/android-core
-VERSION_NAME=1.16.0-SNAPSHOT
+VERSION_NAME=1.16.1
 VERSION_CODE_BASE=70000
 
 android.useAndroidX=true

simplified-ui/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedPagingDataAdapter.kt

@@ -65,7 +65,7 @@ class CatalogFeedPagingDataAdapter(
   private val onBookViewerOpen: (Book, BookFormat) -> Unit,
   private val onBookDelete: (CatalogBookStatus<*>) -> Unit,
   private val onShowTaskError: (TaskResult.Failure<*>) -> Unit,
-) : PagingDataAdapter<FeedEntry, CatalogFeedPagingDataAdapter.ViewHolder>(org.nypl.simplified.ui.catalog.CatalogFeedPagingDataAdapter.Companion.diffCallback) {
+) : PagingDataAdapter<FeedEntry, CatalogFeedPagingDataAdapter.ViewHolder>(diffCallback) {
 
   companion object {
     private val loanEndFormatter =
@@ -785,26 +785,6 @@ class CatalogFeedPagingDataAdapter(
       this.idleButtons.removeAllViews()
     }
 
-    /**
-     * XXX: This information really should be available somewhere else. This was ported from
-     * existing code.
-     */
-
-    private fun getLoanDurationText(
-      book: Book
-    ): String {
-      val endDate = this.getLoanDuration(book)
-      return if (endDate != null) {
-        CatalogBookAvailabilityStrings.intervalStringLoanDuration(
-          this.view.context.resources,
-          DateTime.now(),
-          endDate
-        )
-      } else {
-        ""
-      }
-    }
-
     private fun getLoanDuration(
       book: Book
     ): DateTime? {

simplified-ui/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedViewDetails2.kt

@@ -91,6 +91,7 @@ class CatalogFeedViewDetails2(
   private val covers: BookCoverProviderType,
   private val onToolbarBackPressed: () -> Unit,
   private val onShowErrorDetails: (TaskResult.Failure<*>) -> Unit,
+  private val onBookSAMLDownloadRequested: (CatalogBookStatus<DownloadWaitingForExternalAuthentication>) -> Unit,
   private val onBookBorrowRequested: (CatalogBorrowParameters) -> Unit,
   private val onBookBorrowCancelRequested: (CatalogBookStatus<*>) -> Unit,
   private val onBookCanBeRevoked: (CatalogBookStatus<*>) -> Boolean,
@@ -761,6 +762,7 @@ class CatalogFeedViewDetails2(
       container: ViewGroup,
       covers: BookCoverProviderType,
       onShowErrorDetails: (TaskResult.Failure<*>) -> Unit,
+      onBookSAMLDownloadRequested: (CatalogBookStatus<DownloadWaitingForExternalAuthentication>) -> Unit,
       onBookBorrowRequested: (CatalogBorrowParameters) -> Unit,
       onBookBorrowCancelRequested: (CatalogBookStatus<*>) -> Unit,
       onBookCanBeRevoked: (CatalogBookStatus<*>) -> Boolean,
@@ -777,6 +779,7 @@ class CatalogFeedViewDetails2(
         layoutInflater = layoutInflater,
         covers = covers,
         onToolbarBackPressed = onToolbarBackPressed,
+        onBookSAMLDownloadRequested = onBookSAMLDownloadRequested,
         onShowErrorDetails = onShowErrorDetails,
         onBookBorrowRequested = onBookBorrowRequested,
         onBookBorrowCancelRequested = onBookBorrowCancelRequested,
@@ -1376,6 +1379,8 @@ class CatalogFeedViewDetails2(
         this.setProgress(0.0)
       }
     }
+
+    this.onBookSAMLDownloadRequested(status)
   }
 
   private fun onBookStatusDownloadExternalAuthenticationInProgress(

simplified-ui/src/main/java/org/nypl/simplified/ui/catalog/CatalogFragment.kt

@@ -36,14 +36,6 @@ import org.nypl.simplified.feeds.api.FeedEntry
 import org.nypl.simplified.feeds.api.FeedFacet
 import org.nypl.simplified.feeds.api.FeedLoaderType
 import org.nypl.simplified.feeds.api.FeedSearch
-import org.nypl.simplified.opds.core.OPDSAvailabilityHeld
-import org.nypl.simplified.opds.core.OPDSAvailabilityHeldReady
-import org.nypl.simplified.opds.core.OPDSAvailabilityHoldable
-import org.nypl.simplified.opds.core.OPDSAvailabilityLoanable
-import org.nypl.simplified.opds.core.OPDSAvailabilityLoaned
-import org.nypl.simplified.opds.core.OPDSAvailabilityMatcherType
-import org.nypl.simplified.opds.core.OPDSAvailabilityOpenAccess
-import org.nypl.simplified.opds.core.OPDSAvailabilityRevoked
 import org.nypl.simplified.profiles.controller.api.ProfileFeedRequest
 import org.nypl.simplified.profiles.controller.api.ProfilesControllerType
 import org.nypl.simplified.taskrecorder.api.TaskResult
@@ -84,6 +76,7 @@ import org.thepalaceproject.opds.client.OPDSState.LoadedFeedWithoutGroups
 import org.thepalaceproject.opds.client.OPDSState.Loading
 import java.net.URI
 import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicReference
 
 /**
  * The fragment used for the catalog.
@@ -316,20 +309,21 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
   ) {
     val view =
       CatalogFeedViewDetails2.create(
-        layoutInflater = this.layoutInflater,
-        screenSize = this.screenSize,
         container = this.contentContainer,
         covers = this.covers,
-        onShowErrorDetails = this::onShowErrorDetails,
-        onBookBorrowRequested = this::onBookBorrowRequested,
+        layoutInflater = this.layoutInflater,
         onBookBorrowCancelRequested = this::onBookBorrowCancelRequested,
+        onBookBorrowRequested = this::onBookBorrowRequested,
         onBookCanBeRevoked = this::onBookCanBeRevoked,
         onBookPreviewOpenRequested = this::onBookPreviewOpenRequested,
         onBookRevokeRequested = this::onBookRevokeRequested,
+        onBookSAMLDownloadRequested = this::onBookSAMLDownloadRequested,
+        onBookSelected = this::onBookSelected,
         onBookViewerOpen = this::onBookViewerOpen,
-        onToolbarBackPressed = this::onToolbarBackPressed,
         onFeedSelected = this::onFeedSelected,
-        onBookSelected = this::onBookSelected
+        onShowErrorDetails = this::onShowErrorDetails,
+        onToolbarBackPressed = this::onToolbarBackPressed,
+        screenSize = this.screenSize
       )
 
     when (val entry = this.opdsClient.entry.get()) {
@@ -373,8 +367,6 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
       }
     }
 
-    this.onStateChangeToDetailsConfigureToolbar(newState, view)
-
     /*
      * Subscribe to the entry on the OPDS client. We'll receive the initial
      * entry on subscription.
@@ -478,25 +470,6 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
     }
   }
 
-  private fun onStateChangeToDetailsConfigureToolbar(
-    newState: LoadedFeedEntry,
-    view: CatalogFeedViewDetails2
-  ) {
-    try {
-      val account =
-        this.profiles.profileCurrent()
-          .account(newState.request.entry.accountID)
-
-      val title =
-        when (val e = newState.request.entry) {
-          is FeedEntry.FeedEntryCorrupt -> ""
-          is FeedEntry.FeedEntryOPDS -> e.feedEntry.title
-        }
-    } catch (e: Throwable) {
-      // Nothing sensible we can do about this.
-    }
-  }
-
   private fun onBookBorrowRequested(
     parameters: CatalogBorrowParameters
   ) {
@@ -577,64 +550,6 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
     }
   }
 
-  /**
-   * Determine whether or not a book can be "deleted".
-   *
-   * A book can be deleted if:
-   *
-   * * It is loaned, downloaded, and not revocable (because otherwise, a revocation is needed).
-   * * It is loanable, but there is a book database entry for it
-   * * It is open access but there is a book database entry for it
-   */
-
-  private fun onBookCanBeDeleted(
-    status: CatalogBookStatus<*>
-  ): Boolean {
-    return try {
-      val services =
-        Services.serviceDirectory()
-      val profiles =
-        services.requireService(ProfilesControllerType::class.java)
-      val book =
-        status.book
-      val profile =
-        profiles.profileCurrent()
-      val account =
-        profile.account(book.account)
-
-      return if (account.bookDatabase.books().contains(book.id)) {
-        book.entry.availability.matchAvailability(
-          object : OPDSAvailabilityMatcherType<Boolean, Exception> {
-            override fun onHeldReady(availability: OPDSAvailabilityHeldReady): Boolean =
-              false
-
-            override fun onHeld(availability: OPDSAvailabilityHeld): Boolean =
-              false
-
-            override fun onHoldable(availability: OPDSAvailabilityHoldable): Boolean =
-              false
-
-            override fun onLoaned(availability: OPDSAvailabilityLoaned): Boolean =
-              availability.revoke.isNone && book.isDownloaded
-
-            override fun onLoanable(availability: OPDSAvailabilityLoanable): Boolean =
-              true
-
-            override fun onOpenAccess(availability: OPDSAvailabilityOpenAccess): Boolean =
-              true
-
-            override fun onRevoked(availability: OPDSAvailabilityRevoked): Boolean =
-              false
-          })
-      } else {
-        false
-      }
-    } catch (e: Throwable) {
-      this.logger.debug("could not determine if the book could be deleted: ", e)
-      false
-    }
-  }
-
   private fun onBookCanBeRevoked(
     status: CatalogBookStatus<*>
   ): Boolean {
@@ -702,12 +617,6 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
     )
   }
 
-  private fun onBookResetStatusInitial(
-    status: CatalogBookStatus<*>
-  ) {
-    // XXX: Unclear what the point of this method ever was...
-  }
-
   private fun onBookViewerOpen(
     book: Book,
     bookFormat: BookFormat
@@ -725,12 +634,6 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
     )
   }
 
-  private fun onBookReserveRequested(
-    parameters: CatalogBorrowParameters
-  ) {
-    this.onBookBorrowRequested(parameters)
-  }
-
   private fun onStateChangedToGroups(
     newState: LoadedFeedWithGroups
   ) {
@@ -860,8 +763,8 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
   ) {
     val feedHandle =
       newState.handle
-    val feedPosition =
-      feedHandle.scrollPositionGet()
+    val feedPositionInitial =
+      AtomicReference(feedHandle.scrollPositionGet())
     val feed =
       feedHandle.feed()
 
@@ -931,7 +834,7 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
           val position =
             linearLayoutManager.findFirstVisibleItemPosition()
 
-          // logger.trace("Saving scroll position {}", position)
+          logger.trace("Saving scroll position {}", position)
           feedHandle.scrollPositionSave(position)
         }
       })
@@ -995,11 +898,24 @@ sealed class CatalogFragment : Fragment(), MainBackButtonConsumerType {
     this.switchView(view)
 
     /*
-     * Set up a listener to restore the scroll position.
+     * Set up a listener to restore the scroll position. This works around multiple pieces of
+     * Android brokenness: Restoring the scroll position when we navigate to a book detail page
+     * and back again, and also properly handling scrolling when new feed pages come in. With
+     * the current RecyclerView, not explicitly storing and restoring the scroll position results
+     * in all kinds of scroll issues when new pages are loaded.
      */
 
     feedAdapter.addOnPagesUpdatedListener {
-      // this.logger.trace("Restoring scroll position {}", feedPosition)
+      val feedPosition: Int
+      val initial = feedPositionInitial.get()
+      if (initial == null) {
+        feedPosition = feedHandle.scrollPositionGet()
+        // this.logger.trace("Restoring scroll position {}", feedPosition)
+      } else {
+        feedPositionInitial.set(null)
+        feedPosition = initial
+        // this.logger.trace("Restoring scroll position (initial) {}", feedPosition)
+      }
       view.listView.scrollToPosition(feedPosition)
     }
   }

simplified-ui/src/main/java/org/nypl/simplified/ui/catalog/CatalogToolbar.kt

@@ -111,7 +111,7 @@ class CatalogToolbar(
     this.searchText.visibility = View.VISIBLE
     this.text.visibility = View.INVISIBLE
 
-    this.text.postDelayed({ this.text.requestFocus() }, 100)
+    this.text.postDelayed({ this.searchText.requestFocus() }, 100)
     this.text.postDelayed({ this.keyboardShow() }, 100)
   }