From 9a852e67d51337c2e3fc2210b4a0ab885f5aeeec Mon Sep 17 00:00:00 2001
From: Zhou He Sheng <hzhou@ilegendsoft.com>
Date: Thu, 30 May 2024 09:42:18 +0800
Subject: [PATCH 1/2] streaming with X-Emby-Token

---
 buildSrc/src/main/kotlin/Dependencies.kt      |  2 +-
 .../emby/adapters/MediaContainerAdaptor.kt    |  4 +-
 .../serenity/emby/server/api/EmbyAPIClient.kt | 51 ++++++++++++-------
 .../serenity/emby/server/model/usersmodel.kt  |  4 +-
 .../emby/server/api/EmbyAPIClientTest.kt      |  2 +-
 .../serenity/core/IConfiguration.java         |  9 ++++
 .../serenity/core/ServerConfig.java           | 35 +++++++++++++
 serenity-app/src/main/res/values/strings.xml  |  2 +
 .../res/xml/manual_server_preferences.xml     | 10 ++++
 .../serenity/common/rest/SerenityUser.java    |  2 +-
 .../common/rest/impl/SerenityUser.java        | 14 ++---
 11 files changed, 101 insertions(+), 34 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 5266fe9cd..8ecd6e860 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -2,7 +2,7 @@ object Versions {
 
     const val kotlinVersion = "1.9.10"
     const val androidPluginVersion = "8.0.0"
-    const val minSdkVersion = 27
+    const val minSdkVersion = 21
     const val targetSdkVersion = 33
 
     const val appversion = "2.1.0"
diff --git a/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/adapters/MediaContainerAdaptor.kt b/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/adapters/MediaContainerAdaptor.kt
index 3f6a0f520..1b11730c2 100644
--- a/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/adapters/MediaContainerAdaptor.kt
+++ b/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/adapters/MediaContainerAdaptor.kt
@@ -127,7 +127,7 @@ class MediaContainerAdaptor {
     return MediaContainer()
   }
 
-  fun createVideoList(videos: List<Item>): IMediaContainer {
+  fun createVideoList(videos: List<Item>, token: String): IMediaContainer {
     val mediaContainer = MediaContainer()
     val serenityVideos = ArrayList<Video>()
     mediaContainer.size = videos.size
@@ -168,7 +168,7 @@ class MediaContainerAdaptor {
       } else {
         item.container
       }
-      video.directPlayUrl = "emby/Videos/${item.mediaSources?.get(0)?.id ?: item.id}/stream.$container?static=true"
+      video.directPlayUrl = "emby/Videos/${item.mediaSources?.get(0)?.id ?: item.id}/stream.$container?X-Emby-Token=$token"
 
       if (item.runTimeTicks != null) {
         val milliseconds = convertTicksToMilliseconds(item.runTimeTicks)
diff --git a/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/server/api/EmbyAPIClient.kt b/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/server/api/EmbyAPIClient.kt
index 9522ae819..568809633 100644
--- a/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/server/api/EmbyAPIClient.kt
+++ b/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/server/api/EmbyAPIClient.kt
@@ -83,13 +83,13 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
         return "$baseUrl/Users/$userId/Images/Primary"
     }
 
-    fun authenticate(userName: String, password: String = ""): AuthenticationResult {
-        val authenticationResul = AuthenticateUserByName(userName, "", password, password)
+    fun authenticate(userName: String, password: String): AuthenticationResult {
+        val authenticationResul = AuthenticateUserByName(userName, password)
         val call = usersService.authenticate(authenticationResul, headerMap())
         val response = call.execute()
         if (response.isSuccessful) {
             val body = response.body()
-            accessToken = body!!.accesToken
+            accessToken = body!!.accessToken
             serverId = body.serverId
             userId = body.userInfo.id!!
 
@@ -125,12 +125,12 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
             val result = fetchItem(itemId)
             return when (result.type) {
                 "Series" -> MediaContainerAdaptor().createSeriesList(listOf(result))
-                else -> MediaContainerAdaptor().createVideoList(listOf(result))
+                else -> MediaContainerAdaptor().createVideoList(listOf(result), fetchAccessToken()!!)
             }
         } catch (ex: Exception) {
             ex.printStackTrace()
         }
-        return MediaContainerAdaptor().createVideoList(emptyList())
+        return MediaContainerAdaptor().createVideoList(emptyList(), fetchAccessToken()!!)
     }
 
     fun fetchItem(id: String): Item {
@@ -171,23 +171,32 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
         val allUsers = ArrayList<SerenityUser>()
         for (user in allPublicUsers) {
             val builder = us.nineworlds.serenity.common.rest.impl.SerenityUser.builder()
-            val sernityUser = builder.userName(user.name)
+            val serenityUser = builder.userName(user.name)
                     .userId(user.id)
-                    .hasPassword(user.hasPassword)
                     .build()
-            allUsers.add(sernityUser)
+            allUsers.add(serenityUser)
         }
+
+        val u = defaultUsername()
+        val p = defaultPassword()
+        if (!u.isNullOrEmpty() && !p.isNullOrEmpty()) {
+            val builder = us.nineworlds.serenity.common.rest.impl.SerenityUser.builder()
+            val user = builder.userName(u)
+                .password(p)
+                .build()
+            allUsers.add(user)
+        }
+
         return allUsers
     }
 
     override fun authenticateUser(user: SerenityUser): SerenityUser {
-        val authenticatedUser = authenticate(user.userName)
-
+        val authenticatedUser = authenticate(user.userName, user.password())
         return us.nineworlds.serenity.common.rest.impl.SerenityUser.builder()
-                .accessToken(authenticatedUser.accesToken)
+                .accessToken(authenticatedUser.accessToken)
                 .userName(user.userName)
                 .userId(user.userId)
-                .hasPassword(user.hasPassword())
+                .password(user.password())
                 .build()
     }
 
@@ -247,7 +256,7 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
         val call = usersService.fetchSimilarItemById(headerMap(), itemId = itemId, userId = userId!!, includeItemType = "Movie")
 
         val results = call.execute().body()
-        return MediaContainerAdaptor().createVideoList(results!!.items)
+        return MediaContainerAdaptor().createVideoList(results!!.items, fetchAccessToken()!!)
     }
 
     override fun retrieveItemByIdCategory(key: String, category: String, types: Types, startIndex: Int, limit: Int?): IMediaContainer {
@@ -302,7 +311,7 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
         }
 
         val results = call.execute().body()
-        return MediaContainerAdaptor().createVideoList(results!!.items)
+        return MediaContainerAdaptor().createVideoList(results!!.items, fetchAccessToken()!!)
     }
 
     override fun retrieveItemByCategories(key: String, category: String, secondaryCategory: String): IMediaContainer {
@@ -344,7 +353,7 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
 
         val results = call.execute().body()
 
-        return MediaContainerAdaptor().createVideoList(results!!.items)
+        return MediaContainerAdaptor().createVideoList(results!!.items, fetchAccessToken()!!)
     }
 
     override fun retrieveMovieMetaData(key: String): IMediaContainer {
@@ -373,7 +382,7 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
 
         val itemResults = itemCall.execute().body()
 
-        return MediaContainerAdaptor().createVideoList(itemResults!!.items)
+        return MediaContainerAdaptor().createVideoList(itemResults!!.items, fetchAccessToken()!!)
     }
 
     override fun searchEpisodes(key: String, query: String): IMediaContainer? {
@@ -459,8 +468,8 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
         if (offset > 0) {
             startOffset = offset.toLong().times(10000)
         }
-
-        return "${baseUrl}emby/Videos/$id/stream.mkv?DeviceId=$deviceId&AudioCodec=aac&VideoCodec=h264&CopyTimeStamps=true&EnableAutoStreamCopy=true&StartTimeTicks=$startOffset&PlaySessionId=$playSessionId"
+        val token = fetchAccessToken()!!
+        return "${baseUrl}emby/Videos/$id/stream.mkv?DeviceId=$deviceId&AudioCodec=aac&VideoCodec=h264&CopyTimeStamps=true&EnableAutoStreamCopy=true&StartTimeTicks=$startOffset&PlaySessionId=$playSessionId&X-Emby-Token=$token"
     }
 
     override fun reinitialize() {
@@ -468,7 +477,7 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
     }
 
     override fun createUserImageUrl(user: SerenityUser, width: Int, height: Int): String {
-        return "$baseUrl/Emby/Users/${user.userId}/Images/Primary?Width=$width&Height=$height"
+        return "$baseUrl/emby/Users/${user.userId}/Images/Primary?Width=$width&Height=$height"
     }
 
     override fun startPlaying(itemId: String) {
@@ -534,5 +543,9 @@ class EmbyAPIClient(val context: Context, baseUrl: String = "http://localhost:80
 
     fun fetchAccessToken() = prefs.getString("embyAccessToken", "")
 
+    fun defaultUsername() = prefs.getString("username", "")
+
+    fun defaultPassword() = prefs.getString("password", "")
+
     override fun supportsMultipleUsers(): Boolean = true
 }
\ No newline at end of file
diff --git a/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/server/model/usersmodel.kt b/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/server/model/usersmodel.kt
index 1bd7789f2..3a1560868 100644
--- a/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/server/model/usersmodel.kt
+++ b/emby-lib/src/main/kotlin/us/nineworlds/serenity/emby/server/model/usersmodel.kt
@@ -16,13 +16,11 @@ data class PublicUserInfo(
 
 data class AuthenticateUserByName(
   @Json(name = "Username") val username: String,
-  @Json(name = "PassowrdMd5") val passwordMD5: String,
-  @Json(name = "Password") val password: String,
   @Json(name = "Pw") val pw: String
 )
 
 data class AuthenticationResult(
   @Json(name = "User") val userInfo: PublicUserInfo,
-  @Json(name = "AccessToken") val accesToken: String,
+  @Json(name = "AccessToken") val accessToken: String,
   @Json(name = "ServerId") val serverId: String
 )
\ No newline at end of file
diff --git a/emby-lib/src/test/kotlin/us/nineworlds/serenity/emby/server/api/EmbyAPIClientTest.kt b/emby-lib/src/test/kotlin/us/nineworlds/serenity/emby/server/api/EmbyAPIClientTest.kt
index 6e3863f0e..eb90bdd0e 100644
--- a/emby-lib/src/test/kotlin/us/nineworlds/serenity/emby/server/api/EmbyAPIClientTest.kt
+++ b/emby-lib/src/test/kotlin/us/nineworlds/serenity/emby/server/api/EmbyAPIClientTest.kt
@@ -35,7 +35,7 @@ class EmbyAPIClientTest {
     val authenticateResult = authenticate()
 
     assertThat(authenticateResult).isNotNull()
-    assertThat(authenticateResult.accesToken).isNotBlank()
+    assertThat(authenticateResult.accessToken).isNotBlank()
     assertThat(client.serverId).isNotBlank()
     assertThat(client.accessToken).isNotBlank()
     assertThat(client.userId).isNotBlank()
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/IConfiguration.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/IConfiguration.java
index 3bc7ea8e8..806b14b48 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/IConfiguration.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/IConfiguration.java
@@ -26,4 +26,13 @@ public interface IConfiguration {
 	 */
 	public abstract void setPort(String port);
 
+	public abstract String getUsername();
+
+	public abstract void setUsername(String username);
+
+
+	public abstract String getPassword();
+
+	public abstract void setPassword(String password);
+
 }
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/ServerConfig.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/ServerConfig.java
index c48c70a56..8e442cabb 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/ServerConfig.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/ServerConfig.java
@@ -41,6 +41,9 @@ public class ServerConfig extends BaseInjector implements IConfiguration {
   private String serveraddress;
   private String serverport;
   private String discoveredServers;
+  private String username;
+  private String password;
+
 
   @Inject protected SharedPreferences preferences;
 
@@ -56,6 +59,8 @@ private ServerConfig(Context context) {
     serveraddress = preferences.getString("server", "");
     discoveredServers = preferences.getString("discoveredServer", "");
     serverport = preferences.getString("serverport", "32400");
+    username = preferences.getString("username", "");
+    password = preferences.getString("password", "");
   }
 
   @Override public String getHost() {
@@ -77,6 +82,26 @@ private ServerConfig(Context context) {
     serverport = port;
   }
 
+  @Override
+  public String getUsername() {
+    return username;
+  }
+
+  @Override
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  @Override
+  public String getPassword() {
+    return password;
+  }
+
+  @Override
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
   public static IConfiguration getInstance(Context context) {
     if (config == null) {
       config = new ServerConfig(context);
@@ -131,6 +156,16 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
         storeServerAddress();
         return;
       }
+
+      if ("username".equals(key)) {
+        username = sharedPreferences.getString(key, "");
+        return;
+      }
+
+      if ("password".equals(key)) {
+        password = sharedPreferences.getString(key, "");
+        return;
+      }
     }
 
     /**
diff --git a/serenity-app/src/main/res/values/strings.xml b/serenity-app/src/main/res/values/strings.xml
index d89a58fa7..f773f1839 100644
--- a/serenity-app/src/main/res/values/strings.xml
+++ b/serenity-app/src/main/res/values/strings.xml
@@ -246,4 +246,6 @@
   <string name="select_a_user_profile">Select a User Profile</string>
   <string name="refresh_servers">Refresh Servers</string>
   <string name="manual_server_entry">Manual Server Entry</string>
+  <string name="user_name">Username</string>
+  <string name="password">Password</string>
 </resources>
diff --git a/serenity-app/src/main/res/xml/manual_server_preferences.xml b/serenity-app/src/main/res/xml/manual_server_preferences.xml
index 9c691c291..ac06ced12 100644
--- a/serenity-app/src/main/res/xml/manual_server_preferences.xml
+++ b/serenity-app/src/main/res/xml/manual_server_preferences.xml
@@ -23,6 +23,16 @@
         android:key="serverport"
         android:summary="@string/default_port_summary"
         android:title="@string/server_port"/>
+
+    <EditTextPreference
+        android:defaultValue=""
+        android:key="username"
+        android:title="@string/user_name"/>
+
+    <EditTextPreference
+        android:defaultValue=""
+        android:key="password"
+        android:title="@string/password"/>
   </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/serenity-common/src/main/java/us/nineworlds/serenity/common/rest/SerenityUser.java b/serenity-common/src/main/java/us/nineworlds/serenity/common/rest/SerenityUser.java
index 49640fb62..6f219c5f8 100644
--- a/serenity-common/src/main/java/us/nineworlds/serenity/common/rest/SerenityUser.java
+++ b/serenity-common/src/main/java/us/nineworlds/serenity/common/rest/SerenityUser.java
@@ -10,7 +10,7 @@ public interface SerenityUser {
 
   String getAccessToken();
 
-  boolean hasPassword();
+  String password();
 
   Server getUserServer();
 
diff --git a/serenity-common/src/main/java/us/nineworlds/serenity/common/rest/impl/SerenityUser.java b/serenity-common/src/main/java/us/nineworlds/serenity/common/rest/impl/SerenityUser.java
index 3677f0b37..a8f972e70 100644
--- a/serenity-common/src/main/java/us/nineworlds/serenity/common/rest/impl/SerenityUser.java
+++ b/serenity-common/src/main/java/us/nineworlds/serenity/common/rest/impl/SerenityUser.java
@@ -6,14 +6,14 @@ public class SerenityUser implements us.nineworlds.serenity.common.rest.Serenity
 
   private final String userName;
   private final String userId;
-  private final boolean hasPassword;
+  private final String password;
   private final Server serverInfo;
   private final String accessToken;
 
   private SerenityUser(Builder builder) {
     this.userName = builder.userName;
     this.userId = builder.userId;
-    this.hasPassword = builder.hasPassword;
+    this.password = builder.password;
     this.serverInfo = builder.serverInfo;
     this.accessToken = builder.accessToken;
   }
@@ -34,8 +34,8 @@ public static Builder builder() {
     return accessToken;
   }
 
-  @Override public boolean hasPassword() {
-    return hasPassword;
+  @Override public String password() {
+    return password;
   }
 
   @Override public Server getUserServer() {
@@ -45,7 +45,7 @@ public static Builder builder() {
   public static class Builder {
     private String userName;
     private String userId;
-    private boolean hasPassword;
+    private String password;
     private Server serverInfo;
     private String accessToken;
 
@@ -59,8 +59,8 @@ public Builder userId(String userId) {
       return this;
     }
 
-    public Builder hasPassword(boolean hasPassword) {
-      this.hasPassword = hasPassword;
+    public Builder password(String password) {
+      this.password = password;
       return this;
     }
 

From 2e4bfe691ac7e2e07ba4b1b2a72924935b4a3f7d Mon Sep 17 00:00:00 2001
From: Zhou He Sheng <hzhou@ilegendsoft.com>
Date: Thu, 30 May 2024 10:12:26 +0800
Subject: [PATCH 2/2] android.intent.category.LAUNCHER Support non leanback

---
 serenity-app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/serenity-app/src/main/AndroidManifest.xml b/serenity-app/src/main/AndroidManifest.xml
index 4aca8ed03..0aad36f01 100644
--- a/serenity-app/src/main/AndroidManifest.xml
+++ b/serenity-app/src/main/AndroidManifest.xml
@@ -97,6 +97,7 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
         </activity>