Browse Source

Refactor remote access string

transifex
Nicolas Pomepuy 3 years ago
parent
commit
5e6b49865d
  1. 141
      application/resources/src/main/res/values/strings.xml
  2. 4
      application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesWebserver.kt
  3. 6
      application/vlc-android/res/layout/otp_code.xml
  4. 2
      application/vlc-android/res/menu/activity_prefs.xml
  5. 2
      application/vlc-android/res/xml/preferences.xml
  6. 22
      application/vlc-android/res/xml/preferences_webserver.xml
  7. 16
      application/vlc-android/src/org/videolan/vlc/gui/helpers/NotificationHelper.kt
  8. 4
      application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesWebserver.kt
  9. 50
      application/webserver/src/main/java/org/videolan/vlc/webserver/TranslationMapping.kt
  10. 2
      application/webserver/src/main/java/org/videolan/vlc/webserver/WebServerRouting.kt
  11. 14
      application/webserver/src/main/java/org/videolan/vlc/webserver/WebServerService.kt
  12. 18
      application/webserver/src/main/java/org/videolan/vlc/webserver/gui/webserver/WebserverShareActivity.kt
  13. 10
      application/webserver/src/main/res/layout-land/webserver_onboarding_content.xml
  14. 4
      application/webserver/src/main/res/layout-land/webserver_onboarding_how.xml
  15. 4
      application/webserver/src/main/res/layout-land/webserver_onboarding_otp.xml
  16. 4
      application/webserver/src/main/res/layout-land/webserver_onboarding_ssl.xml
  17. 4
      application/webserver/src/main/res/layout-land/webserver_onboarding_welcome.xml
  18. 10
      application/webserver/src/main/res/layout/webserver_onboarding_content.xml
  19. 4
      application/webserver/src/main/res/layout/webserver_onboarding_how.xml
  20. 4
      application/webserver/src/main/res/layout/webserver_onboarding_otp.xml
  21. 4
      application/webserver/src/main/res/layout/webserver_onboarding_ssl.xml
  22. 4
      application/webserver/src/main/res/layout/webserver_onboarding_welcome.xml
  23. 8
      application/webserver/src/main/res/layout/webserver_share_activity.xml
  24. 2
      application/webserver/src/main/res/menu/webserver_share.xml

141
application/resources/src/main/res/values/strings.xml

@ -462,30 +462,27 @@
<string name="audio_ducking_title">Lower VLC volume on notifications</string>
<string name="audio_ducking_summary">Helps to hear audio notifications, navigation instructions or assistant talking</string>
<string name="casting_category">Casting</string>
<string name="web_server">Remote access</string>
<string name="web_server_status">Server status</string>
<string name="web_server_status_summary">Tap to see the server status</string>
<string name="web_server_connections">Connections</string>
<string name="web_server_links">Links</string>
<string name="web_server_active">Remote access active</string>
<string name="web_server_notification">Remote access active on %s</string>
<string name="web_server_notification_stopped">Remote access stopped</string>
<string name="web_server_notification_connecting">Remote access connecting</string>
<string name="web_server_notification_error">Remote access error</string>
<string name="web_server_notification_stopping">Remote access stopping</string>
<string name="web_server_notification_not_init">Remote access initialising</string>
<string name="enable_web_server">Enable remote access</string>
<string name="web_server_info">Remote access info</string>
<string name="enable_web_server_auth">Use authentication</string>
<string name="web_server_user">User</string>
<string name="web_server_content">Content</string>
<string name="web_server_medialibrary_content">Media library content</string>
<string name="web_server_medialibrary_content_summary">Enabled: %s\nDisabled: %s</string>
<string name="web_server_file_browser_content">File browser</string>
<string name="web_server_network_browser_content">Network browser</string>
<string name="web_server_playback_control">Control playback</string>
<string name="remote_access">Remote access</string>
<string name="remote_access_status">Server status</string>
<string name="remote_access_status_summary">Tap to see the server status</string>
<string name="remote_access_connections">Connections</string>
<string name="remote_access_links">Links</string>
<string name="remote_access_active">Remote access active</string>
<string name="remote_access_notification">Remote access active on %s</string>
<string name="remote_access_notification_stopped">Remote access stopped</string>
<string name="remote_access_notification_connecting">Remote access connecting</string>
<string name="remote_access_notification_error">Remote access error</string>
<string name="remote_access_notification_stopping">Remote access stopping</string>
<string name="remote_access_notification_not_init">Remote access initialising</string>
<string name="enable_remote_access">Enable remote access</string>
<string name="remote_access_info">Remote access info</string>
<string name="remote_access_content">Content</string>
<string name="remote_access_medialibrary_content">Media library content</string>
<string name="remote_access_medialibrary_content_summary">Enabled: %s\nDisabled: %s</string>
<string name="remote_access_file_browser_content">File browser</string>
<string name="remote_access_network_browser_content">Network browser</string>
<string name="remote_access_playback_control">Control playback</string>
<string name="remote_access_logs">Share log files</string>
<string name="web_server_password">Password</string>
<string name="casting_switch_title">Wireless casting</string>
<string name="casting_passthrough_title">Audio Passthrough</string>
<string name="casting_passthrough_summary">Let your TV manage audio rendering</string>
@ -1179,57 +1176,57 @@
<string name="ignore_headset_media_button_presses_summary">Useful, for instance, if you are using a headset with broken physical buttons</string>
<string name="replace_playlist">Replace playlist</string>
<!-- Network sharing-->
<string name="ns_server_running">Remote access active</string>
<string name="ns_remote_access">Remote access</string>
<string name="ns_remote_access_description">Remote access state notification</string>
<string name="ns_log_file">Log files</string>
<string name="ns_log_type">Log type</string>
<string name="ns_send_files">Send files</string>
<string name="ns_not_in_foreground">Application is not in foreground. Cannot launch video.</string>
<string name="ns_disconnected">Disconnected from device</string>
<string name="ns_file">File</string>
<string name="ns_upload_remaining">Uploading %s files</string>
<string name="ns_upload_all">Upload all</string>
<string name="ns_drop_files_tip">Drop files anywhere to send to your device</string>
<string name="ns_prepare_download">Preparing your download</string>
<string name="ns_forbidden">Content disabled in the settings</string>
<string name="ns_playback_forbidden">Playback control disabled in the settings</string>
<string name="ns_code_requested_explanation">To protect your server, the access is protected.\nPlease enter the code displayed in your notifications</string>
<string name="ns_ssl_explanation_title">Unsecure connection</string>
<string name="ns_ssl_explanation">Your connection is not secure.</string>
<string name="ns_ssl_explanation_browser">Due to the browser security implementation, you will receive a security warning in the next page.</string>
<string name="ns_ssl_explanation_accept">Make sure to accept the certificate to be able to use the remote access</string>
<string name="ns_ssl_button">Use a secure connection</string>
<string name="ns_new_code">Send a new code</string>
<!-- Remote access -->
<string name="ra_server_running">Remote access active</string>
<string name="ra_remote_access">Remote access</string>
<string name="ra_remote_access_description">Remote access state notification</string>
<string name="ra_log_file">Log files</string>
<string name="ra_log_type">Log type</string>
<string name="ra_send_files">Send files</string>
<string name="ra_not_in_foreground">Application is not in foreground. Cannot launch video.</string>
<string name="ra_disconnected">Disconnected from device</string>
<string name="ra_file">File</string>
<string name="ra_upload_remaining">Uploading %s files</string>
<string name="ra_upload_all">Upload all</string>
<string name="ra_drop_files_tip">Drop files anywhere to send to your device</string>
<string name="ra_prepare_download">Preparing your download</string>
<string name="ra_forbidden">Content disabled in the settings</string>
<string name="ra_playback_forbidden">Playback control disabled in the settings</string>
<string name="ra_code_requested_explanation">To protect your server, the access is protected.\nPlease enter the code displayed in your notifications</string>
<string name="ra_ssl_explanation_title">Unsecure connection</string>
<string name="ra_ssl_explanation">Your connection is not secure.</string>
<string name="ra_ssl_explanation_browser">Due to the browser security implementation, you will receive a security warning in the next page.</string>
<string name="ra_ssl_explanation_accept">Make sure to accept the certificate to be able to use the remote access</string>
<string name="ra_ssl_button">Use a secure connection</string>
<string name="ra_new_code">Send a new code</string>
<string name="home">Home</string>
<string name="ns_code">Enter this code: %s</string>
<string name="ns_send_logs">Save remote access\' logs on the device</string>
<string name="ns_otp">Remote access one time password</string>
<string name="ns_otp_description">Access requests for the remote access</string>
<string name="ns_otp_title">Remote access login attempt</string>
<string name="ns_otp_subtitle">If it\'s you, enter this code on the other device</string>
<string name="ns_otp_not_me">It\'s not me</string>
<string name="ra_code">Enter this code: %s</string>
<string name="ra_send_logs">Save remote access\' logs on the device</string>
<string name="ra_otp">Remote access one time password</string>
<string name="ra_otp_description">Access requests for the remote access</string>
<string name="ra_otp_title">Remote access login attempt</string>
<string name="ra_otp_subtitle">If it\'s you, enter this code on the other device</string>
<string name="ra_otp_not_me">It\'s not me</string>
<string name="ns_onboarding_welcome_desc">Welcome in VLC for Android\'s remote access\nBy enabling it you will be able to control this device\'s playback and more</string>
<string name="ns_onboarding_how_title">Control your device</string>
<string name="ns_onboarding_how_desc">Control your device playback, send or retrieve files and more</string>
<string name="ns_onboarding_ssl_title">Data encryption</string>
<string name="ns_onboarding_ssl_desc">The remote access is encrypted to prevent your data from leaking</string>
<string name="ns_onboarding_otp_title">Authentication</string>
<string name="ns_onboarding_otp_desc">With the one time password authentication, prevent unwanted access to your data</string>
<string name="ns_onboarding_content_title">Content access</string>
<string name="ns_onboarding_content_desc">Choose what can be accessed and what can\'t</string>
<string name="ns_onboarding_content_ml">Media library content access</string>
<string name="ns_onboarding_content_files">File browser</string>
<string name="ns_onboarding_content_playback">Playback control</string>
<string name="ns_disable">Disable</string>
<string name="ns_log_web">Remote access log</string>
<string name="ns_log_crash">Crash log</string>
<string name="ns_log_mobile">Device log</string>
<string name="ns_log_current">Current local logs</string>
<string name="ns_invalid_login">You need to log in on your device</string>
<string name="ns_invalid_otp">Invalid code provided</string>
<string name="ra_onboarding_welcome_desc">Welcome in VLC for Android\'s remote access\nBy enabling it you will be able to control this device\'s playback and more</string>
<string name="ra_onboarding_how_title">Control your device</string>
<string name="ra_onboarding_how_desc">Control your device playback, send or retrieve files and more</string>
<string name="ra_onboarding_ssl_title">Data encryption</string>
<string name="ra_onboarding_ssl_desc">The remote access is encrypted to prevent your data from leaking</string>
<string name="ra_onboarding_otp_title">Authentication</string>
<string name="ra_onboarding_otp_desc">With the one time password authentication, prevent unwanted access to your data</string>
<string name="ra_onboarding_content_title">Content access</string>
<string name="ra_onboarding_content_desc">Choose what can be accessed and what can\'t</string>
<string name="ra_onboarding_content_ml">Media library content access</string>
<string name="ra_onboarding_content_files">File browser</string>
<string name="ra_onboarding_content_playback">Playback control</string>
<string name="ra_disable">Disable</string>
<string name="ra_log_web">Remote access log</string>
<string name="ra_log_crash">Crash log</string>
<string name="ra_log_mobile">Device log</string>
<string name="ra_log_current">Current local logs</string>
<string name="ra_invalid_login">You need to log in on your device</string>
<string name="ra_invalid_otp">Invalid code provided</string>
</resources>

4
application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesWebserver.kt

@ -50,7 +50,7 @@ class PreferencesWebserver : BasePreferenceFragment(), SharedPreferences.OnShare
private lateinit var settings: SharedPreferences
private lateinit var medialibraryContentPreference: MultiSelectListPreference
override fun getTitleId() = R.string.web_server
override fun getTitleId() = R.string.remote_access
override fun getXml() = R.xml.preferences_webserver
@ -85,7 +85,7 @@ class PreferencesWebserver : BasePreferenceFragment(), SharedPreferences.OnShare
}
val currentString = if (currentValues.isEmpty()) "-" else TextUtils.separatedString(currentValues.toTypedArray())
val currentDisabledString = if (currentDisabledValues.isEmpty()) "-" else TextUtils.separatedString(currentDisabledValues.toTypedArray())
medialibraryContentPreference.summary = getString(R.string.web_server_medialibrary_content_summary, currentString, currentDisabledString)
medialibraryContentPreference.summary = getString(R.string.remote_access_medialibrary_content_summary, currentString, currentDisabledString)
}
override fun onPreferenceTreeClick(preference: Preference?): Boolean {

6
application/vlc-android/res/layout/otp_code.xml

@ -20,7 +20,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="sans-serif-medium"
android:text="@string/ns_otp_title"
android:text="@string/ra_otp_title"
android:textAlignment="center"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
@ -35,7 +35,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:fontFamily="sans-serif-medium"
android:text="@string/ns_otp_subtitle"
android:text="@string/ra_otp_subtitle"
android:textAlignment="center"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
@ -105,7 +105,7 @@
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ns_otp_not_me"
android:text="@string/ra_otp_not_me"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

2
application/vlc-android/res/menu/activity_prefs.xml

@ -38,7 +38,7 @@
android:orderInCategory="2"
android:id="@+id/menu_webserver_onboarding"
android:icon="@drawable/ic_am_information"
android:title="@string/ns_remote_access"
android:title="@string/ra_remote_access"
android:visible="false"
vlc:showAsAction="always|collapseActionView"/>
</menu>

2
application/vlc-android/res/xml/preferences.xml

@ -93,7 +93,7 @@
android:fragment="org.videolan.television.ui.preferences.PreferencesParentalControl"
android:title="@string/parental_control"/>
<Preference
android:title="@string/web_server"
android:title="@string/remote_access"
android:key="webserver_category"
android:fragment="org.videolan.television.ui.preferences.PreferencesWebserver"/>
<Preference

22
application/vlc-android/res/xml/preferences_webserver.xml

@ -3,47 +3,47 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:key="audio_category"
android:title="@string/web_server">
android:title="@string/remote_access">
<PreferenceScreen
android:key="web_server_info"
app:isPreferenceVisible="false"
android:title="@string/web_server_info" />
android:title="@string/remote_access_info" />
<CheckBoxPreference
android:defaultValue="false"
android:key="enable_web_server"
android:switchTextOff="Disabled"
android:switchTextOn="Enabled"
android:title="@string/enable_web_server"
android:title="@string/enable_remote_access"
app:singleLineTitle="false" />
<PreferenceScreen
android:dependency="enable_web_server"
android:key="web_server_status"
android:summary="@string/web_server_status_summary"
android:title="@string/web_server_status" />
<PreferenceCategory android:title="@string/web_server_content">
android:summary="@string/remote_access_status_summary"
android:title="@string/remote_access_status" />
<PreferenceCategory android:title="@string/remote_access_content">
<MultiSelectListPreference
android:dependency="enable_web_server"
app:defaultValue="@array/web_server_content_values"
app:dialogTitle="@string/web_server_medialibrary_content"
app:dialogTitle="@string/remote_access_medialibrary_content"
app:entries="@array/web_server_content_entries"
app:entryValues="@array/web_server_content_values"
app:key="web_server_medialibrary_content"
app:title="@string/web_server_medialibrary_content" />
app:title="@string/remote_access_medialibrary_content" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="enable_web_server"
android:key="web_server_file_browser_content"
android:title="@string/web_server_file_browser_content" />
android:title="@string/remote_access_file_browser_content" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="enable_web_server"
android:key="web_server_network_browser_content"
android:title="@string/web_server_network_browser_content" />
android:title="@string/remote_access_network_browser_content" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="enable_web_server"
android:key="web_server_playback_control"
android:title="@string/web_server_playback_control" />
android:title="@string/remote_access_playback_control" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="enable_web_server"

16
application/vlc-android/src/org/videolan/vlc/gui/helpers/NotificationHelper.kt

@ -192,7 +192,7 @@ object NotificationHelper {
.setContentIntent(PendingIntent.getActivity(ctx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
.setSmallIcon(R.drawable.ic_notif_web_server)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setContentTitle(ctx.getString(R.string.ns_server_running))
.setContentTitle(ctx.getString(R.string.ra_server_running))
.setAutoCancel(false)
.setCategory(NotificationCompat.CATEGORY_SERVICE)
.setOngoing(true)
@ -203,7 +203,7 @@ object NotificationHelper {
disableIntent.action = ACTION_DISABLE_SERVER
disableIntent.`package` = ctx.packageName
val piDisable = PendingIntent.getBroadcast(ctx.applicationContext.getContextWithLocale(AppContextProvider.locale), 0, disableIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
val disableAction = NotificationCompat.Action(R.drawable.ic_popup_close_w,ctx.getString(R.string.ns_disable), piDisable)
val disableAction = NotificationCompat.Action(R.drawable.ic_popup_close_w,ctx.getString(R.string.ra_disable), piDisable)
webServerCompatBuilder.addAction(disableAction)
//Start / Stop
@ -220,10 +220,10 @@ object NotificationHelper {
val webServerCompatBuilder = NotificationCompat.Builder(ctx, WEB_SERVER_OTP_CHANNEL_ID)
.setSmallIcon(R.drawable.ic_notif_web_server)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setContentTitle(ctx.getString(R.string.ns_otp_title))
.setContentTitle(ctx.getString(R.string.ra_otp_title))
.setAutoCancel(true)
.setCategory(NotificationCompat.CATEGORY_SERVICE)
webServerCompatBuilder.setContentText(ctx.getString(R.string.ns_code, code))
webServerCompatBuilder.setContentText(ctx.getString(R.string.ra_code, code))
return webServerCompatBuilder.build()
}
@ -254,8 +254,8 @@ object NotificationHelper {
// Web server channel
if (notificationManager.getNotificationChannel(WEB_SERVER_CHANNEL_ID) == null ) {
val name = appCtx.getString(R.string.ns_remote_access)
val description = appCtx.getString(R.string.ns_remote_access_description)
val name = appCtx.getString(R.string.ra_remote_access)
val description = appCtx.getString(R.string.ra_remote_access_description)
val channel = NotificationChannel(WEB_SERVER_CHANNEL_ID, name, NotificationManager.IMPORTANCE_MIN)
channel.description = description
channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
@ -264,8 +264,8 @@ object NotificationHelper {
// Web server OTP channel
if (notificationManager.getNotificationChannel(WEB_SERVER_OTP_CHANNEL_ID) == null ) {
val name = appCtx.getString(R.string.ns_otp)
val description = appCtx.getString(R.string.ns_otp_description)
val name = appCtx.getString(R.string.ra_otp)
val description = appCtx.getString(R.string.ra_otp_description)
val channel = NotificationChannel(WEB_SERVER_OTP_CHANNEL_ID, name, NotificationManager.IMPORTANCE_HIGH)
channel.description = description
channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC

4
application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesWebserver.kt

@ -49,7 +49,7 @@ class PreferencesWebserver : BasePreferenceFragment(), SharedPreferences.OnShare
private lateinit var settings: SharedPreferences
private lateinit var medialibraryContentPreference: MultiSelectListPreference
override fun getTitleId() = R.string.web_server
override fun getTitleId() = R.string.remote_access
override fun getXml() = R.xml.preferences_webserver
@ -99,7 +99,7 @@ class PreferencesWebserver : BasePreferenceFragment(), SharedPreferences.OnShare
}
val currentString = if (currentValues.isEmpty()) "-" else TextUtils.separatedString(currentValues.toTypedArray())
val currentDisabledString = if (currentDisabledValues.isEmpty()) "-" else TextUtils.separatedString(currentDisabledValues.toTypedArray())
medialibraryContentPreference.summary = getString(R.string.web_server_medialibrary_content_summary, currentString, currentDisabledString)
medialibraryContentPreference.summary = getString(R.string.remote_access_medialibrary_content_summary, currentString, currentDisabledString)
}
override fun onPreferenceTreeClick(preference: Preference?): Boolean {

50
application/webserver/src/main/java/org/videolan/vlc/webserver/TranslationMapping.kt

@ -46,44 +46,44 @@ object TranslationMapping {
ALBUMS(R.string.albums),
TRACKS(R.string.tracks),
GENRES(R.string.genres),
LOG_FILE(R.string.ns_log_file),
LOG_TYPE(R.string.ns_log_type),
SEND_FILES(R.string.ns_send_files),
LOG_FILE(R.string.ra_log_file),
LOG_TYPE(R.string.ra_log_type),
SEND_FILES(R.string.ra_send_files),
DOWNLOAD(R.string.download),
NO_MEDIA(R.string.nomedia),
PLAY(R.string.play),
APPEND(R.string.append),
PLAY_AS_AUDIO(R.string.play_as_audio),
SEARCH(R.string.search),
DISCONNECTED(R.string.ns_disconnected),
FILE(R.string.ns_file),
UPLOAD_REMAINING(R.string.ns_upload_remaining),
UPLOAD_ALL(R.string.ns_upload_all),
DROP_FILES_TIP(R.string.ns_drop_files_tip),
PREPARING_DOWNLOAD(R.string.ns_prepare_download),
DISCONNECTED(R.string.ra_disconnected),
FILE(R.string.ra_file),
UPLOAD_REMAINING(R.string.ra_upload_remaining),
UPLOAD_ALL(R.string.ra_upload_all),
DROP_FILES_TIP(R.string.ra_drop_files_tip),
PREPARING_DOWNLOAD(R.string.ra_prepare_download),
RESUME_PLAYBACK(R.string.resume_playback_short_title),
DISPLAY_LIST(R.string.display_in_list),
DISPLAY_GRID(R.string.display_in_grid),
SEARCH_HINT(R.string.search_hint),
SEARCH_NO_RESULT(R.string.search_no_result),
DIRECTORY_EMPTY(R.string.empty_directory),
FORBIDDEN(R.string.ns_forbidden),
PLAYBACK_CONTROL_FORBIDDEN(R.string.ns_playback_forbidden),
FORBIDDEN(R.string.ra_forbidden),
PLAYBACK_CONTROL_FORBIDDEN(R.string.ra_playback_forbidden),
SEND(R.string.send),
NEW_CODE(R.string.ns_new_code),
CODE_REQUEST_EXPLANATION(R.string.ns_code_requested_explanation),
SSL_BUTTON(R.string.ns_ssl_button),
SSL_EXPLANATION_TITLE(R.string.ns_ssl_explanation_title),
SSL_EXPLANATION(R.string.ns_ssl_explanation),
SSL_EXPLANATION_BROWSER(R.string.ns_ssl_explanation_browser),
SSL_EXPLANATION_ACCEPT(R.string.ns_ssl_explanation_accept),
SEND_LOGS(R.string.ns_send_logs),
LOG_TYPE_WEB(R.string.ns_log_web),
LOG_TYPE_CRASH(R.string.ns_log_crash),
LOG_TYPE_MOBILE(R.string.ns_log_mobile),
LOG_TYPE_CURRENT(R.string.ns_log_current),
NEW_CODE(R.string.ra_new_code),
CODE_REQUEST_EXPLANATION(R.string.ra_code_requested_explanation),
SSL_BUTTON(R.string.ra_ssl_button),
SSL_EXPLANATION_TITLE(R.string.ra_ssl_explanation_title),
SSL_EXPLANATION(R.string.ra_ssl_explanation),
SSL_EXPLANATION_BROWSER(R.string.ra_ssl_explanation_browser),
SSL_EXPLANATION_ACCEPT(R.string.ra_ssl_explanation_accept),
SEND_LOGS(R.string.ra_send_logs),
LOG_TYPE_WEB(R.string.ra_log_web),
LOG_TYPE_CRASH(R.string.ra_log_crash),
LOG_TYPE_MOBILE(R.string.ra_log_mobile),
LOG_TYPE_CURRENT(R.string.ra_log_current),
NOTHING_RESUME(R.string.resume_playback_error),
INVALID_LOGIN(R.string.ns_invalid_login),
INVALID_OTP(R.string.ns_invalid_otp),
INVALID_LOGIN(R.string.ra_invalid_login),
INVALID_OTP(R.string.ra_invalid_otp),
}
}

2
application/webserver/src/main/java/org/videolan/vlc/webserver/WebServerRouting.kt

@ -640,7 +640,7 @@ fun Route.setupRouting(appContext: Context, scope: CoroutineScope) {
}
if (asAudio) medias[0].addFlags(MediaWrapper.MEDIA_FORCE_AUDIO)
if (medias[0].type == MediaWrapper.TYPE_VIDEO && !appContext.awaitAppIsForegroung()) {
call.respond(HttpStatusCode.Forbidden, appContext.getString(R.string.ns_not_in_foreground))
call.respond(HttpStatusCode.Forbidden, appContext.getString(R.string.ra_not_in_foreground))
}
when {
append -> MediaUtils.appendMedia(appContext, medias)

14
application/webserver/src/main/java/org/videolan/vlc/webserver/WebServerService.kt

@ -117,14 +117,14 @@ class WebServerService : LifecycleService() {
}
private fun forceForeground() {
val contentString = if (!::server.isInitialized) getString(R.string.web_server_notification_not_init) else
val contentString = if (!::server.isInitialized) getString(R.string.remote_access_notification_not_init) else
when (server.serverStatus.value) {
ServerStatus.NOT_INIT -> getString(R.string.web_server_notification_not_init)
ServerStatus.STARTED -> getString(R.string.web_server_notification, server.getServerAddresses().joinToString("\n"))
ServerStatus.STOPPED -> getString(R.string.web_server_notification_stopped)
ServerStatus.CONNECTING -> getString(R.string.web_server_notification_connecting)
ServerStatus.ERROR -> getString(R.string.web_server_notification_error)
ServerStatus.STOPPING -> getString(R.string.web_server_notification_stopping)
ServerStatus.NOT_INIT -> getString(R.string.remote_access_notification_not_init)
ServerStatus.STARTED -> getString(R.string.remote_access_notification, server.getServerAddresses().joinToString("\n"))
ServerStatus.STOPPED -> getString(R.string.remote_access_notification_stopped)
ServerStatus.CONNECTING -> getString(R.string.remote_access_notification_connecting)
ServerStatus.ERROR -> getString(R.string.remote_access_notification_error)
ServerStatus.STOPPING -> getString(R.string.remote_access_notification_stopping)
else -> ""
}
val started = ::server.isInitialized && server.serverStatus.value == ServerStatus.STARTED

18
application/webserver/src/main/java/org/videolan/vlc/webserver/gui/webserver/WebserverShareActivity.kt

@ -75,17 +75,17 @@ class WebserverShareActivity : BaseActivity() {
setSupportActionBar(toolbar)
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_up)
title = getString(R.string.web_server)
title = getString(R.string.remote_access)
val httpSharingServer = HttpSharingServer.getInstance(applicationContext)
httpSharingServer.serverStatus.observe(this) { serverStatus ->
binding.serverStatus.text = when (serverStatus) {
ServerStatus.NOT_INIT -> getString(R.string.web_server_notification_not_init)
ServerStatus.STARTED -> getString(R.string.web_server_active)
ServerStatus.STOPPED -> getString(R.string.web_server_notification_stopped)
ServerStatus.CONNECTING -> getString(R.string.web_server_notification_connecting)
ServerStatus.ERROR -> getString(R.string.web_server_notification_error)
ServerStatus.STOPPING -> getString(R.string.web_server_notification_stopping)
ServerStatus.NOT_INIT -> getString(R.string.remote_access_notification_not_init)
ServerStatus.STARTED -> getString(R.string.remote_access_active)
ServerStatus.STOPPED -> getString(R.string.remote_access_notification_stopped)
ServerStatus.CONNECTING -> getString(R.string.remote_access_notification_connecting)
ServerStatus.ERROR -> getString(R.string.remote_access_notification_error)
ServerStatus.STOPPING -> getString(R.string.remote_access_notification_stopping)
else -> ""
}
@ -117,7 +117,7 @@ class WebserverShareActivity : BaseActivity() {
qrView.setPadding(8.dp,8.dp,8.dp,8.dp)
qrView.setImageBitmap(UrlUtils.generateQRCode(link, 512))
AlertDialog.Builder(this)
.setTitle(resources.getString(R.string.web_server_notification, link))
.setTitle(resources.getString(R.string.remote_access_notification, link))
.setView(qrView)
.setPositiveButton(R.string.ok, null)
.show()
@ -161,7 +161,7 @@ class WebserverShareActivity : BaseActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
android.R.id.home -> finish()
R.id.webserver_share -> share(getString(R.string.web_server), HttpSharingServer.getInstance(applicationContext).getServerAddresses()[0])
R.id.webserver_share -> share(getString(R.string.remote_access), HttpSharingServer.getInstance(applicationContext).getServerAddresses()[0])
R.id.menu_webserver_onboarding -> startActivity(Intent(Intent.ACTION_VIEW).apply { setClassName(this@WebserverShareActivity, WEBSERVER_ONBOARDING) })
}

10
application/webserver/src/main/res/layout-land/webserver_onboarding_content.xml

@ -45,7 +45,7 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:text="@string/ns_onboarding_content_title"
android:text="@string/ra_onboarding_content_title"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintBottom_toTopOf="@+id/textView"
@ -62,7 +62,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_content_desc"
android:text="@string/ra_onboarding_content_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintBottom_toBottomOf="parent"
@ -98,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/ns_onboarding_content_ml"
android:text="@string/ra_onboarding_content_ml"
android:textColor="@color/white" />
</LinearLayout>
@ -129,7 +129,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/ns_onboarding_content_files"
android:text="@string/ra_onboarding_content_files"
android:textColor="@color/white" />
</LinearLayout>
@ -169,7 +169,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/ns_onboarding_content_playback"
android:text="@string/ra_onboarding_content_playback"
android:textColor="@color/white" />
</LinearLayout>

4
application/webserver/src/main/res/layout-land/webserver_onboarding_how.xml

@ -45,7 +45,7 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:text="@string/ns_onboarding_how_title"
android:text="@string/ra_onboarding_how_title"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintBottom_toTopOf="@+id/textView"
@ -62,7 +62,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_how_desc"
android:text="@string/ra_onboarding_how_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintBottom_toBottomOf="parent"

4
application/webserver/src/main/res/layout-land/webserver_onboarding_otp.xml

@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_otp_title"
android:text="@string/ra_onboarding_otp_title"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintBottom_toTopOf="@+id/textView"
@ -61,7 +61,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_otp_desc"
android:text="@string/ra_onboarding_otp_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintBottom_toBottomOf="parent"

4
application/webserver/src/main/res/layout-land/webserver_onboarding_ssl.xml

@ -45,7 +45,7 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:text="@string/ns_onboarding_ssl_title"
android:text="@string/ra_onboarding_ssl_title"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintBottom_toTopOf="@+id/textView"
@ -61,7 +61,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_ssl_desc"
android:text="@string/ra_onboarding_ssl_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintBottom_toBottomOf="parent"

4
application/webserver/src/main/res/layout-land/webserver_onboarding_welcome.xml

@ -48,7 +48,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/ns_remote_access"
android:text="@string/ra_remote_access"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintBottom_toTopOf="@+id/textView"
@ -60,7 +60,7 @@
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/ns_onboarding_welcome_desc"
android:text="@string/ra_onboarding_welcome_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintBottom_toBottomOf="parent"

10
application/webserver/src/main/res/layout/webserver_onboarding_content.xml

@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_content_title"
android:text="@string/ra_onboarding_content_title"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintEnd_toEndOf="parent"
@ -34,7 +34,7 @@
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:text="@string/ns_onboarding_content_desc"
android:text="@string/ra_onboarding_content_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintEnd_toEndOf="parent"
@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/ns_onboarding_content_ml"
android:text="@string/ra_onboarding_content_ml"
android:textColor="@color/white" />
</LinearLayout>
@ -97,7 +97,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/ns_onboarding_content_files"
android:text="@string/ra_onboarding_content_files"
android:textColor="@color/white" />
</LinearLayout>
@ -138,7 +138,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/ns_onboarding_content_playback"
android:text="@string/ra_onboarding_content_playback"
android:textColor="@color/white" />
</LinearLayout>

4
application/webserver/src/main/res/layout/webserver_onboarding_how.xml

@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_how_title"
android:text="@string/ra_onboarding_how_title"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintEnd_toEndOf="parent"
@ -34,7 +34,7 @@
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:text="@string/ns_onboarding_how_desc"
android:text="@string/ra_onboarding_how_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintEnd_toEndOf="parent"

4
application/webserver/src/main/res/layout/webserver_onboarding_otp.xml

@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_otp_title"
android:text="@string/ra_onboarding_otp_title"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintEnd_toEndOf="parent"
@ -34,7 +34,7 @@
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:text="@string/ns_onboarding_otp_desc"
android:text="@string/ra_onboarding_otp_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintEnd_toEndOf="parent"

4
application/webserver/src/main/res/layout/webserver_onboarding_ssl.xml

@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_onboarding_ssl_title"
android:text="@string/ra_onboarding_ssl_title"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintEnd_toEndOf="parent"
@ -34,7 +34,7 @@
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:text="@string/ns_onboarding_ssl_desc"
android:text="@string/ra_onboarding_ssl_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintEnd_toEndOf="parent"

4
application/webserver/src/main/res/layout/webserver_onboarding_welcome.xml

@ -25,7 +25,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="16dp"
android:text="@string/ns_remote_access"
android:text="@string/ra_remote_access"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Title"
app:layout_constraintEnd_toEndOf="parent"
@ -39,7 +39,7 @@
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:text="@string/ns_onboarding_welcome_desc"
android:text="@string/ra_onboarding_welcome_desc"
android:textAlignment="center"
android:textAppearance="@style/VLC.Onboarding.Text"
app:layout_constraintEnd_toEndOf="parent"

8
application/webserver/src/main/res/layout/webserver_share_activity.xml

@ -47,7 +47,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/web_server_status"
android:text="@string/remote_access_status"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -64,7 +64,7 @@
app:layout_constraintEnd_toStartOf="@+id/status_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/status_button"
tools:text="@string/web_server_notification" />
tools:text="@string/remote_access_notification" />
<Button
android:id="@+id/status_button"
@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/web_server_links"
android:text="@string/remote_access_links"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/status_button" />
@ -120,7 +120,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/web_server_connections"
android:text="@string/remote_access_connections"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/links_grid" />

2
application/webserver/src/main/res/menu/webserver_share.xml

@ -33,6 +33,6 @@
android:orderInCategory="2"
android:id="@+id/menu_webserver_onboarding"
android:icon="@drawable/ic_am_information"
android:title="@string/ns_remote_access"
android:title="@string/ra_remote_access"
app:showAsAction="ifRoom"/>
</menu>
Loading…
Cancel
Save