added server info and deal with thi 'connecting...' bug

3 files changed, 85 insertions, 1 deletions

diff --git a/res/layout/server_info.xml b/res/layout/server_info.xml
new file mode 100644
index 000000000..be317f9e2
--- /dev/null
+++ b/res/layout/server_info.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:padding="8dp" >
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Connection age"
+        android:textSize="18sp"/>
+    
+     <TextView
+        android:id="@+id/connection"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/textView1"
+        android:layout_alignBottom="@+id/textView1"
+        android:layout_alignParentRight="true"
+        android:textSize="18sp"/>
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/textView1"
+        android:text="Session age"
+        android:textSize="18sp"/>
+    
+        <TextView
+        android:id="@+id/session"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/textView2"
+        android:layout_alignBottom="@+id/textView2"
+        android:layout_alignParentRight="true"
+        android:textSize="18sp"/>
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/textView2"
+        android:text="Packets sent"
+        android:textSize="18sp"/>
+
+       <TextView
+        android:id="@+id/pcks_sent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/textView3"
+        android:layout_alignBottom="@+id/textView3"
+        android:layout_alignParentRight="true"
+        android:textSize="18sp"/>
+
+
+    <TextView
+        android:id="@+id/textView4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/textView3"
+        android:text="Packets received"
+        android:textSize="18sp"/>
+
+ 
+
+    <TextView
+        android:id="@+id/pcks_received"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/textView4"
+        android:layout_alignBottom="@+id/textView4"
+        android:layout_alignParentRight="true"
+        android:textSize="18sp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
index 22b7ac34d..765ed4e92 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/res/menu/manageaccounts_context.xml
@@ -23,8 +23,12 @@
     
         <item
         android:id="@+id/mgmt_account_announce_pgp"
-        android:orderInCategory="75"
         android:showAsAction="never"
         android:title="@string/announce_pgp" />
+        <item
+            android:id="@+id/mgmt_account_info"
+            android:title="@string/account_info"
+            android:showAsAction="never"
+            />
 
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4995523b0..7f0977ec9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,4 +23,5 @@
     <string name="enter_new_name">Enter a new name:</string>
     <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed.</string>
     <string name="untrusted_cert_hint">The server %s presented you with an unstrusted, possible self signed, certificate.</string>
+    <string name="account_info">Server Info</string>
 </resources>