refresh access token, if it is expired, before doing a request

next_episode_id can be non null, even if it's the last episode

README.md

@@ -1,13 +1,14 @@
 # Teapod
 
-Teapod is a unofficial App for Crunchyroll. It allows you to watch all your favourite animes from Crunchyroll on your android device. To use Teapod you need to have a account at Crunchyroll.
+Teapod is a unofficial App for Anime on Demand (AoD). It allows you to watch all your favourite animes from AoD on your android device. To use Teapod you need to have a subscription to AoD.
 
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="75">](https://f-droid.org/de/packages/org.mosad.teapod/)
 
 ## Features
-* Watch all animes from Crunchyroll on your Android device
+* Watch all animes from AoD on your Android device
 * Native Player based on ExoPayer
 * Prefer the OmU version via the app settings
+* Save your favorite animes to "My List"
 
 ## Screenshots
 [<img src="https://www.mosad.xyz/images/Teapod/Teapod_Home.webp" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Home.webp)
@@ -16,10 +17,10 @@ Teapod is a unofficial App for Crunchyroll. It allows you to watch all your favo
 [<img src="https://www.mosad.xyz/images/Teapod/Teapod_Search.webp" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Search.webp)
 
 ### License
-Teapod is licensed under the terms and conditions of GPL 3. This Project is not associated with Crunchyroll in any way.
+Teapod is licensed under the terms and conditions of GPL 3. This Project is not associated with Anime on Demand in any way. But they allow open source apps for their service.
 
 ### Contributing
-Currently you need to have an Crunchyroll account to contribute to Teapod. Contributing without one is impossible.If you want to contribute to Teapod and need an account on this gitea instance, please write an email.
+Currently you need to have an AoD account to contribute to Teapod. Contributing without on is kind of impossible.If you want to contribute to Teapod and need an account on this gitea instance, please write me an email.
 
 ### [FAQ](https://git.mosad.xyz/Seil0/teapod/wiki#hilfe)
 

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "org.mosad.teapod"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 9000 //00.09.000
+        versionCode 4200 //00.04.200
-        versionName "1.0.0-beta1"
+        versionName "1.0.0-alpha3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resValue "string", "build_time", buildTime()
@@ -59,21 +59,22 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
 
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'com.google.code.gson:gson:2.8.8' // TODO remove, still used by metadb
+    implementation 'com.google.code.gson:gson:2.8.8'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.15.0'
     implementation 'com.google.android.exoplayer:exoplayer-hls:2.15.0'
     implementation 'com.google.android.exoplayer:exoplayer-dash:2.15.0'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.0'
     implementation 'com.google.android.exoplayer:extension-mediasession:2.15.0'
 
+    implementation 'org.jsoup:jsoup:1.14.2'
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
-    implementation 'com.afollestad.material-dialogs:core:3.3.0' // TODO remove once unused
+    implementation 'com.afollestad.material-dialogs:core:3.3.0'
-    implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0' // TODO remove once unused
+    implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0'
 
-    implementation "io.ktor:ktor-client-core:$ktor_version"
+    implementation 'com.github.kittinunf.fuel:fuel:2.3.1'
-    implementation "io.ktor:ktor-client-android:$ktor_version"
+    implementation 'com.github.kittinunf.fuel:fuel-android:2.3.1'
-    implementation "io.ktor:ktor-client-serialization:$ktor_version"
+    implementation 'com.github.kittinunf.fuel:fuel-json:2.3.1'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

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

@@ -1,40 +1,16 @@
-/**
- * Teapod
- *
- * Copyright 2020-2022  <seil0@mosad.xyz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
 package org.mosad.teapod.parser.crunchyroll
 
 import android.util.Log
-import io.ktor.client.*
+import com.github.kittinunf.fuel.Fuel
-import io.ktor.client.call.*
+import com.github.kittinunf.fuel.core.FuelError
-import io.ktor.client.features.json.*
+import com.github.kittinunf.fuel.core.Parameters
-import io.ktor.client.features.json.serializer.*
+import com.github.kittinunf.fuel.core.extensions.jsonBody
-import io.ktor.client.request.*
+import com.github.kittinunf.fuel.json.FuelJson
-import io.ktor.client.request.forms.*
+import com.github.kittinunf.fuel.json.responseJson
-import io.ktor.client.statement.*
+import com.github.kittinunf.result.Result
-import io.ktor.http.*
 import kotlinx.coroutines.*
-import kotlinx.serialization.SerializationException
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
 import org.mosad.teapod.preferences.EncryptedPreferences
@@ -44,18 +20,11 @@ import org.mosad.teapod.util.concatenate
 private val json = Json { ignoreUnknownKeys = true }
 
 object Crunchyroll {
-    private val TAG = javaClass.name
 
-    private val client = HttpClient {
-        install(JsonFeature) {
-            serializer = KotlinxSerializer(json)
-        }
-    }
     private const val baseUrl = "https://beta-api.crunchyroll.com"
-    private const val basicApiTokenUrl = "https://gitlab.com/-/snippets/2274956/raw/main/snippetfile1.txt"
-    private var basicApiToken: String = ""
 
-    private lateinit var token: Token
+    private var accessToken = ""
+    private var tokenType = ""
     private var tokenValidUntil: Long = 0
 
     private var accountID = ""
@@ -64,20 +33,11 @@ object Crunchyroll {
     private var signature = ""
     private var keyPairID = ""
 
-    private val browsingCache = arrayListOf<Item>()
+    // TODO temp helper vary
+    private var locale: String = Preferences.preferredLocal.toLanguageTag()
+    private var country: String = Preferences.preferredLocal.country
 
-    /**
+    private val browsingCache = arrayListOf<Item>()
-     * Load the pai token, see:
-     * https://git.mosad.xyz/mosad/NonePublicIssues/issues/1
-     *
-     * TODO handle empty file
-     */
-    fun initBasicApiToken() = runBlocking {
-        withContext(Dispatchers.IO) {
-            basicApiToken = (client.get(basicApiTokenUrl) as HttpResponse).readText()
-            Log.i(TAG, "basic auth token: $basicApiToken")
-        }
-    }
 
     /**
      * Login to the crunchyroll API.
@@ -89,24 +49,39 @@ object Crunchyroll {
      */
     fun login(username: String, password: String): Boolean = runBlocking {
         val tokenEndpoint = "/auth/v1/token"
-        val formData = Parameters.build {
+        val formData = listOf(
-            append("username", username)
+            "username" to username,
-            append("password", password)
+            "password" to password,
-            append("grant_type", "password")
+            "grant_type" to "password",
-            append("scope", "offline_access")
+            "scope" to "offline_access"
-        }
+        )
 
-        var success = false// is false
+        var success: Boolean // is false
         withContext(Dispatchers.IO) {
-            // TODO handle exceptions
+            val (request, response, result) = Fuel.post("$baseUrl$tokenEndpoint", parameters = formData)
-            val response: HttpResponse = client.submitForm("$baseUrl$tokenEndpoint", formParameters = formData) {
+                .header("Content-Type", "application/x-www-form-urlencoded")
-                header("Authorization", "Basic $basicApiToken")
+                .appendHeader(
-            }
+                    "Authorization",
-            token = response.receive()
+                    "Basic "
-            tokenValidUntil = System.currentTimeMillis() + (token.expiresIn * 1000)
+                )
+                .responseJson()
 
-            Log.i(TAG, "login complete with code ${response.status}")
+            // TODO fix JSONException: No value for
-            success = (response.status == HttpStatusCode.OK)
+            result.component1()?.obj()?.let {
+                accessToken = it.get("access_token").toString()
+                tokenType = it.get("token_type").toString()
+
+                // token will be invalid 1 sec
+                val expiresIn = (it.get("expires_in").toString().toLong() - 1)
+                tokenValidUntil = System.currentTimeMillis() + (expiresIn * 1000)
+            }
+
+//            println("request: $request")
+//            println("response: $response")
+//            println("response: $result")
+
+            Log.i(javaClass.name, "login complete with code ${response.statusCode}")
+            success = (response.statusCode == 200)
         }
 
         return@runBlocking success
@@ -120,74 +95,56 @@ object Crunchyroll {
      * Requests: get, post, delete
      */
 
-    private suspend inline fun <reified T> request(
+    private suspend fun request(
-        url: String,
+        endpoint: String,
-        httpMethod: HttpMethod,
+        params: Parameters = listOf(),
-        params: List<Pair<String, Any?>> = listOf(),
+        url: String = ""
-        bodyObject: Any = Any()
+    ): Result<FuelJson, FuelError> = coroutineScope {
-    ): T = coroutineScope {
+        val path = url.ifEmpty { "$baseUrl$endpoint" }
         if (System.currentTimeMillis() > tokenValidUntil) refreshToken()
 
         return@coroutineScope (Dispatchers.IO) {
-            val response: T = client.request(url) {
+            val (request, response, result) = Fuel.get(path, params)
-                method = httpMethod
+                .header("Authorization", "$tokenType $accessToken")
-                header("Authorization", "${token.tokenType} ${token.accessToken}")
+                .responseJson()
-                params.forEach {
-                    parameter(it.first, it.second)
-                }
 
-                // for json set body and content type
+//            println("request request: $request")
-                if (bodyObject is JsonObject) {
+//            println("request response: $response")
-                    body = bodyObject
+//            println("request result: $result")
-                    contentType(ContentType.Application.Json)
-                }
-            }
 
-            response
+            result
         }
     }
 
-    private suspend inline fun <reified T> requestGet(
-        endpoint: String,
-        params: List<Pair<String, Any?>> = listOf(),
-        url: String = ""
-    ): T {
-        val path = url.ifEmpty { "$baseUrl$endpoint" }
-
-        return request(path, HttpMethod.Get, params)
-    }
-
     private suspend fun requestPost(
         endpoint: String,
-        params: List<Pair<String, Any?>> = listOf(),
+        params: Parameters = listOf(),
-        bodyObject: JsonObject
+        body: String
-    ) {
+    ) = coroutineScope {
         val path = "$baseUrl$endpoint"
+        if (System.currentTimeMillis() > tokenValidUntil) refreshToken()
 
-        val response: HttpResponse = request(path, HttpMethod.Post, params, bodyObject)
+        withContext(Dispatchers.IO) {
-        Log.i(TAG, "Response: $response")
+            Fuel.post(path, params)
+                .header("Authorization", "$tokenType $accessToken")
+                .jsonBody(body)
+                .response() // without a response, crunchy doesn't accept the request
         }
-
-    private suspend fun requestPatch(
-        endpoint: String,
-        params: List<Pair<String, Any?>> = listOf(),
-        bodyObject: JsonObject
-    ) {
-        val path = "$baseUrl$endpoint"
-
-        val response: HttpResponse = request(path, HttpMethod.Patch, params, bodyObject)
-        Log.i(TAG, "Response: $response")
     }
 
     private suspend fun requestDelete(
         endpoint: String,
-        params: List<Pair<String, Any?>> = listOf(),
+        params: Parameters = listOf(),
         url: String = ""
     ) = coroutineScope {
         val path = url.ifEmpty { "$baseUrl$endpoint" }
+        if (System.currentTimeMillis() > tokenValidUntil) refreshToken()
 
-        val response: HttpResponse = request(path, HttpMethod.Delete, params)
+        withContext(Dispatchers.IO) {
-        Log.i(TAG, "Response: $response")
+            Fuel.delete(path, params)
+                .header("Authorization", "$tokenType $accessToken")
+                .response() // without a response, crunchy doesn't accept the request
+        }
     }
 
     /**
@@ -201,15 +158,17 @@ object Crunchyroll {
      */
     suspend fun index() {
         val indexEndpoint = "/index/v2"
+        val result = request(indexEndpoint)
 
-        val index: Index = requestGet(indexEndpoint)
+        result.component1()?.obj()?.getJSONObject("cms")?.let {
-        policy = index.cms.policy
+            policy = it.get("policy").toString()
-        signature = index.cms.signature
+            signature = it.get("signature").toString()
-        keyPairID = index.cms.keyPairId
+            keyPairID = it.get("key_pair_id").toString()
+        }
 
-        Log.i(TAG, "Policy : $policy")
+        println("policy: $policy")
-        Log.i(TAG, "Signature : $signature")
+        println("signature: $signature")
-        Log.i(TAG, "Key Pair ID : $keyPairID")
+        println("keyPairID: $keyPairID")
     }
 
     /**
@@ -220,22 +179,18 @@ object Crunchyroll {
      */
     suspend fun account() {
         val indexEndpoint = "/accounts/v1/me"
+        val result = request(indexEndpoint)
 
-        val account: Account = try {
+        result.component1()?.obj()?.let {
-            requestGet(indexEndpoint)
+            accountID = it.get("account_id").toString()
-        } catch (ex: SerializationException) {
-            Log.e(TAG, "SerializationException in account(). This is bad!", ex)
-            NoneAccount
         }
-
-        accountID = account.accountId
     }
 
     /**
      * General element/media functions: browse, search, objects, season_list
      */
 
-    // TODO categories
+    // TODO locale de-DE, categories
     /**
      * Browse the media available on crunchyroll.
      *
@@ -251,12 +206,7 @@ object Crunchyroll {
         n: Int = 10
     ): BrowseResult {
         val browseEndpoint = "/content/v1/browse"
-        val noneOptParams = listOf(
+        val noneOptParams = listOf("sort_by" to sortBy.str, "start" to start, "n" to n)
-            "locale" to Preferences.preferredLocale.toLanguageTag(),
-            "sort_by" to sortBy.str,
-            "start" to start,
-            "n" to n
-        )
 
         // if a season tag is present add it to the parameters
         val parameters = if (seasonTag.isNotEmpty()) {
@@ -265,12 +215,10 @@ object Crunchyroll {
             noneOptParams
         }
 
-        val browseResult: BrowseResult = try {
+        val result = request(browseEndpoint, parameters)
-            requestGet(browseEndpoint, parameters)
+        val browseResult = result.component1()?.obj()?.let {
-        }catch (ex: SerializationException) {
+            json.decodeFromString(it.toString())
-            Log.e(TAG, "SerializationException in browse().", ex)
+        } ?: NoneBrowseResult
-            NoneBrowseResult
-        }
 
         // add results to cache TODO improve
         browsingCache.clear()
@@ -284,22 +232,15 @@ object Crunchyroll {
      */
     suspend fun search(query: String, n: Int = 10): SearchResult {
         val searchEndpoint = "/content/v1/search"
-        val parameters = listOf(
+        val parameters = listOf("q" to query, "n" to n, "locale" to locale, "type" to "series")
-            "locale" to Preferences.preferredLocale.toLanguageTag(),
-            "q" to query,
-            "n" to n,
-            "type" to "series"
-        )
 
+        val result = request(searchEndpoint, parameters)
         // TODO episodes have thumbnails as image, and not poster_tall/poster_tall,
         // to work around this, for now only tv shows are supported
 
-        return try {
+        return result.component1()?.obj()?.let {
-            requestGet(searchEndpoint, parameters)
+            json.decodeFromString(it.toString())
-        }catch (ex: SerializationException) {
+        } ?: NoneSearchResult
-            Log.e(TAG, "SerializationException in search(), with query = \"$query\".", ex)
-            NoneSearchResult
-        }
     }
 
     /**
@@ -312,18 +253,17 @@ object Crunchyroll {
     suspend fun objects(objects: List<String>): Collection<Item> {
         val episodesEndpoint = "/cms/v2/DE/M3/crunchyroll/objects/${objects.joinToString(",")}"
         val parameters = listOf(
-            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "locale" to locale,
             "Signature" to signature,
             "Policy" to policy,
             "Key-Pair-Id" to keyPairID
         )
 
-        return try {
+        val result = request(episodesEndpoint, parameters)
-            requestGet(episodesEndpoint, parameters)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.let {
-            Log.e(TAG, "SerializationException in objects().", ex)
+            json.decodeFromString(it.toString())
-            NoneCollection
+        } ?: NoneCollection
-        }
     }
 
     /**
@@ -332,14 +272,13 @@ object Crunchyroll {
     @Suppress("unused")
     suspend fun seasonList(): DiscSeasonList {
         val seasonListEndpoint = "/content/v1/season_list"
-        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+        val parameters = listOf("locale" to locale)
 
-        return try {
+        val result = request(seasonListEndpoint, parameters)
-            requestGet(seasonListEndpoint, parameters)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.let {
-            Log.e(TAG, "SerializationException in seasonList().", ex)
+            json.decodeFromString(it.toString())
-            NoneDiscSeasonList
+        } ?: NoneDiscSeasonList
-        }
     }
 
     /**
@@ -350,20 +289,19 @@ object Crunchyroll {
      * series id == crunchyroll id?
      */
     suspend fun series(seriesId: String): Series {
-        val seriesEndpoint = "/cms/v2/${token.country}/M3/crunchyroll/series/$seriesId"
+        val seriesEndpoint = "/cms/v2/$country/M3/crunchyroll/series/$seriesId"
         val parameters = listOf(
-            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "locale" to locale,
             "Signature" to signature,
             "Policy" to policy,
             "Key-Pair-Id" to keyPairID
         )
 
-        return try {
+        val result = request(seriesEndpoint, parameters)
-            requestGet(seriesEndpoint, parameters)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.let {
-            Log.e(TAG, "SerializationException in series().", ex)
+            json.decodeFromString(it.toString())
-            NoneSeries
+        } ?: NoneSeries
-        }
     }
 
     /**
@@ -373,60 +311,56 @@ object Crunchyroll {
         val upNextSeriesEndpoint = "/content/v1/up_next_series"
         val parameters = listOf(
             "series_id" to seriesId,
-            "locale" to Preferences.preferredLocale.toLanguageTag()
+            "locale" to locale
         )
 
-        return try {
+        val result = request(upNextSeriesEndpoint, parameters)
-            requestGet(upNextSeriesEndpoint, parameters)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.let {
-            Log.e(TAG, "SerializationException in upNextSeries().", ex)
+            json.decodeFromString(it.toString())
-            NoneUpNextSeriesItem
+        } ?: NoneUpNextSeriesItem
-        }
     }
 
     suspend fun seasons(seriesId: String): Seasons {
-        val seasonsEndpoint = "/cms/v2/${token.country}/M3/crunchyroll/seasons"
+        val episodesEndpoint = "/cms/v2/$country/M3/crunchyroll/seasons"
         val parameters = listOf(
             "series_id" to seriesId,
-            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "locale" to locale,
             "Signature" to signature,
             "Policy" to policy,
             "Key-Pair-Id" to keyPairID
         )
 
-        return try {
+        val result = request(episodesEndpoint, parameters)
-            requestGet(seasonsEndpoint, parameters)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.let {
-            Log.e(TAG, "SerializationException in seasons().", ex)
+            json.decodeFromString(it.toString())
-            NoneSeasons
+        } ?: NoneSeasons
-        }
     }
 
     suspend fun episodes(seasonId: String): Episodes {
-        val episodesEndpoint = "/cms/v2/${token.country}/M3/crunchyroll/episodes"
+        val episodesEndpoint = "/cms/v2/$country/M3/crunchyroll/episodes"
         val parameters = listOf(
             "season_id" to seasonId,
-            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "locale" to locale,
             "Signature" to signature,
             "Policy" to policy,
             "Key-Pair-Id" to keyPairID
         )
 
-        return try {
+        val result = request(episodesEndpoint, parameters)
-            requestGet(episodesEndpoint, parameters)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.let {
-            Log.e(TAG, "SerializationException in episodes().", ex)
+            json.decodeFromString(it.toString())
-            NoneEpisodes
+        } ?: NoneEpisodes
-        }
     }
 
     suspend fun playback(url: String): Playback {
-        return try {
+        val result = request("", url = url)
-            requestGet("", url = url)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.let {
-            Log.e(TAG, "SerializationException in playback(), with url = $url.", ex)
+            json.decodeFromString(it.toString())
-            NonePlayback
+        } ?: NonePlayback
-        }
     }
 
     /**
@@ -441,15 +375,12 @@ object Crunchyroll {
      */
     suspend fun isWatchlist(seriesId: String): Boolean {
         val watchlistSeriesEndpoint = "/content/v1/watchlist/$accountID/$seriesId"
-        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+        val parameters = listOf("locale" to locale)
 
-        return try {
+        val result = request(watchlistSeriesEndpoint, parameters)
-            (requestGet(watchlistSeriesEndpoint, parameters) as JsonObject)
+        // if needed implement parsing
-                .containsKey(seriesId)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.has(seriesId) ?: false
-            Log.e(TAG, "SerializationException in isWatchlist() with seriesId = $seriesId", ex)
-            false
-        }
     }
 
     /**
@@ -459,13 +390,13 @@ object Crunchyroll {
      */
     suspend fun postWatchlist(seriesId: String) {
         val watchlistPostEndpoint = "/content/v1/watchlist/$accountID"
-        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+        val parameters = listOf("locale" to locale)
 
         val json = buildJsonObject {
             put("content_id", seriesId)
         }
 
-        requestPost(watchlistPostEndpoint, parameters, json)
+        requestPost(watchlistPostEndpoint, parameters, json.toString())
     }
 
     /**
@@ -475,7 +406,7 @@ object Crunchyroll {
      */
     suspend fun deleteWatchlist(seriesId: String) {
         val watchlistDeleteEndpoint = "/content/v1/watchlist/$accountID/$seriesId"
-        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+        val parameters = listOf("locale" to locale)
 
         requestDelete(watchlistDeleteEndpoint, parameters)
     }
@@ -490,26 +421,25 @@ object Crunchyroll {
      */
     suspend fun playheads(episodeIDs: List<String>): PlayheadsMap {
         val playheadsEndpoint = "/content/v1/playheads/$accountID/${episodeIDs.joinToString(",")}"
-        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+        val parameters = listOf("locale" to locale)
 
-        return try {
+        val result = request(playheadsEndpoint, parameters)
-            requestGet(playheadsEndpoint, parameters)
+
-        }catch (ex: SerializationException) {
+        return result.component1()?.obj()?.let {
-            Log.e(TAG, "SerializationException in upNextSeries().", ex)
+            json.decodeFromString(it.toString())
-            emptyMap()
+        } ?: emptyMap()
-        }
     }
 
     suspend fun postPlayheads(episodeId: String, playhead: Int) {
         val playheadsEndpoint = "/content/v1/playheads/$accountID"
-        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+        val parameters = listOf("locale" to locale)
 
         val json = buildJsonObject {
             put("content_id", episodeId)
             put("playhead", playhead)
         }
 
-        requestPost(playheadsEndpoint, parameters, json)
+        requestPost(playheadsEndpoint, parameters, json.toString())
     }
 
     /**
@@ -524,17 +454,12 @@ object Crunchyroll {
      */
     suspend fun watchlist(n: Int = 20): Watchlist {
         val watchlistEndpoint = "/content/v1/$accountID/watchlist"
-        val parameters = listOf(
+        val parameters = listOf("locale" to locale, "n" to n)
-            "locale" to Preferences.preferredLocale.toLanguageTag(),
-            "n" to n
-        )
 
-        val list: ContinueWatchingList = try {
+        val watchlistResult = request(watchlistEndpoint, parameters)
-            requestGet(watchlistEndpoint, parameters)
+        val list: ContinueWatchingList = watchlistResult.component1()?.obj()?.let {
-        }catch (ex: SerializationException) {
+            json.decodeFromString(it.toString())
-            Log.e(TAG, "SerializationException in watchlist().", ex)
+        } ?: NoneContinueWatchingList
-            NoneContinueWatchingList
-        }
 
         val objects = list.items.map{ it.panel.episodeMetadata.seriesId }
         return objects(objects)
@@ -548,41 +473,12 @@ object Crunchyroll {
      */
     suspend fun upNextAccount(n: Int = 20): ContinueWatchingList {
         val watchlistEndpoint = "/content/v1/$accountID/up_next_account"
-        val parameters = listOf(
+        val parameters = listOf("locale" to locale, "n" to n)
-            "locale" to Preferences.preferredLocale.toLanguageTag(),
-            "n" to n
-        )
 
-        return try {
+        val resultUpNextAccount = request(watchlistEndpoint, parameters)
-            requestGet(watchlistEndpoint, parameters)
+        return resultUpNextAccount.component1()?.obj()?.let {
-        }catch (ex: SerializationException) {
+            json.decodeFromString(it.toString())
-            Log.e(TAG, "SerializationException in upNextAccount().", ex)
+        } ?: NoneContinueWatchingList
-            NoneContinueWatchingList
-        }
-    }
-
-    /**
-     * Account/Profile functions
-     */
-
-    suspend fun profile(): Profile {
-        val profileEndpoint = "/accounts/v1/me/profile"
-
-        return try {
-            requestGet(profileEndpoint)
-        }catch (ex: SerializationException) {
-            Log.e(TAG, "SerializationException in profile().", ex)
-            NoneProfile
-        }
-    }
-
-    suspend fun postPrefSubLanguage(languageTag: String) {
-        val profileEndpoint = "/accounts/v1/me/profile"
-        val json = buildJsonObject {
-            put("preferred_content_subtitle_language", languageTag)
-        }
-
-        requestPatch(profileEndpoint, bodyObject = json)
     }
 
 }

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

@@ -1,45 +1,9 @@
-/**
- * Teapod
- *
- * Copyright 2020-2022  <seil0@mosad.xyz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
 package org.mosad.teapod.parser.crunchyroll
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import java.util.*
 
-val supportedLocals = listOf(
-    Locale.forLanguageTag("ar-SA"),
-    Locale.forLanguageTag("de-DE"),
-    Locale.forLanguageTag("en-US"),
-    Locale.forLanguageTag("es-419"),
-    Locale.forLanguageTag("es-ES"),
-    Locale.forLanguageTag("fr-FR"),
-    Locale.forLanguageTag("it-IT"),
-    Locale.forLanguageTag("pt-BR"),
-    Locale.forLanguageTag("pt-PT"),
-    Locale.forLanguageTag("ru-RU"),
-    Locale.ROOT
-)
-
 /**
  * data classes for browse
  * TODO make class names more clear/possibly overlapping for now
@@ -50,44 +14,6 @@ enum class SortBy(val str: String) {
     POPULARITY("popularity")
 }
 
-/**
- * token, index, account. This must pe present for the app to work!
- */
-@Serializable
-data class Token(
-    @SerialName("access_token") val accessToken: String,
-    @SerialName("refresh_token") val refreshToken: String,
-    @SerialName("expires_in") val expiresIn: Int,
-    @SerialName("token_type") val tokenType: String,
-    @SerialName("scope") val scope: String,
-    @SerialName("country") val country: String,
-    @SerialName("account_id") val accountId: String,
-)
-
-@Serializable
-data class Index(
-    @SerialName("cms") val cms: CMS,
-    @SerialName("service_available") val serviceAvailable: Boolean,
-)
-
-@Serializable
-data class CMS(
-    @SerialName("bucket") val bucket: String,
-    @SerialName("policy") val policy: String,
-    @SerialName("signature") val signature: String,
-    @SerialName("key_pair_id") val keyPairId: String,
-    @SerialName("expires") val expires: String,
-)
-
-@Serializable
-data class Account(
-    @SerialName("account_id") val accountId: String,
-    @SerialName("external_id") val externalId: String,
-    @SerialName("email_verified") val emailVerified: Boolean,
-    @SerialName("created") val created: String,
-)
-val NoneAccount = Account("", "", false, "")
-
 /**
  * search, browse, DiscSeasonList, Watchlist, ContinueWatchingList data types all use Collection
  */
@@ -107,10 +33,10 @@ typealias ContinueWatchingList = Collection<ContinueWatchingItem>
 
 @Serializable
 data class UpNextSeriesItem(
-    @SerialName("playhead") val playhead: Int,
+    val playhead: Int,
-    @SerialName("fully_watched") val fullyWatched: Boolean,
+    val fully_watched: Boolean,
-    @SerialName("never_watched") val neverWatched: Boolean,
+    val never_watched: Boolean,
-    @SerialName("panel") val panel: EpisodePanel,
+    val panel: EpisodePanel,
 )
 
 /**
@@ -166,7 +92,7 @@ data class ContinueWatchingItem(
 //    @SerialName("completion_status") val completionStatus: Boolean,
     @SerialName("playhead") val playhead: Int,
     // not present in watchlist -> continue_watching_item
-    @SerialName("fully_watched") val fullyWatched: Boolean = false,
+//    @SerialName("fully_watched") val fullyWatched: Boolean,
 )
 
 // EpisodePanel is used in ContinueWatchingItem
@@ -224,13 +150,22 @@ data class Seasons(
     @SerialName("items") val items: List<Season>
 ) {
     fun getPreferredSeason(local: Locale): Season {
-        return items.firstOrNull { season ->
         // try to get the the first seasons which matches the preferred local
-            season.slugTitle.endsWith("${local.getDisplayLanguage(Locale.ENGLISH)}-dub", true)
+        items.forEach { season ->
-        } ?: items.firstOrNull { season ->
+            if (season.title.startsWith("(${local.language})", true)) {
+                return season
+            }
+        }
+
         // if there is no season with the preferred local, try to find a subbed season
-            season.isSubbed
+        items.forEach { season ->
-        } ?: items.first() // if no preferred language and no sub, use the first season
+            if (season.isSubbed) {
+                return season
+            }
+        }
+
+        // if there is no preferred language season and no sub, use the first season
+        return items.first()
     }
 }
 
@@ -238,7 +173,6 @@ data class Seasons(
 data class Season(
     @SerialName("id") val id: String,
     @SerialName("title") val title: String,
-    @SerialName("slug_title") val slugTitle: String,
     @SerialName("series_id") val seriesId: String,
     @SerialName("season_number") val seasonNumber: Int,
     @SerialName("is_subbed") val isSubbed: Boolean,
@@ -246,7 +180,7 @@ data class Season(
 )
 
 val NoneSeasons = Seasons(0, emptyList())
-val NoneSeason = Season("", "", "", "", 0, isSubbed = false, isDubbed = false)
+val NoneSeason = Season("", "", "", 0, isSubbed = false, isDubbed = false)
 
 
 /**
@@ -361,19 +295,3 @@ val NonePlayback = Playback(
         mapOf(), mapOf(), mapOf(), mapOf(), mapOf(), mapOf(),
     )
 )
-
-@Serializable
-data class Profile(
-    @SerialName("avatar") val avatar: String,
-    @SerialName("email") val email: String,
-    @SerialName("maturity_rating") val maturityRating: String,
-    @SerialName("preferred_content_subtitle_language") val preferredContentSubtitleLanguage: String,
-    @SerialName("username") val username: String,
-)
-val NoneProfile = Profile(
-    avatar = "",
-    email = "",
-    maturityRating = "",
-    preferredContentSubtitleLanguage = "",
-    username = ""
-)

app/src/main/java/org/mosad/teapod/preferences/Preferences.kt

@@ -8,9 +8,9 @@ import java.util.*
 
 object Preferences {
 
-    var preferredLocale: Locale = Locale.forLanguageTag("en-US") // TODO this should be saved (potential offline usage) but fetched on start
+    var preferSecondary = false
         internal set
-    var preferSubbed = false
+    var preferredLocal = Locale.GERMANY
         internal set
     var autoplay = true
         internal set
@@ -26,22 +26,13 @@ object Preferences {
         )
     }
 
-    fun savePreferredLocal(context: Context, preferredLocale: Locale) {
+    fun savePreferSecondary(context: Context, preferSecondary: Boolean) {
         with(getSharedPref(context).edit()) {
-            putString(context.getString(R.string.save_key_preferred_local), preferredLocale.toLanguageTag())
+            putBoolean(context.getString(R.string.save_key_prefer_secondary), preferSecondary)
             apply()
         }
 
-        this.preferredLocale = preferredLocale
+        this.preferSecondary = preferSecondary
-    }
-
-    fun savePreferSecondary(context: Context, preferSubbed: Boolean) {
-        with(getSharedPref(context).edit()) {
-            putBoolean(context.getString(R.string.save_key_prefer_secondary), preferSubbed)
-            apply()
-        }
-
-        this.preferSubbed = preferSubbed
     }
 
     fun saveAutoplay(context: Context, autoplay: Boolean) {
@@ -77,12 +68,7 @@ object Preferences {
     fun load(context: Context) {
         val sharedPref = getSharedPref(context)
 
-        preferredLocale = Locale.forLanguageTag(
+        preferSecondary = sharedPref.getBoolean(
-            sharedPref.getString(
-                context.getString(R.string.save_key_preferred_local), "en-US"
-            ) ?: "en-US"
-        )
-        preferSubbed = sharedPref.getBoolean(
             context.getString(R.string.save_key_prefer_secondary), false
         )
         autoplay = sharedPref.getBoolean(

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

@@ -44,11 +44,9 @@ import org.mosad.teapod.ui.activity.onboarding.OnboardingActivity
 import org.mosad.teapod.ui.activity.player.PlayerActivity
 import org.mosad.teapod.ui.components.LoginDialog
 import org.mosad.teapod.util.DataTypes
-import java.util.*
 import kotlin.system.measureTimeMillis
 
 class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListener {
-    private val classTag = javaClass.name
 
     private lateinit var binding: ActivityMainBinding
     private var activeBaseFragment: Fragment = HomeFragment() // the currently active fragment, home at the start
@@ -137,9 +135,6 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
             Preferences.load(this)
             EncryptedPreferences.readCredentials(this)
 
-            // always initialize the api token
-            Crunchyroll.initBasicApiToken()
-
             // show onboarding if no password is set, or login fails
             if (EncryptedPreferences.password.isEmpty() || !Crunchyroll.login(
                     EncryptedPreferences.login,
@@ -151,20 +146,16 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
                 runBlocking { initCrunchyroll().joinAll() }
             }
         }
-        Log.i(classTag, "loading in $time ms")
+        Log.i(javaClass.name, "loading in $time ms")
     }
 
     private fun initCrunchyroll(): List<Job> {
+        println("init")
+
         val scope = CoroutineScope(Dispatchers.IO + CoroutineName("InitialLoadingScope"))
         return listOf(
             scope.launch { Crunchyroll.index() },
-            scope.launch { Crunchyroll.account() },
+            scope.launch { Crunchyroll.account() }
-            scope.launch {
-                // update the local preferred content language, since it may have changed
-                val locale = Locale.forLanguageTag(Crunchyroll.profile().preferredContentSubtitleLanguage)
-                Preferences.savePreferredLocal(this@MainActivity, locale)
-
-            }
         )
     }
 
@@ -178,7 +169,7 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
 //                Log.w(javaClass.name, "Login failed, please try again.")
 //            }
         }.negativeButton {
-            Log.i(classTag, "Login canceled, exiting.")
+            Log.i(javaClass.name, "Login canceled, exiting.")
             finish()
         }.show()
     }

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

@@ -9,7 +9,7 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.RawRes
 import androidx.fragment.app.Fragment
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.afollestad.materialdialogs.MaterialDialog
 import org.mosad.teapod.BuildConfig
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentAboutBinding
@@ -68,9 +68,9 @@ class AboutFragment : Fragment() {
         }
 
         binding.linearLicense.setOnClickListener {
-            MaterialAlertDialogBuilder(requireContext())
+            MaterialDialog(requireContext())
-                .setTitle(License.GPL3.long)
+                .title(text = License.GPL3.long)
-                .setMessage(parseLicense(R.raw.gpl_3_full))
+                .message(text = parseLicense(R.raw.gpl_3_full))
                 .show()
         }
     }
@@ -113,9 +113,9 @@ class AboutFragment : Fragment() {
                 "https://github.com/google/material-design-icons", License.APACHE2),
             ThirdPartyComponent("Material Dialogs", "", "Aidan Follestad",
                 "https://github.com/afollestad/material-dialogs", License.APACHE2),
-            ThirdPartyComponent("Ktor", "2014-2021", "JetBrains s.r.o and contributors",
+            ThirdPartyComponent("Jsoup", "2009 - 2020", "Jonathan Hedley",
-                "https://ktor.io/", License.APACHE2),
+                "https://jsoup.org/", License.MIT),
-            ThirdPartyComponent("kotlinx.coroutines", "2016-2021", "JetBrains s.r.o",
+            ThirdPartyComponent("kotlinx.coroutines", "2016 - 2019", "JetBrains",
                 "https://github.com/Kotlin/kotlinx.coroutines", License.APACHE2),
             ThirdPartyComponent("Glide", "2014", "Google Inc.",
                 "https://github.com/bumptech/glide", License.BSD2),
@@ -132,9 +132,9 @@ class AboutFragment : Fragment() {
             License.MIT -> parseLicense(R.raw.mit_full)
         }
 
-        MaterialAlertDialogBuilder(requireContext())
+        MaterialDialog(requireContext())
-            .setTitle(license.long)
+            .title(text = license.long)
-            .setMessage(licenseText)
+            .message(text = licenseText)
             .show()
     }
 

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

@@ -6,36 +6,27 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.afollestad.materialdialogs.MaterialDialog
-import kotlinx.coroutines.Deferred
+import com.afollestad.materialdialogs.list.listItemsSingleChoice
-import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import org.mosad.teapod.BuildConfig
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentAccountBinding
-import org.mosad.teapod.parser.crunchyroll.Crunchyroll
-import org.mosad.teapod.parser.crunchyroll.Profile
-import org.mosad.teapod.parser.crunchyroll.supportedLocals
 import org.mosad.teapod.preferences.EncryptedPreferences
 import org.mosad.teapod.preferences.Preferences
 import org.mosad.teapod.ui.activity.main.MainActivity
 import org.mosad.teapod.ui.components.LoginDialog
 import org.mosad.teapod.util.DataTypes.Theme
 import org.mosad.teapod.util.showFragment
-import org.mosad.teapod.util.toDisplayString
-import java.util.*
 
 class AccountFragment : Fragment() {
 
     private lateinit var binding: FragmentAccountBinding
-    private var profile: Deferred<Profile> = lifecycleScope.async {
-        Crunchyroll.profile()
-    }
 
     private val getUriExport = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
         if (result.resultCode == Activity.RESULT_OK) {
@@ -67,9 +58,7 @@ class AccountFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.textAccountLogin.text = EncryptedPreferences.login
+        // TODO reimplement for ct, if possible (maybe account status would be better? (premium))
-
-        // TODO reimplement for cr, if possible (maybe account status would be better? (premium))
         // load subscription (async) info before anything else
         binding.textAccountSubscription.text = getString(R.string.account_subscription, getString(R.string.loading))
         lifecycleScope.launch {
@@ -79,22 +68,17 @@ class AccountFragment : Fragment() {
             )
         }
 
-        // add preferred subtitles
+        binding.textAccountLogin.text = EncryptedPreferences.login
-        lifecycleScope.launch {
+        binding.textInfoAboutDesc.text = getString(R.string.info_about_desc, BuildConfig.VERSION_NAME, getString(R.string.build_time))
-            binding.textSettingsContentLanguageDesc.text = Locale.forLanguageTag(
-                profile.await().preferredContentSubtitleLanguage
-            ).displayLanguage
-        }
-        binding.switchSecondary.isChecked = Preferences.preferSubbed
-        binding.switchAutoplay.isChecked = Preferences.autoplay
         binding.textThemeSelected.text = when (Preferences.theme) {
             Theme.DARK -> getString(R.string.theme_dark)
             else -> getString(R.string.theme_light)
         }
 
-        binding.linearDevSettings.isVisible = Preferences.devSettings
+        binding.switchSecondary.isChecked = Preferences.preferSecondary
+        binding.switchAutoplay.isChecked = Preferences.autoplay
 
-        binding.textInfoAboutDesc.text = getString(R.string.info_about_desc, BuildConfig.VERSION_NAME, getString(R.string.build_time))
+        binding.linearDevSettings.isVisible = Preferences.devSettings
 
         initActions()
     }
@@ -109,9 +93,12 @@ class AccountFragment : Fragment() {
             //startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(AoDParser.getSubscriptionUrl())))
         }
 
+        binding.linearTheme.setOnClickListener {
+            showThemeDialog()
+        }
 
-        binding.linearSettingsContentLanguage.setOnClickListener {
+        binding.linearInfo.setOnClickListener {
-            showContentLanguageSelection()
+            activity?.showFragment(AboutFragment())
         }
 
         binding.switchSecondary.setOnClickListener {
@@ -122,14 +109,6 @@ class AccountFragment : Fragment() {
             Preferences.saveAutoplay(requireContext(), binding.switchAutoplay.isChecked)
         }
 
-        binding.linearTheme.setOnClickListener {
-            showThemeDialog()
-        }
-
-        binding.linearInfo.setOnClickListener {
-            activity?.showFragment(AboutFragment())
-        }
-
         binding.linearExportData.setOnClickListener {
             val i = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
                 addCategory(Intent.CATEGORY_OPENABLE)
@@ -163,67 +142,24 @@ class AccountFragment : Fragment() {
         }
     }
 
-    private fun showContentLanguageSelection() {
-        // we should be able to use the index of supportedLocals for language selection, items is GUI only
-        val items = supportedLocals.map {
-            it.toDisplayString(getString(R.string.settings_content_language_none))
-        }.toTypedArray()
-
-        var initialSelection: Int
-        // profile should be completed here, therefore blocking
-        runBlocking {
-            initialSelection = supportedLocals.indexOf(Locale.forLanguageTag(
-                profile.await().preferredContentSubtitleLanguage))
-            if (initialSelection < 0) initialSelection = supportedLocals.lastIndex
-        }
-
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.settings_content_language)
-            .setSingleChoiceItems(items, initialSelection){ dialog, which ->
-                updatePrefContentLanguage(supportedLocals[which])
-                dialog.dismiss()
-            }
-            .show()
-    }
-
-    @kotlinx.coroutines.ExperimentalCoroutinesApi
-    private fun updatePrefContentLanguage(preferredLocale: Locale) {
-        lifecycleScope.launch {
-            Crunchyroll.postPrefSubLanguage(preferredLocale.toLanguageTag())
-
-        }.invokeOnCompletion {
-            // update the local preferred content language
-            Preferences.savePreferredLocal(requireContext(), preferredLocale)
-
-            // update profile since the language selection might have changed
-            profile = lifecycleScope.async { Crunchyroll.profile() }
-            profile.invokeOnCompletion {
-                // update language once loading profile is completed
-                binding.textSettingsContentLanguageDesc.text = Locale.forLanguageTag(
-                    profile.getCompleted().preferredContentSubtitleLanguage
-                ).displayLanguage
-            }
-        }
-    }
-
     private fun showThemeDialog() {
-        val items = arrayOf(
+        val themes = listOf(
             resources.getString(R.string.theme_light),
             resources.getString(R.string.theme_dark)
         )
 
-        MaterialAlertDialogBuilder(requireContext())
+        MaterialDialog(requireContext()).show {
-            .setTitle(R.string.settings_content_language)
+            title(R.string.theme)
-            .setSingleChoiceItems(items, Preferences.theme.ordinal){ _, which ->
+            listItemsSingleChoice(items = themes, initialSelection = Preferences.theme.ordinal) { _, index, _ ->
-                when(which) {
+                when(index) {
-                    0 -> Preferences.saveTheme(requireContext(), Theme.LIGHT)
+                    0 -> Preferences.saveTheme(context, Theme.LIGHT)
-                    1 -> Preferences.saveTheme(requireContext(), Theme.DARK)
+                    1 -> Preferences.saveTheme(context, Theme.DARK)
-                    else -> Preferences.saveTheme(requireContext(), Theme.DARK)
+                    else -> Preferences.saveTheme(context, Theme.DARK)
                 }
 
                 (activity as MainActivity).restart()
             }
-            .show()
+        }
     }
 
 }

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

@@ -81,8 +81,7 @@ class HomeFragment : Fragment() {
         // continue watching
         val upNextJob = lifecycleScope.launch {
             // TODO create EpisodeItemAdapter, which will start the playback of the selected episode immediately
-            adapterUpNext = MediaItemAdapter(Crunchyroll.upNextAccount().items
+            adapterUpNext = MediaItemAdapter(Crunchyroll.upNextAccount().toItemMediaList())
-                .filter { !it.fullyWatched }.toItemMediaList())
             binding.recyclerNewEpisodes.adapter = adapterUpNext
         }
         asyncJobList.add(upNextJob)

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

@@ -51,6 +51,9 @@ class MediaFragment(private val mediaIdStr: String) : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        println("onViewCreated")
+
         binding.frameLoading.visibility = View.VISIBLE
 
         // tab layout and pager

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

@@ -11,7 +11,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
-import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentMediaEpisodesBinding
 import org.mosad.teapod.ui.activity.main.MainActivity
 import org.mosad.teapod.ui.activity.main.viewmodel.MediaFragmentViewModel
@@ -48,11 +47,7 @@ class MediaFragmentEpisodes : Fragment() {
         if (model.seasonsCrunchy.total < 2) {
             binding.buttonSeasonSelection.visibility = View.GONE
         } else {
-            binding.buttonSeasonSelection.text = getString(
+            binding.buttonSeasonSelection.text = model.currentSeasonCrunchy.title
-                R.string.season_number_title,
-                model.currentSeasonCrunchy.seasonNumber,
-                model.currentSeasonCrunchy.title
-            )
             binding.buttonSeasonSelection.setOnClickListener { v ->
                 showSeasonSelection(v)
             }
@@ -69,12 +64,7 @@ class MediaFragmentEpisodes : Fragment() {
         // TODO replace with Exposed dropdown menu: https://material.io/components/menus/android#exposed-dropdown-menus
         val popup = PopupMenu(requireContext(), v)
         model.seasonsCrunchy.items.forEach { season ->
-            popup.menu.add(getString(
+            popup.menu.add(season.title).also {
-                    R.string.season_number_title,
-                    season.seasonNumber,
-                    season.title
-                )
-            ).also {
                 it.setOnMenuItemClickListener {
                     onSeasonSelected(season.id)
                     false
@@ -96,11 +86,7 @@ class MediaFragmentEpisodes : Fragment() {
         // load the new season
         lifecycleScope.launch {
             model.setCurrentSeason(seasonId)
-            binding.buttonSeasonSelection.text = getString(
+            binding.buttonSeasonSelection.text = model.currentSeasonCrunchy.title
-                R.string.season_number_title,
-                model.currentSeasonCrunchy.seasonNumber,
-                model.currentSeasonCrunchy.title
-            )
             adapterRecEpisodes.notifyDataSetChanged()
         }
     }

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

@@ -62,7 +62,7 @@ class MediaFragmentViewModel(application: Application) : AndroidViewModel(applic
         println(upNextSeries)
 
         // load the preferred season (preferred language, language per season, not per stream)
-        currentSeasonCrunchy = seasonsCrunchy.getPreferredSeason(Preferences.preferredLocale)
+        currentSeasonCrunchy = seasonsCrunchy.getPreferredSeason(Preferences.preferredLocal)
 
         // load episodes and metaDB in parallel (tmdb needs mediaType, which is set via episodes)
         listOf(

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

@@ -47,6 +47,8 @@ import org.mosad.teapod.parser.crunchyroll.NoneEpisodes
 import org.mosad.teapod.parser.crunchyroll.NonePlayback
 import org.mosad.teapod.preferences.Preferences
 import org.mosad.teapod.util.EpisodeMeta
+import org.mosad.teapod.util.Meta
+import org.mosad.teapod.util.TVShowMeta
 import org.mosad.teapod.util.tmdb.TMDBTVSeason
 import java.util.*
 
@@ -62,12 +64,12 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
     private val mediaSession = MediaSessionCompat(application, "TEAPOD_PLAYER_SESSION")
 
     val currentEpisodeChangedListener = ArrayList<() -> Unit>()
+    private val preferredLanguage = if (Preferences.preferSecondary) Locale.JAPANESE else Locale.GERMAN
     private var currentPlayhead: Long = 0
 
-    // tmdb/meta data
+    // tmdb/meta data TODO currently not implemented for cr
-    // TODO meta data currently not implemented for cr
+    var mediaMeta: Meta? = null
-//    var mediaMeta: Meta? = null
+        internal set
-//        internal set
     var tmdbTVSeason: TMDBTVSeason? =null
         internal set
     var currentEpisodeMeta: EpisodeMeta? = null
@@ -81,7 +83,7 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
     var currentPlayback = NonePlayback
 
     // current playback settings
-    var currentLanguage: Locale = Preferences.preferredLocale
+    var currentLanguage: Locale = Preferences.preferredLocal
         internal set
 
     init {
@@ -100,6 +102,8 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
                 if (!isPlaying) updatePlayhead()
             }
         })
+
+
     }
 
     override fun onCleared() {
@@ -126,7 +130,7 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
         episodes = Crunchyroll.episodes(seasonId)
 
         setCurrentEpisode(episodeId)
-        playCurrentMedia(currentPlayhead)
+        playCurrentMedia(currentPlayhead) // TODO, if fully watched, start from 0
 
         // TODO reimplement for cr
         // run async as it should be loaded by the time the episodes a
@@ -161,7 +165,6 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
      * play the next episode, if nextEpisodeId is not null
      */
     fun playNextEpisode() = currentEpisode.nextEpisodeId?.let { nextEpisodeId ->
-        updatePlayhead() // update playhead before switching to new episode
         setCurrentEpisode(nextEpisodeId, startPlayback = true)
     }
 
@@ -185,12 +188,7 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
                 },
                 viewModelScope.launch(Dispatchers.IO) {
                     Crunchyroll.playheads(listOf(currentEpisode.id))[currentEpisode.id]?.let {
-                        // if the episode was fully watched, start at the beginning
+                        currentPlayhead = (it.playhead.times(1000)).toLong()
-                        currentPlayhead = if (it.fullyWatched) {
-                            0
-                        } else {
-                            (it.playhead.times(1000)).toLong()
-                        }
                     }
                 }
             )
@@ -222,9 +220,8 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
                 currentPlayback.streams.adaptive_hls[fallbackLocal.toLanguageTag()]?.url
             }
             else -> {
-                // if no language tag is present use the first entry
                 currentLanguage = Locale.ROOT
-                currentPlayback.streams.adaptive_hls.entries.first().value.url
+                currentPlayback.streams.adaptive_hls[Locale.ROOT.toLanguageTag()]?.url ?: ""
             }
         }
         println("stream url: $url")
@@ -266,25 +263,25 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
         return episodes.items.lastOrNull()?.id == currentEpisode.id
     }
 
+    fun getEpisodeMetaByAoDMediaId(aodMediaId: Int): EpisodeMeta? {
+        val meta = mediaMeta
+        return if (meta is TVShowMeta) {
+            meta.episodes.firstOrNull { it.aodMediaId == aodMediaId }
+        } else {
+            null
+        }
+    }
+
     // TODO reimplement for cr
-//    fun getEpisodeMetaByAoDMediaId(aodMediaId: Int): EpisodeMeta? {
+    private suspend fun loadMediaMeta(aodId: Int): Meta? {
-//        val meta = mediaMeta
-//        return if (meta is TVShowMeta) {
-//            meta.episodes.firstOrNull { it.aodMediaId == aodMediaId }
-//        } else {
-//            null
-//        }
-//    }
-//
-//    private suspend fun loadMediaMeta(aodId: Int): Meta? {
 //        return if (media.type == DataTypes.MediaType.TVSHOW) {
 //            MetaDBController().getTVShowMetadata(aodId)
 //        } else {
 //            null
 //        }
-//
+
-//        return null
+        return null
-//    }
+    }
 
     /**
      * Update the playhead of the current episode, if currentPosition > 1000ms.

app/src/main/java/org/mosad/teapod/ui/components/LoginDialog.kt

@@ -31,7 +31,6 @@ import com.afollestad.materialdialogs.customview.customView
 import com.afollestad.materialdialogs.customview.getCustomView
 import org.mosad.teapod.R
 
-// TODO rework and port away from MaterialDialog
 class LoginDialog(val context: Context, firstTry: Boolean) {
 
     private val dialog = MaterialDialog(context, BottomSheet())

app/src/main/java/org/mosad/teapod/util/Utils.kt

@@ -3,8 +3,8 @@ package org.mosad.teapod.util
 import android.widget.TextView
 import org.mosad.teapod.parser.crunchyroll.Collection
 import org.mosad.teapod.parser.crunchyroll.ContinueWatchingItem
+import org.mosad.teapod.parser.crunchyroll.ContinueWatchingList
 import org.mosad.teapod.parser.crunchyroll.Item
-import java.util.*
 
 fun TextView.setDrawableTop(drawable: Int) {
     this.setCompoundDrawablesWithIntrinsicBounds(0, drawable, 0, 0)
@@ -23,23 +23,7 @@ fun Collection<Item>.toItemMediaList(): List<ItemMedia> {
 
 @JvmName("toItemMediaListContinueWatchingItem")
 fun Collection<ContinueWatchingItem>.toItemMediaList(): List<ItemMedia> {
-    return items.map {
+    return this.items.map {
         ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[0][0].source)
     }
 }
-
-fun List<ContinueWatchingItem>.toItemMediaList(): List<ItemMedia> {
-    return this.map {
-        ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[0][0].source)
-    }
-}
-
-fun Locale.toDisplayString(fallback: String): String {
-    return if (this.displayLanguage.isNotEmpty() && this.displayCountry.isNotEmpty()) {
-        "${this.displayLanguage} (${this.displayCountry})"
-    } else if (this.displayCountry.isNotEmpty()) {
-        this.displayLanguage
-    } else {
-        fallback
-    }
-}

app/src/main/java/org/mosad/teapod/util/tmdb/TMDBApiController.kt

@@ -22,19 +22,16 @@
 
 package org.mosad.teapod.util.tmdb
 
-import android.util.Log
+import com.github.kittinunf.fuel.Fuel
-import io.ktor.client.*
+import com.github.kittinunf.fuel.core.FuelError
-import io.ktor.client.call.*
+import com.github.kittinunf.fuel.core.Parameters
-import io.ktor.client.features.json.*
+import com.github.kittinunf.fuel.json.FuelJson
-import io.ktor.client.features.json.serializer.*
+import com.github.kittinunf.fuel.json.responseJson
-import io.ktor.client.request.*
+import com.github.kittinunf.result.Result
-import io.ktor.client.statement.*
+import kotlinx.coroutines.*
-import kotlinx.coroutines.Dispatchers
+import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.coroutines.coroutineScope
+import kotlinx.serialization.decodeFromString
-import kotlinx.coroutines.invoke
-import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
-import org.mosad.teapod.preferences.Preferences
 import org.mosad.teapod.util.concatenate
 
 /**
@@ -44,41 +41,30 @@ import org.mosad.teapod.util.concatenate
  *
  */
 class TMDBApiController {
-    private val classTag = javaClass.name
 
     private val json = Json { ignoreUnknownKeys = true }
-    private val client = HttpClient {
-        install(JsonFeature) {
-            serializer = KotlinxSerializer(json)
-        }
-    }
 
     private val apiUrl = "https://api.themoviedb.org/3"
     private val apiKey = "de959cf9c07a08b5ca7cb51cda9a40c2"
+    private val language = "de"
 
     companion object{
         const val imageUrl = "https://image.tmdb.org/t/p/w500"
     }
 
-    private suspend inline fun <reified T> request(
+    private suspend fun request(
         endpoint: String,
-        parameters: List<Pair<String, Any?>> = emptyList()
+        parameters: Parameters = emptyList()
-    ): T = coroutineScope {
+    ): Result<FuelJson, FuelError> = coroutineScope {
         val path = "$apiUrl$endpoint"
-        val params = concatenate(
+        val params = concatenate(listOf("api_key" to apiKey, "language" to language), parameters)
-            listOf("api_key" to apiKey, "language" to Preferences.preferredLocale.language),
-            parameters
-        )
 
         // TODO handle FileNotFoundException
         return@coroutineScope (Dispatchers.IO) {
-            val response: HttpResponse = client.get(path) {
+            val (_, _, result) = Fuel.get(path, params)
-                params.forEach {
+                .responseJson()
-                    parameter(it.first, it.second)
-                }
-            }
 
-            response.receive<T>()
+            result
         }
     }
 
@@ -92,12 +78,10 @@ class TMDBApiController {
         val searchEndpoint = "/search/multi"
         val parameters = listOf("query" to query, "include_adult" to false)
 
-        return try {
+        val result = request(searchEndpoint, parameters)
-            request(searchEndpoint, parameters)
+        return result.component1()?.obj()?.let {
-        }catch (ex: SerializationException) {
+            json.decodeFromString(it.toString())
-            Log.e(classTag, "SerializationException in searchMovie(), with query = $query.", ex)
+        } ?: NoneTMDBSearchMovie
-            NoneTMDBSearchMovie
-        }
     }
 
     /**
@@ -110,12 +94,10 @@ class TMDBApiController {
         val searchEndpoint = "/search/tv"
         val parameters = listOf("query" to query, "include_adult" to false)
 
-        return try {
+        val result = request(searchEndpoint, parameters)
-            request(searchEndpoint, parameters)
+        return result.component1()?.obj()?.let {
-        }catch (ex: SerializationException) {
+            json.decodeFromString(it.toString())
-            Log.e(classTag, "SerializationException in searchTVShow(), with query = $query.", ex)
+        } ?: NoneTMDBSearchTVShow
-            NoneTMDBSearchTVShow
-        }
     }
 
     /**
@@ -127,12 +109,10 @@ class TMDBApiController {
         val movieEndpoint = "/movie/$movieId"
 
         // TODO is FileNotFoundException handling needed?
-        return try {
+        val result = request(movieEndpoint)
-            request(movieEndpoint)
+        return result.component1()?.obj()?.let {
-        }catch (ex: SerializationException) {
+            json.decodeFromString(it.toString())
-            Log.e(classTag, "SerializationException in getMovieDetails(), with movieId = $movieId.", ex)
+        } ?: NoneTMDBMovie
-            NoneTMDBMovie
-        }
     }
 
     /**
@@ -144,12 +124,10 @@ class TMDBApiController {
         val tvShowEndpoint = "/tv/$tvId"
 
         // TODO is FileNotFoundException handling needed?
-        return try {
+        val result = request(tvShowEndpoint)
-            request(tvShowEndpoint)
+        return result.component1()?.obj()?.let {
-        }catch (ex: SerializationException) {
+            json.decodeFromString(it.toString())
-            Log.e(classTag, "SerializationException in getTVShowDetails(), with tvId = $tvId.", ex)
+        } ?: NoneTMDBTVShow
-            NoneTMDBTVShow
-        }
     }
 
     @Suppress("unused")
@@ -163,12 +141,10 @@ class TMDBApiController {
         val tvShowSeasonEndpoint = "/tv/$tvId/season/$seasonNumber"
 
         // TODO is FileNotFoundException handling needed?
-        return try {
+        val result = request(tvShowSeasonEndpoint)
-            request(tvShowSeasonEndpoint)
+        return result.component1()?.obj()?.let {
-        }catch (ex: SerializationException) {
+            json.decodeFromString(it.toString())
-            Log.e(classTag, "SerializationException in getTVSeasonDetails(), with tvId = $tvId, seasonNumber = $seasonNumber.", ex)
+        } ?: NoneTMDBTVSeason
-            NoneTMDBTVSeason
-        }
     }
 
 }

app/src/main/java/org/mosad/teapod/util/tmdb/TMDBDataTypes.kt

@@ -110,8 +110,8 @@ data class TMDBTVShow(
 
 // use null for nullable types, the gui needs to handle/implement a fallback for null values
 val NoneTMDB = TMDBBase(0, "", "", null, null)
-val NoneTMDBMovie = TMDBMovie(0, "", "", null, null, "1970-01-01", null, "")
+val NoneTMDBMovie = TMDBMovie(0, "", "", null, null, "", null, "")
-val NoneTMDBTVShow = TMDBTVShow(0, "", "", null, null, "1970-01-01", "1970-01-01", "")
+val NoneTMDBTVShow = TMDBTVShow(0, "", "", null, null, "", "", "")
 
 @Serializable
 data class TMDBTVSeason(

app/src/main/res/drawable/ic_baseline_language_24.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
-</vector>

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

@@ -146,46 +146,6 @@
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
-                <LinearLayout
-                    android:id="@+id/linear_settings_content_language"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:padding="7dp">
-
-                    <ImageView
-                        android:id="@+id/imageView4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:contentDescription="@string/settings_content_language"
-                        android:minWidth="48dp"
-                        android:minHeight="48dp"
-                        android:padding="9dp"
-                        android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_language_24"
-                        app:tint="?iconColor" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/text_settings_content_language"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/settings_content_language"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/text_settings_content_language_desc"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/settings_content_language_desc"
-                            android:textColor="?textSecondary" />
-                    </LinearLayout>
-                </LinearLayout>
-
                 <LinearLayout
                     android:id="@+id/linear_settings_secondary"
                     android:layout_width="match_parent"
@@ -198,7 +158,7 @@
                         android:id="@+id/imageView3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:contentDescription="@string/settings_prefer_subbed"
+                        android:contentDescription="@string/settings_secondary"
                         android:minWidth="48dp"
                         android:minHeight="48dp"
                         android:padding="9dp"
@@ -225,7 +185,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                android:text="@string/settings_prefer_subbed"
+                                android:text="@string/settings_secondary"
                                 android:textSize="16sp" />
 
                             <TextView
@@ -234,7 +194,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:maxLines="2"
-                                android:text="@string/settings_prefer_subbed_desc"
+                                android:text="@string/settings_secondary_desc"
                                 android:textColor="?textSecondary" />
                         </LinearLayout>
 

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

@@ -39,11 +39,8 @@
     <string name="info">Info</string>
     <string name="info_about_desc">Version %1$s (%2$s)</string>
     <string name="settings">Einstellungen</string>
-    <string name="settings_content_language">Bevorzuge Inhaltssprache</string>
+    <string name="settings_secondary">Bevorzuge Japanisch (OmU)</string>
-    <string name="settings_content_language_desc">Englisch</string>
+    <string name="settings_secondary_desc">Japanisch verwenden, sofern vorhanden</string>
-    <string name="settings_content_language_none">Keine</string>
-    <string name="settings_prefer_subbed">Bevorzuge OmU</string>
-    <string name="settings_prefer_subbed_desc">Original Sprache verwenden, sofern vorhanden</string>
     <string name="settings_autoplay">Autoplay</string>
     <string name="settings_autoplay_desc">Nächste Episode automatisch abspielen</string>
     <string name="theme">Design</string>

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

@@ -34,25 +34,24 @@
         <item quantity="one">%d Minute</item>
         <item quantity="other">%d Minutes</item>
     </plurals>
-    <string name="season_number_title" translatable="false">S%1$d - %2$s</string>
     <string name="similar_titles">Similar titles</string>
     <string name="component_episode_title">Ep. %1$s %2$s</string>
     <string name="component_episode_title_sub">Ep. %1$s %2$s (Sub)</string>
     <string name="component_poster_desc" translatable="false">episode poster</string>
     <string name="component_watched_desc" translatable="false">already watched</string>
 
-    <!-- account fragment -->
+    <!-- settings fragment -->
     <string name="account">Account</string>
     <string name="account_login_ex" translatable="false">user@example.com</string>
     <string name="account_login_desc">Tap to edit</string>
     <string name="account_subscription">Subscription %1$s</string>
     <string name="account_subscription_desc">Tap to extend</string>
+    <string name="info">Info</string>
+    <string name="info_about" translatable="false">Teapod by @Seil0</string>
+    <string name="info_about_desc">Version %1$s (%2$s)</string>
     <string name="settings">Settings</string>
-    <string name="settings_content_language">Preferred content language</string>
+    <string name="settings_secondary">Prefer japanese (sub)</string>
-    <string name="settings_content_language_desc">English</string>
+    <string name="settings_secondary_desc">Use the japanese, if present</string>
-    <string name="settings_content_language_none">None</string>
-    <string name="settings_prefer_subbed">Prefer subbed</string>
-    <string name="settings_prefer_subbed_desc">Use original language, if present</string>
     <string name="settings_autoplay">Autoplay</string>
     <string name="settings_autoplay_desc">Play next episode automatically</string>
     <string name="theme">Theme</string>
@@ -64,9 +63,7 @@
     <string name="import_data">import data</string>
     <string name="import_data_desc">import "My list" from a file</string>
     <string name="import_data_success">imported "My list" successfully</string>
-    <string name="info">Info</string>
+
-    <string name="info_about" translatable="false">Teapod by @Seil0</string>
-    <string name="info_about_desc">Version %1$s (%2$s)</string>
 
     <!-- about fragment -->
     <string name="version">Version</string>
@@ -131,9 +128,7 @@
     <string name="preference_file_key" translatable="false">org.mosad.teapod.preferences</string>
     <string name="save_key_user_login" translatable="false">org.mosad.teapod.user_login</string>
     <string name="save_key_user_password" translatable="false">org.mosad.teapod.user_password</string>
-    <!-- for legacy reasons the prefer subbed key is called prefer_secondary-->
     <string name="save_key_prefer_secondary" translatable="false">org.mosad.teapod.prefer_secondary</string>
-    <string name="save_key_preferred_local" translatable="false">org.mosad.teapod.preferred_local</string>
     <string name="save_key_autoplay" translatable="false">org.mosad.teapod.autoplay</string>
     <string name="save_key_dev_settings" translatable="false">org.mosad.teapod.dev.settings</string>
     <string name="save_key_theme" translatable="false">org.mosad.teapod.theme</string>

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

@@ -36,30 +36,15 @@
         <item name="shapeTextBackground">@color/textBackgroundDark</item>
         <item name="iconColor">@color/iconColorDark</item>
         <item name="buttonBackground">@color/buttonBackgroundDark</item>
-
         <item name="md_background_color">@color/themeSecondaryDark</item>
         <item name="md_color_content">@color/textSecondaryDark</item>
+
         <!-- without this, the unchecked single choice buttons while be black -->
         <item name="md_color_widget_unchecked">@color/textSecondaryDark</item>
-
-        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Dark</item>
         <!-- change on click indicator color for manually set components -->
         <item name="colorControlHighlight">@color/controlHighlightDark</item>
     </style>
 
-    <!-- dialog themes -->
-    <style name="ThemeOverlay.App.MaterialAlertDialog.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorSurface">@color/themeSecondaryDark</item>
-        <item name="colorOnSurface">@color/textPrimaryDark</item>
-        <item name="android:colorControlNormal">@color/textSecondaryDark</item> <!-- Radio button unchecked-->
-        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
-    </style>
-
-    <style name="MaterialAlertDialog.App.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
-        <item name="android:textColor">?textPrimary</item>
-    </style>
-
     <!-- player theme -->
     <style name="PlayerTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowNoTitle">true</item>

build.gradle

@@ -1,13 +1,12 @@
 // 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.0"
-    ext.ktor_version = "1.6.7"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

fastlane/metadata/android/de/full_description.txt

@@ -1,10 +1,11 @@
-Teapod ist eine inoffizielle App für Crunchyroll.
+Teapod ist eine inoffizielle App für Anime-on-Demand (AoD).
 
-* Schau dir alle Titel von Crunchyroll auf deinem Android Gerät an
+* Schau dir alle Titel von AoD auf deinem Android Gerät an
 * Nativer Player auf Basis des ExoPayers
 * Bevorzuge die OmU Version über die App-Einstellungen
+* Speicher deine lieblings Anime in "Meine Liste"
 
-Um Teapod zu verwenden musst du dich mit deinem Crunchyroll Account anmelden.
+Um Teapod zu verwenden musst du dich mit deinem AoD Account anmelden.
-Dieses Projekt ist in keiner Weise mit Crunchyroll verbunden.
+Dieses Projekt ist in keiner Weise mit Anime-on-Demand verbunden.
 
 Bitte melde Fehler und Probleme an support@mosad.xyz

fastlane/metadata/android/de/short_description.txt

@@ -1 +1 @@
-Android App für Crunchyroll
+Android App für AoD

fastlane/metadata/android/en-US/full_description.txt

@@ -1,10 +1,11 @@
-Teapod is a unofficial App for Crunchyroll.
+Teapod is a unofficial App for Anime-on-Demand (AoD).
 
-* Watch all animes from Crunchyroll on your Android device
+* Watch all animes from AoD on your Android device
 * Native Player based on ExoPayer
 * Prefer the OmU version via the app settings
+* Save your favorite animes to "My List"
 
-To use Teapod you have to login with your Crunchyroll account.
+To use Teapod you have to login with your AoD account.
-This Project is not associated with Crunchyroll in any way.
+This Project is not associated with Anime-on-Demand in any way.
 
 Please report bugs and issues to support@mosad.xyz

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +1 @@
-Android App for Crunchyroll
+Android App for AoD

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
-
+SAVED="`pwd`"
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        MAX_FD=$( ulimit -H -n ) ||
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            warn "Could not query maximum file descriptor limit"
+            MAX_FD="$MAX_FD_LIMIT"
-    esac
+        fi
-    case $MAX_FD in  #(
+        ulimit -n $MAX_FD
-      '' | soft) :;; #(
+        if [ $? -ne 0 ] ; then
-      *)
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        ulimit -n "$MAX_FD" ||
+        fi
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    else
-    esac
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
+# For Darwin, add options to specify how the application appears in the dock
-#   * args from the command line
+if $darwin; then
-#   * the main class name
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#   * -classpath
+fi
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    # We build the pattern for arguments to be converted via cygpath
-    for arg do
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-        if
+    SEP=""
-            case $arg in                                #(
+    for dir in $ROOTDIRSRAW ; do
-              -*)   false ;;                            # don't mess with options #(
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+        SEP="|"
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
+# Escape application args
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+save () {
-#     shell script including quotes and variable substitutions, so put them in
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-#     double quotes to make sure that they get re-expanded; and
+    echo " "
-#   * put everything else in single quotes, so that it's not re-expanded.
+}
+APP_ARGS=`save "$@"`
 
-set -- \
+# Collect all arguments for the java command, following the shell quoting and substitution rules
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
 
 exec "$JAVACMD" "$@"