From 3bb5fcb3ca3586f2c641e0810ba0e019604ad7e4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 7 Mar 2014 14:24:33 +0100
Subject: tls exceptions for untrusted certs

---
 res/layout/cert_warning.xml         | 32 ++++++++++++++++++++++++++++++++
 res/menu/manageaccounts_context.xml | 17 +++++++++++------
 2 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 res/layout/cert_warning.xml

(limited to 'res')

diff --git a/res/layout/cert_warning.xml b/res/layout/cert_warning.xml
new file mode 100644
index 000000000..2e1e55117
--- /dev/null
+++ b/res/layout/cert_warning.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <TextView
+        android:id="@+id/hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"/>
+
+    <TextView
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:id="@+id/sha"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:typeface="monospace"
+        android:textSize="18sp"/>
+
+    <TextView
+        android:id="@+id/dont"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#FFe92727"
+        android:textStyle="bold"
+        android:textSize="18sp"
+        android:text="Do not connect unless you know exactly what you are doing" />
+    
+</LinearLayout>
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
index a51a8e52f..22b7ac34d 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/res/menu/manageaccounts_context.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:id="@+id/account_delete"
+        android:id="@+id/mgmt_account_edit"
+        android:icon="@drawable/ic_action_edit"
+        android:title="Edit Account"
+        android:showAsAction="always" />
+    <item
+        android:id="@+id/mgmt_account_delete"
         android:icon="@drawable/ic_action_delete"
         android:title="Delete"
         android:showAsAction="always"
         />
     <item
-        android:id="@+id/account_disable"
+        android:id="@+id/mgmt_account_disable"
         android:title="Temporarily disable"
-        android:showAsAction="always"/>
+        android:showAsAction="never"/>
     <item
-        android:id="@+id/account_enable"
+        android:id="@+id/mgmt_account_enable"
         android:title="Enable"
-        android:showAsAction="always"
+        android:showAsAction="never"
         android:visible="false"/>
     
         <item
-        android:id="@+id/announce_pgp"
+        android:id="@+id/mgmt_account_announce_pgp"
         android:orderInCategory="75"
         android:showAsAction="never"
         android:title="@string/announce_pgp" />
-- 
cgit v1.2.3