qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make UI robust against malicious plugins trying to hide scopes or providing incorrect descriptions

Browse Source
This commit is contained in:
Philipp Crocoll
2017-08-14 10:36:23 +02:00
parent 35f2e95de2
commit 55bea71ec2
2 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/keepass2android/Resources/layout/plugin_details.xml
View File

@@ -5,7 +5,7 @@
<LinearLayout
android:id="@+id/bottom_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:orientation="horizontal"
android:divider="?android:attr/dividerVertical"
android:showDividers="middle"
@@ -47,6 +47,35 @@
android:text="@string/deny" />
</FrameLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/bottom_bar_scopes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="56dp"
android:orientation="vertical"
android:divider="?android:attr/dividerVertical"
android:showDividers="middle"
android:layout_alignParentBottom="true"
android:dividerPadding="12dp"
android:baselineAligned="false">
<TextView
android:id="@+id/scopes_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/plugin_scopes"
android:layout_marginLeft="10dp"
android:layout_marginTop="18dp"
style="@style/ExtraFieldHeader" />
<LinearLayout android:id="@+id/scopes_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -98,7 +127,15 @@
android:layout_height="wrap_content" />
</RelativeLayout>
<TextView
<TextView
android:id="@+id/txtPluginDescription"
android:text="@string/PluginDescription"
android:textSize="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/txtShortDesc"
android:text=""
android:textSize="14dp"
@@ -113,19 +150,6 @@
android:checked="true"
/>
<TextView
android:id="@+id/scopes_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/plugin_scopes"
android:layout_marginLeft="10dp"
android:layout_marginTop="18dp"
style="@style/ExtraFieldHeader" />
<LinearLayout android:id="@+id/scopes_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>
</ScrollView>
</RelativeLayout>

2
src/keepass2android/Resources/values/strings.xml
View File

@@ -1010,6 +1010,6 @@ Initial public release
<string name="ClearClipboardWarning">Make sure this works on your system and consider using the built-in keyboard if not.</string>
<string name="PluginDescription">Description provided by the plugin:</string>
</resources>