diff --git a/app/src/main/java/gallery/memories/MainActivity.kt b/app/src/main/java/gallery/memories/MainActivity.kt index 789e7a8b..cf6ecbf0 100644 --- a/app/src/main/java/gallery/memories/MainActivity.kt +++ b/app/src/main/java/gallery/memories/MainActivity.kt @@ -25,11 +25,6 @@ import gallery.memories.databinding.ActivityMainBinding ActivityMainBinding.inflate(layoutInflater) } - companion object { - // replicate chrome: https://www.whatismybrowser.com/guides/the-latest-user-agent/chrome - val USER_AGENT = "MemoriesNative/0.0 Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.5672.76 Mobile Safari/537.36" - } - private lateinit var mNativeX: NativeX private var player: ExoPlayer? = null @@ -134,13 +129,16 @@ import gallery.memories.databinding.ActivityMainBinding false } + val userAgent = + getString(R.string.ua_app_prefix) + BuildConfig.VERSION_NAME + " " + getString(R.string.ua_chrome) + val webSettings = binding.webview.settings webSettings.javaScriptEnabled = true webSettings.javaScriptCanOpenWindowsAutomatically = true webSettings.allowContentAccess = true webSettings.domStorageEnabled = true webSettings.databaseEnabled = true - webSettings.userAgentString = USER_AGENT + webSettings.userAgentString = userAgent binding.webview.clearCache(true) binding.webview.addJavascriptInterface(mNativeX, "nativex") binding.webview.setBackgroundColor(Color.TRANSPARENT) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c343d401..0b7f0897 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,6 +7,10 @@ themeDark lastDbSyncTime + + "Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.5672.76 Mobile Safari/537.36" + MemoriesNative/ + Your server does not have the minimum required version of Memories Logged out from server Failed to connect to server. Reset app data if this persists.