From bc43797c32542aa48a34f44d486645d24fca06ba Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Mon, 9 Mar 2015 00:37:14 +0530 Subject: [PATCH] added card --- .../keychain/ui/ViewKeyFragment.java | 18 +++++++++ .../src/main/res/layout/view_key_fragment.xml | 38 ++++++++++++++++--- OpenKeychain/src/main/res/values/strings.xml | 1 + 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java index 628970b27..389b39c82 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java @@ -18,6 +18,7 @@ package org.sufficientlysecure.keychain.ui; +import android.content.DialogInterface; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; @@ -44,6 +45,7 @@ public class ViewKeyFragment extends LoaderFragment implements public static final String ARG_DATA_URI = "uri"; private ListView mUserIds; + private ListView mLinkedSystemContact; boolean mIsSecret = false; @@ -81,6 +83,15 @@ public class ViewKeyFragment extends LoaderFragment implements } }); + mLinkedSystemContact = (ListView) view.findViewById(R.id.view_key_linked_system_contact); + + mLinkedSystemContact.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + showSystemContact(position); + } + }); + return root; } @@ -100,6 +111,10 @@ public class ViewKeyFragment extends LoaderFragment implements } } + private void showSystemContact(final int position) { + + } + @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -148,6 +163,7 @@ public class ViewKeyFragment extends LoaderFragment implements getLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this); } + @Override public Loader onCreateLoader(int id, Bundle args) { setContentShown(false); @@ -164,6 +180,7 @@ public class ViewKeyFragment extends LoaderFragment implements } } + @Override public void onLoadFinished(Loader loader, Cursor data) { /* TODO better error handling? May cause problems when a key is deleted, * because the notification triggers faster than the activity closes. @@ -202,6 +219,7 @@ public class ViewKeyFragment extends LoaderFragment implements * This is called when the last Cursor provided to onLoadFinished() above is about to be closed. * We need to make sure we are no longer using it. */ + @Override public void onLoaderReset(Loader loader) { switch (loader.getId()) { case LOADER_ID_USER_IDS: { diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index bba412f99..7f3ef0f1e 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -1,7 +1,7 @@ + xmlns:card_view="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:text="@string/section_user_ids"/> + android:layout_marginBottom="4dp"/> + + + + + + + + + diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2c83ac070..61c406d48 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -47,6 +47,7 @@ "Identities" + "Linked System Contact" "Should you trust this key?" Proof verification "Proofs from the cloud"