update changelog for beta2 release

* fix a crash, if there is no internet connection while in playback (closes #60)
* agp 7.2.0 -> 7.2.1

app/build.gradle

@@ -38,21 +38,25 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
+        kotlin.sourceSets.all {
+            languageSettings.optIn("kotlin.RequiresOptIn")
+        }
     }
+    namespace 'org.mosad.teapod'
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3'
 
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
+    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
     implementation 'androidx.security:security-crypto:1.1.0-alpha03'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="org.mosad.teapod">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

app/src/main/java/org/mosad/teapod/parser/crunchyroll/Crunchyroll.kt

@@ -33,8 +33,6 @@ import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -42,7 +40,6 @@ import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
 import org.mosad.teapod.preferences.EncryptedPreferences
 import org.mosad.teapod.preferences.Preferences
-import org.mosad.teapod.util.concatenate
 
 private val json = Json { ignoreUnknownKeys = true }
 
@@ -60,7 +57,8 @@ object Crunchyroll {
 
     private lateinit var token: Token
     private var tokenValidUntil: Long = 0
-    private val tokeRefreshMutex = Mutex()
+    @OptIn(DelicateCoroutinesApi::class)
+    private val tokenRefreshContext = newSingleThreadContext("TokenRefreshContext")
 
     private var accountID = ""
 
@@ -68,7 +66,7 @@ object Crunchyroll {
     private var signature = ""
     private var keyPairID = ""
 
-    private val browsingCache = arrayListOf<Item>()
+    private val browsingCache = hashMapOf<String, BrowseResult>()
 
     /**
      * Load the pai token, see:
@@ -102,7 +100,6 @@ object Crunchyroll {
 
         var success = false// is false
         withContext(Dispatchers.IO) {
-            // TODO handle exceptions
             Log.i(TAG, "getting token ...")
 
             val status = try {
@@ -117,7 +114,7 @@ object Crunchyroll {
                 if (status == HttpStatusCode.Unauthorized) {
                     Log.e(TAG, "Could not complete login: " +
                             "${status.value} ${status.description}. " +
-                            "Propably wrong username or password")
+                            "Probably wrong username or password")
                 }
 
                 status
@@ -143,8 +140,7 @@ object Crunchyroll {
         params: List<Pair<String, Any?>> = listOf(),
         bodyObject: Any = Any()
     ): T = coroutineScope {
-        // TODO find a better way to make token refresh thread safe, currently it's blocking
+        withContext(tokenRefreshContext) {
-        tokeRefreshMutex.withLock {
             if (System.currentTimeMillis() > tokenValidUntil) refreshToken()
         }
 
@@ -255,7 +251,6 @@ object Crunchyroll {
      * General element/media functions: browse, search, objects, season_list
      */
 
-    // TODO categories
     /**
      * Browse the media available on crunchyroll.
      *
@@ -265,13 +260,14 @@ object Crunchyroll {
      * @return A **[BrowseResult]** object is returned.
      */
     suspend fun browse(
+        categories: List<Categories> = emptyList(),
         sortBy: SortBy = SortBy.ALPHABETICAL,
         seasonTag: String = "",
         start: Int = 0,
         n: Int = 10
     ): BrowseResult {
         val browseEndpoint = "/content/v1/browse"
-        val noneOptParams = listOf(
+        val parameters = mutableListOf(
             "locale" to Preferences.preferredLocale.toLanguageTag(),
             "sort_by" to sortBy.str,
             "start" to start,
@@ -279,24 +275,38 @@ object Crunchyroll {
         )
 
         // if a season tag is present add it to the parameters
-        val parameters = if (seasonTag.isNotEmpty()) {
+        if (seasonTag.isNotEmpty()) {
-            concatenate(noneOptParams, listOf("season_tag" to seasonTag))
+            parameters.add("season_tag" to seasonTag)
+        }
+
+        // if a season tag is present add it to the parameters
+        if (categories.isNotEmpty()) {
+            parameters.add("categories" to categories.joinToString(",") { it.str })
+        }
+
+        // fetch result if not already cached
+        if (browsingCache.contains(parameters.toString())) {
+            Log.d(TAG, "browse result cached: $parameters")
         } else {
-            noneOptParams
+            Log.d(TAG, "browse result not cached, fetching: $parameters")
+            val browseResult: BrowseResult = try {
+                requestGet(browseEndpoint, parameters)
+            }catch (ex: SerializationException) {
+                Log.e(TAG, "SerializationException in browse().", ex)
+                NoneBrowseResult
+            }
+
+            // if the cache has more than 100 entries clear it, so it doesn't become a memory problem
+            // Note: this value is totally guessed and should be replaced by a properly researched value
+            if (browsingCache.size > 100) {
+                browsingCache.clear()
+            }
+
+            // add results to cache
+            browsingCache[parameters.toString()] = browseResult
         }
 
-        val browseResult: BrowseResult = try {
+        return browsingCache[parameters.toString()] ?: NoneBrowseResult
-            requestGet(browseEndpoint, parameters)
-        }catch (ex: SerializationException) {
-            Log.e(TAG, "SerializationException in browse().", ex)
-            NoneBrowseResult
-        }
-
-        // add results to cache TODO improve
-        browsingCache.clear()
-        browsingCache.addAll(browseResult.items)
-
-        return browseResult
     }
 
     /**
@@ -412,6 +422,12 @@ object Crunchyroll {
         }
     }
 
+    /**
+     * Get all available seasons for a series.
+     *
+     * @param seriesId The series id for which to get the seasons
+     * @return A **[Seasons]** object with a list of **[Season]**
+     */
     suspend fun seasons(seriesId: String): Seasons {
         val seasonsEndpoint = "/cms/v2/${token.country}/M3/crunchyroll/seasons"
         val parameters = listOf(
@@ -430,6 +446,12 @@ object Crunchyroll {
         }
     }
 
+    /**
+     * Get all available episodes for a season.
+     *
+     * @param seasonId The season id for which to get the episodes
+     * @return A **[Episodes]** object with a list of **[Episode]**
+     */
     suspend fun episodes(seasonId: String): Episodes {
         val episodesEndpoint = "/cms/v2/${token.country}/M3/crunchyroll/episodes"
         val parameters = listOf(
@@ -448,6 +470,12 @@ object Crunchyroll {
         }
     }
 
+    /**
+     * Get all available subtitles and streams of a episode.
+     *
+     * @param url The playback url of a episode
+     * @return A **[Playback]** object
+     */
     suspend fun playback(url: String): Playback {
         return try {
             requestGet("", url = url)
@@ -522,8 +550,11 @@ object Crunchyroll {
 
         return try {
             requestGet(playheadsEndpoint, parameters)
-        }catch (ex: SerializationException) {
+        } catch (ex: SerializationException) {
-            Log.e(TAG, "SerializationException in upNextSeries().", ex)
+            Log.e(TAG, "SerializationException in playheads().", ex)
+            emptyMap()
+        } catch (ex: Throwable) {
+            Log.e(TAG, "Exception in playheads().", ex.cause)
             emptyMap()
         }
     }
@@ -543,9 +574,20 @@ object Crunchyroll {
             put("playhead", playhead)
         }
 
-        requestPost(playheadsEndpoint, parameters, json)
+        try {
+            requestPost(playheadsEndpoint, parameters, json)
+        } catch (ex: Throwable) {
+            Log.e(TAG, "Exception in postPlayheads()", ex.cause)
+        }
     }
 
+    /**
+     * Get similar media for a show/movie.
+     *
+     * @param seriesId The crunchyroll series id of the media
+     * @param n The maximum number of results to return, default = 10
+     * @return A **[SimilarToResult]** object
+     */
     suspend fun similarTo(seriesId: String, n: Int = 10): SimilarToResult {
         val similarToEndpoint = "/content/v1/$accountID/similar_to"
         val parameters = listOf(
@@ -611,10 +653,32 @@ object Crunchyroll {
         }
     }
 
+    suspend fun recommendations(n: Int = 20, start: Int = 0): RecommendationsList {
+        val recommendationsEndpoint = "/content/v1/$accountID/recommendations"
+        val parameters = listOf(
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "n" to n,
+            "start" to start,
+            "variant_id" to 0
+        )
+
+        return try {
+            requestGet(recommendationsEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in recommendations().", ex)
+            NoneRecommendationsList
+        }
+    }
+
     /**
      * Account/Profile functions
      */
 
+    /**
+     * Get profile information for the currently logged in account.
+     *
+     * @return A **[Profile]** object
+     */
     suspend fun profile(): Profile {
         val profileEndpoint = "/accounts/v1/me/profile"
 
@@ -626,6 +690,11 @@ object Crunchyroll {
         }
     }
 
+    /**
+     * Post the preferred content subtitle language.
+     *
+     * @param languageTag the preferred language as language tag
+     */
     suspend fun postPrefSubLanguage(languageTag: String) {
         val profileEndpoint = "/accounts/v1/me/profile"
         val json = buildJsonObject {

app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt

@@ -50,6 +50,25 @@ enum class SortBy(val str: String) {
     POPULARITY("popularity")
 }
 
+@Suppress("unused")
+enum class Categories(val str: String) {
+    ACTION("action"),
+    ADVENTURE("adventure"),
+    COMEDY("comedy"),
+    DRAMA("drama"),
+    FANTASY("fantasy"),
+    MUSIC("music"),
+    ROMANCE("romance"),
+    SCI_FI("sci-fi"),
+    SEINEN("seinen"),
+    SHOJO("shojo"),
+    SHONEN("shonen"),
+    SLICE_OF_LIFE("slice+of+life"),
+    SPORTS("sports"),
+    SUPERNATURAL("supernatural"),
+    THRILLER("thriller")
+}
+
 /**
  * token, index, account. This must pe present for the app to work!
  */
@@ -105,6 +124,7 @@ typealias SimilarToResult = Collection<Item>
 typealias DiscSeasonList = Collection<SeasonListItem>
 typealias Watchlist = Collection<Item>
 typealias ContinueWatchingList = Collection<ContinueWatchingItem>
+typealias RecommendationsList = Collection<Item>
 
 @Serializable
 data class UpNextSeriesItem(
@@ -205,8 +225,14 @@ val NoneBrowseResult = BrowseResult(0, emptyList())
 val NoneSimilarToResult = SimilarToResult(0, emptyList())
 val NoneDiscSeasonList = DiscSeasonList(0, emptyList())
 val NoneContinueWatchingList = ContinueWatchingList(0, emptyList())
+val NoneRecommendationsList = RecommendationsList(0, emptyList())
 
-val NoneUpNextSeriesItem = UpNextSeriesItem(0, false, false, NoneEpisodePanel)
+val NoneUpNextSeriesItem = UpNextSeriesItem(
+    playhead = 0,
+    fullyWatched = false,
+    neverWatched = false,
+    panel = NoneEpisodePanel
+)
 
 /**
  * series data class

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/HomeFragment.kt

@@ -61,6 +61,7 @@ class HomeFragment : Fragment() {
 
         binding.recyclerUpNext.addItemDecoration(MediaItemDecoration(9))
         binding.recyclerWatchlist.addItemDecoration(MediaItemDecoration(9))
+        binding.recyclerRecommendations.addItemDecoration(MediaItemDecoration(9))
         binding.recyclerNewTitles.addItemDecoration(MediaItemDecoration(9))
         binding.recyclerTopTen.addItemDecoration(MediaItemDecoration(9))
 
@@ -79,6 +80,12 @@ class HomeFragment : Fragment() {
             }
         )
 
+        binding.recyclerRecommendations.adapter = MediaItemListAdapter(
+            MediaItemListAdapter.OnClickListener {
+                activity?.showFragment(MediaFragment(it.id))
+            }
+        )
+
         binding.recyclerNewTitles.adapter = MediaItemListAdapter(
             MediaItemListAdapter.OnClickListener {
                 activity?.showFragment(MediaFragment(it.id))
@@ -129,6 +136,9 @@ class HomeFragment : Fragment() {
         val adapterWatchlist = binding.recyclerWatchlist.adapter as MediaItemListAdapter
         adapterWatchlist.submitList(uiState.watchlistItems.toItemMediaList())
 
+        val adapterRecommendations = binding.recyclerRecommendations.adapter as MediaItemListAdapter
+        adapterRecommendations.submitList(uiState.recommendationsItems.toItemMediaList())
+
         val adapterNewTitles = binding.recyclerNewTitles.adapter as MediaItemListAdapter
         adapterNewTitles.submitList(uiState.recentlyAddedItems.toItemMediaList())
 

app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/HomeViewModel.kt

@@ -40,6 +40,7 @@ class HomeViewModel : ViewModel()  {
         data class Normal(
             val upNextItems: List<ContinueWatchingItem>,
             val watchlistItems: List<Item>,
+            val recommendationsItems: List<Item>,
             val recentlyAddedItems: List<Item>,
             val topTenItems: List<Item>,
             val highlightItem: Item,
@@ -61,9 +62,11 @@ class HomeViewModel : ViewModel()  {
             uiState.emit(UiState.Loading)
             try {
                 // run the loading in parallel to speed up the process
-
                 val upNextJob = viewModelScope.async { Crunchyroll.upNextAccount().items }
                 val watchlistJob = viewModelScope.async { Crunchyroll.watchlist(50).items }
+                val recommendationsJob = viewModelScope.async {
+                    Crunchyroll.recommendations(20).items
+                }
                 val recentlyAddedJob = viewModelScope.async {
                     Crunchyroll.browse(sortBy = SortBy.NEWLY_ADDED, n = 50).items
                 }
@@ -77,8 +80,9 @@ class HomeViewModel : ViewModel()  {
                 val highlightItemIsWatchlist = Crunchyroll.isWatchlist(highlightItem.id)
 
                 uiState.emit(UiState.Normal(
-                    upNextJob.await(), watchlistJob.await(), recentlyAddedJob.await(),
+                    upNextJob.await(), watchlistJob.await(), recommendationsJob.await(),
-                    topTenJob.await(), highlightItem, highlightItemIsWatchlist
+                    recentlyAddedJob.await(), topTenJob.await(), highlightItem,
+                    highlightItemIsWatchlist
                 ))
             } catch (e: Exception) {
                 uiState.emit(UiState.Error(e.message))

app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerActivity.kt

@@ -462,7 +462,6 @@ class PlayerActivity : AppCompatActivity() {
                     playerBinding.buttonNextEp.isVisible = false
                 }
             })
-
     }
 
     private fun showButtonSkipOp() {

app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt

@@ -168,11 +168,12 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
             episode.id == episodeId
         } ?: NoneEpisode
 
+        // TODO improve handling of none present seasons/episodes
         // update current episode meta
         currentEpisodeMeta = if (mediaMeta is TVShowMeta && currentEpisode.episodeNumber != null) {
             (mediaMeta as TVShowMeta)
-                .seasons[currentEpisode.seasonNumber - 1]
+                .seasons.getOrNull(currentEpisode.seasonNumber - 1)
-                .episodes[currentEpisode.episodeNumber!! - 1]
+                ?.episodes?.getOrNull(currentEpisode.episodeNumber!! - 1)
         } else {
             null
         }

app/src/main/java/org/mosad/teapod/util/adapter/MediaItemAdapter.kt

@@ -2,6 +2,7 @@ package org.mosad.teapod.util.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import org.mosad.teapod.databinding.ItemMediaBinding
@@ -30,6 +31,7 @@ class MediaItemAdapter(private val items: List<ItemMedia>) : RecyclerView.Adapte
     inner class MediaViewHolder(val binding: ItemMediaBinding) :
         RecyclerView.ViewHolder(binding.root) {
         init {
+            binding.imageEpisodePlay.isVisible = false // hide the play button for media items
             binding.root.setOnClickListener {
                 onItemClick?.invoke(
                     items[bindingAdapterPosition].id,

app/src/main/res/layout/activity_player.xml

@@ -77,7 +77,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="12dp"
-        android:layout_marginBottom="70dp"
+        android:layout_marginBottom="72dp"
         android:gravity="center"
         android:text="@string/next_episode"
         android:textAllCaps="false"
@@ -93,7 +93,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="12dp"
-        android:layout_marginBottom="70dp"
+        android:layout_marginBottom="72dp"
         android:gravity="center"
         android:text="@string/skip_opening"
         android:textAllCaps="false"

app/src/main/res/layout/fragment_home.xml

@@ -163,6 +163,34 @@
                     tools:listitem="@layout/item_media" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/linear_recommendations"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingBottom="7dp">
+
+                <TextView
+                    android:id="@+id/text_recommendations"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="10dp"
+                    android:paddingTop="15dp"
+                    android:paddingEnd="5dp"
+                    android:paddingBottom="5dp"
+                    android:text="@string/recommendations"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_recommendations"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/item_media" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/linear_new_titles"
                 android:layout_width="match_parent"

app/src/main/res/layout/player_controls.xml

@@ -101,6 +101,7 @@
             android:layout_height="@dimen/player_styled_progress_layout_height"
             android:contentDescription="@string/desc_time_bar"
             app:bar_height="3dp"
+            app:touch_target_height="@dimen/player_styled_progress_layout_height"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/exo_remaining"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -9,6 +9,7 @@
     <string name="highlight_media">Highlight</string>
     <string name="up_next">Weiterschauen</string>
     <string name="my_list">Meine Liste</string>
+    <string name="recommendations">Empfehlungen</string>
     <string name="new_episodes">Neue Episoden</string>
     <string name="new_simulcasts">Neue Simulcasts</string>
     <string name="new_titles">Neue Titel</string>

app/src/main/res/values/dimens.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="player_styled_progress_layout_height">48dp</dimen>
+    <dimen name="player_styled_progress_layout_height">28dp</dimen>
     <dimen name="player_styled_progress_margin_bottom">52dp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -9,6 +9,7 @@
     <string name="highlight_media">Highlight</string>
     <string name="up_next">Up next</string>
     <string name="my_list">My list</string>
+    <string name="recommendations">Recommendations</string>
     <string name="new_episodes">New episodes</string>
     <string name="new_simulcasts">New simulcasts</string>
     <string name="new_titles">New titles</string>

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.6.10"
+    ext.kotlin_version = "1.6.21"
     ext.ktor_version = "1.6.8"
     ext.exo_version = "2.17.1"
     repositories {
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

fastlane/metadata/android/de/changelogs/9010.txt

@@ -1,4 +1,10 @@
 Dies ist der zweite beta Release von Teapod 1.0.0 mit Unterstützung für Cunchyroll.
 
 * Unterstützung für Crunchyroll hinzugefügt (Ein premium Account wird benötigt)
-* Crunchyroll metadb Unterstützung hinzugefügt
+* Crunchyroll metadb Unterstützung hinzugefügt (#54)
+* Playhead Updates lassen sich nun ausschalten
+* Ähnliche Titel zum Mediafragment hinzugefügt
+* Empfehlungen für dich zum Homefragment hinzugefügt
+* Einen Crash beim login wurde behoben
+
+Alle Änderungen https://git.mosad.xyz/Seil0/teapod/compare/1.0.0-beta1...1.0.0-beta2

fastlane/metadata/android/en-US/changelogs/9010.txt

@@ -1,4 +1,10 @@
 This is the second beta release of Teapod 1.0.0 with support for crunchyroll.
 
-* Added support for crunchyroll (a premium account is needed)
+* Support for crunchyroll (a premium account is needed)
-* Added crunchyroll metadb support
+* Crunchyroll metadb support (#54)
+* Added a option to disable playhead updates/reporting
+* Show similar titles in the media fragment
+* Added recommendations to the home fragment
+* Fixed a crash on login, which made the app unusable
+
+Full changelog https://git.mosad.xyz/Seil0/teapod/compare/1.0.0-beta1...1.0.0-beta2