Skip to content
Snippets Groups Projects
Commit 77748b60 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Add warning text if encryption will not be managed

parent 1828a1e1
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" >
<data>
<import type="android.view.View" />
<import type="org.videolan.libvlc.util.AndroidUtil" />
<variable name="dialog" type="org.videolan.libvlc.Dialog.LoginDialog"/>
<variable name="handler" type="org.videolan.vlc.gui.dialogs.VlcLoginDialog"/>
</data>
......@@ -57,11 +58,19 @@
android:layout_alignParentLeft="true"
android:layout_margin="5dp"
android:visibility="@{dialog.asksStore() ? View.VISIBLE : View.GONE}"/>
<TextView
android:id="@+id/warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/store"
android:layout_margin="10dp"
android:text="@string/encryption_warning"
android:visibility="@{dialog.asksStore() &amp;&amp; !AndroidUtil.isMarshMallowOrLater() ? View.VISIBLE : View.GONE}" />
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/store"
android:layout_below="@+id/warning"
android:layout_toLeftOf="@+id/action"
android:text="@android:string/cancel"
android:onClick="@{handler.onCancel}"
......@@ -72,7 +81,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/store"
android:layout_below="@+id/warning"
android:text="@android:string/ok"
android:onClick="@{handler.onLogin}"
tools:targetApi="11"
......
......@@ -595,6 +595,7 @@
<string name="chroma_format_default" translatable="false">RV32</string>
<string name="network_favorites">Network favorites</string>
<string name="network_shared_folders">Shared folders</string>
<string name="encryption_warning">Warning, encryption is not available for this Android version, password will be stored in a private space but not encrypted</string>
<string-array name="chroma_formats" translatable="false">
<item>RGB 32-bit</item>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment