Added view of identity

AndroidManifest.xml

@@ -36,8 +36,11 @@
             android:name="i2p.bote.config.SetPasswordActivity"
             android:parentActivityName="i2p.bote.config.SettingsActivity" />
         <activity
-            android:name="i2p.bote.config.EditIdentityActivity"
+            android:name="i2p.bote.config.ViewIdentityActivity"
             android:parentActivityName="i2p.bote.config.SettingsActivity" />
+        <activity
+            android:name="i2p.bote.config.EditIdentityActivity"
+            android:parentActivityName="i2p.bote.config.ViewIdentityActivity" />
     </application>
 
 </manifest>

res/layout/fragment_view_identity.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:paddingTop="10dp" >
+
+    <ImageView
+        android:id="@+id/identity_picture"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_launcher" />
+
+    <TextView
+        android:id="@+id/public_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/identity_picture"
+        android:layout_toRightOf="@+id/identity_picture"
+        android:ems="10"
+        android:text="@string/public_name" />
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/identity_picture"
+        android:ems="10"
+        android:text="@string/description" />
+
+    <TextView
+        android:id="@+id/crypto_impl"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/description"
+        android:layout_below="@+id/description"
+        android:text="Crypto implementation" />
+
+    <TextView
+        android:id="@+id/key"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/crypto_impl"
+        android:text="Key" />
+
+</RelativeLayout>

res/menu/view_identity.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:i2pandroid="http://schemas.android.com/apk/res-auto" >
+
+    <item
+        android:id="@+id/action_edit_identity"
+        android:icon="@drawable/ic_content_edit"
+        android:title="@string/edit_identity"
+        i2pandroid:showAsAction="ifRoom"/>
+
+</menu>

res/values/strings.xml

@@ -62,6 +62,7 @@
 
     <string name="pref_title_identities">Identities</string>
     <string name="new_identity">New identity</string>
+    <string name="edit_identity">Edit identity</string>
     <string name="public_name">Public name</string>
     <string name="description">Description</string>
     <string name="default_identity">Default identity</string>

src/i2p/bote/config/SettingsActivity.java

@@ -162,7 +162,7 @@ public class SettingsActivity extends PreferenceActivity {
                 Header header = mIdentityListHeaders[index];
                 if (header != null && header.id != HEADER_ID_UNDEFINED) {
                     String key = header.extras.getString(
-                            EditIdentityFragment.IDENTITY_KEY);
+                            ViewIdentityFragment.IDENTITY_KEY);
                     if (key != mDeletingIdentityKey) {
                         target.add(header);
                         if (key == mRequestedIdentityKey) {
@@ -276,9 +276,9 @@ public class SettingsActivity extends PreferenceActivity {
                 final String desc = identity.getDescription();
                 final String key = identity.getKey();
                 final Intent intent = new Intent(
-                        getApplicationContext(), EditIdentityActivity.class);
+                        getApplicationContext(), ViewIdentityActivity.class);
                 final Bundle args = new Bundle();
-                args.putString(EditIdentityFragment.IDENTITY_KEY, key);
+                args.putString(ViewIdentityFragment.IDENTITY_KEY, key);
                 intent.putExtras(args);
                 final Header newHeader = new Header();
                 newHeader.id = id;

src/i2p/bote/config/ViewIdentityActivity.java

@@ -0,0 +1,24 @@
+package i2p.bote.config;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+
+public class ViewIdentityActivity extends ActionBarActivity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (savedInstanceState == null) {
+            String key = null;
+            Bundle args = getIntent().getExtras();
+            if (args != null)
+                key = args.getString(ViewIdentityFragment.IDENTITY_KEY);
+            ViewIdentityFragment f = ViewIdentityFragment.newInstance(key);
+            getSupportFragmentManager().beginTransaction()
+                .add(android.R.id.content, f).commit();
+        }
+    }
+}

src/i2p/bote/config/ViewIdentityFragment.java

@@ -0,0 +1,107 @@
+package i2p.bote.config;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+import i2p.bote.R;
+import i2p.bote.email.EmailIdentity;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.util.BoteHelper;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+public class ViewIdentityFragment extends Fragment {
+    public static final String IDENTITY_KEY = "identity_key";
+
+    private String mKey;
+    private EmailIdentity mIdentity;
+
+    TextView mNameField;
+    TextView mDescField;
+    TextView mCryptoField;
+    TextView mKeyField;
+
+    public static ViewIdentityFragment newInstance(String key) {
+        ViewIdentityFragment f = new ViewIdentityFragment();
+        Bundle args = new Bundle();
+        args.putString(IDENTITY_KEY, key);
+        f.setArguments(args);
+        return f;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_view_identity, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mKey = getArguments().getString(IDENTITY_KEY);
+        if (mKey != null) {
+            try {
+                mIdentity = BoteHelper.getIdentity(mKey);
+                mNameField = (TextView) view.findViewById(R.id.public_name);
+                mDescField = (TextView) view.findViewById(R.id.description);
+                mCryptoField = (TextView) view.findViewById(R.id.crypto_impl);
+                mKeyField = (TextView) view.findViewById(R.id.key);
+            } catch (PasswordException e) {
+                // TODO Handle
+                e.printStackTrace();
+            } catch (IOException e) {
+                // TODO Handle
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                // TODO Handle
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mIdentity != null) {
+            mNameField.setText(mIdentity.getPublicName());
+            mDescField.setText(mIdentity.getDescription());
+            mCryptoField.setText(mIdentity.getCryptoImpl().getName());
+            mKeyField.setText(mKey);
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.view_identity, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.action_edit_identity:
+            Intent ei = new Intent(getActivity(), EditIdentityActivity.class);
+            ei.putExtra(EditIdentityFragment.IDENTITY_KEY, mKey);
+            startActivity(ei);
+            return true;
+
+        default:
+            return super.onOptionsItemSelected(item);
+        }
+    }
+}