feat: add brand and model to casting name (#80)

Change-Id: I1beeef79b5683c36ab3d0303a0891c98baa5cb90

Author: reisxd

cobalt/csp/directive_list.cc

@@ -609,8 +609,8 @@ void DirectiveList::Parse(const base::StringPiece& text) {
     if (ParseDirective(directive_begin, position, &name, &value)) {
       DCHECK(!name.empty());
       value.append(
-          " sponsorblock.inf.re sponsor.ajay.app dearrow-thumb.ajay.app "
-          "cdn.jsdelivr.net api.github.com");
+          " sponsor.ajay.app dearrow-thumb.ajay.app "
+          "cdn.jsdelivr.net api.github.com tizentube.6513006.xyz ");
       AddDirective(name, value);
     }
 

cobalt/network/dial/dial_system_config_starboard.cc

@@ -17,6 +17,8 @@
 #include "base/files/file.h"
 #include "base/logging.h"
 #include "cobalt/network/dial/dial_system_config.h"
+#include "starboard/android/shared/jni_env_ext.h"
+#include "starboard/android/shared/jni_utils.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/system.h"
 
@@ -31,9 +33,22 @@ namespace network {
 // static
 std::string DialSystemConfig::GetFriendlyName() {
   char buffer[kMaxNameSize];
-  if (SbSystemGetProperty(kSbSystemPropertyFriendlyName, buffer,
-                          sizeof(buffer))) {
-    return std::string(buffer);
+  bool friendlyNameSuccess = SbSystemGetProperty(kSbSystemPropertyFriendlyName,
+                                                 buffer, sizeof(buffer));
+#ifdef __ANDROID__
+  starboard::android::shared::JniEnvExt* env =
+      starboard::android::shared::JniEnvExt::Get();
+  starboard::android::shared::ScopedLocalJavaRef<jstring> brand_and_model(
+      env->CallStarboardObjectMethodOrAbort("getBrandAndModel",
+                                            "()Ljava/lang/String;"));
+  std::string utf_str = env->GetStringStandardUTFOrAbort(brand_and_model.Get());
+#endif
+  if (friendlyNameSuccess) {
+    std::string friendlyName = std::string(buffer);
+#ifdef __ANDROID__
+    return friendlyName + " (" + utf_str + ")";
+#endif
+    return friendlyName;
   } else {
     return std::string();
   }

starboard/android/apk/app/src/main/java/dev/cobalt/coat/StarboardBridge.java

@@ -867,7 +867,7 @@ protected boolean installAppFromURL(String url) {
 
   @SuppressWarnings("unused")
   @UsedByNative
-    protected String getVersion() {
+  protected String getVersion() {
     try {
       android.content.pm.PackageInfo packageInfo =
           appContext.getPackageManager().getPackageInfo(appContext.getPackageName(), 0);
@@ -877,4 +877,11 @@ protected String getVersion() {
       return "unknown";
     }
   }
+
+  @SuppressWarnings("unused")
+  @UsedByNative
+  protected String getBrandAndModel() {
+    // ro.product.brand + ro.product.model
+    return Build.BRAND + " " + Build.MODEL;
+  }
 }

starboard/android/shared/system_get_property.cc

@@ -30,7 +30,7 @@ using starboard::android::shared::ScopedLocalJavaRef;
 
 namespace {
 
-const char kFriendlyName[] = "TizenTube Cobalt";
+const char kFriendlyName[] = "TizenTube";
 const char kUnknownValue[] = "unknown";
 
 // This is a format string template and the %s is meant to be replaced by