New advanced key view

OpenKeychain/src/main/AndroidManifest.xml

@@ -413,9 +413,9 @@
                 android:value=".ui.ViewKeyActivity" />
         </activity>
         <activity
-            android:name=".ui.ViewKeyAdvancedActivity"
+            android:name=".ui.ViewKeyAdvActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_advanced_key_info"></activity>
+            android:label="@string/title_advanced_key_info"/>
         <activity
             android:name=".ui.SettingsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java

@@ -35,6 +35,7 @@ import org.sufficientlysecure.keychain.R;
  */
 public abstract class BaseActivity extends ActionBarActivity {
     protected Toolbar mToolbar;
+    protected View mStatusBar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -51,6 +52,7 @@ public abstract class BaseActivity extends ActionBarActivity {
             setSupportActionBar(mToolbar);
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
+        mStatusBar = findViewById(R.id.status_bar);
     }
 
     protected void setActionBarIcon(int iconRes) {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

@@ -162,13 +162,13 @@ public class ViewKeyActivity extends BaseActivity implements
         mViewPager.setAdapter(mTabsAdapter);
 
         Bundle mainBundle = new Bundle();
-        mainBundle.putParcelable(ViewKeyMainFragment.ARG_DATA_URI, dataUri);
+        mainBundle.putParcelable(ViewKeyAdvMainFragment.ARG_DATA_URI, dataUri);
-        mTabsAdapter.addTab(ViewKeyMainFragment.class,
+        mTabsAdapter.addTab(ViewKeyAdvMainFragment.class,
                 mainBundle, getString(R.string.key_view_tab_main));
 
         Bundle shareBundle = new Bundle();
-        shareBundle.putParcelable(ViewKeyMainFragment.ARG_DATA_URI, dataUri);
+        shareBundle.putParcelable(ViewKeyAdvMainFragment.ARG_DATA_URI, dataUri);
-        mTabsAdapter.addTab(ViewKeyShareFragment.class,
+        mTabsAdapter.addTab(ViewKeyAdvShareFragment.class,
                 shareBundle, getString(R.string.key_view_tab_share));
 
         // update layout after operations
@@ -202,7 +202,7 @@ public class ViewKeyActivity extends BaseActivity implements
                     return true;
                 }
                 case R.id.menu_key_view_advanced: {
-                    Intent advancedIntent = new Intent(this, ViewKeyAdvancedActivity.class);
+                    Intent advancedIntent = new Intent(this, ViewKeyAdvActivity.class);
                     advancedIntent.setData(mDataUri);
                     startActivity(advancedIntent);
                 }

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java

@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.CursorLoader;
+import android.support.v4.content.Loader;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.widget.Toast;
+
+import com.astuetz.PagerSlidingTabStrip;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.ui.adapter.PagerTabStripAdapter;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.util.ContactHelper;
+import org.sufficientlysecure.keychain.util.ExportHelper;
+import org.sufficientlysecure.keychain.util.Log;
+
+import java.util.Date;
+
+public class ViewKeyAdvActivity extends BaseActivity implements
+        LoaderManager.LoaderCallbacks<Cursor> {
+
+    ExportHelper mExportHelper;
+    ProviderHelper mProviderHelper;
+
+    protected Uri mDataUri;
+
+    public static final String EXTRA_SELECTED_TAB = "selected_tab";
+    public static final int TAB_MAIN = 0;
+    public static final int TAB_SHARE = 1;
+
+    // view
+    private ViewPager mViewPager;
+    private PagerSlidingTabStrip mSlidingTabLayout;
+    private PagerTabStripAdapter mTabsAdapter;
+
+    private static final int LOADER_ID_UNIFIED = 0;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setFullScreenDialogClose(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mExportHelper = new ExportHelper(this);
+        mProviderHelper = new ProviderHelper(this);
+
+        mViewPager = (ViewPager) findViewById(R.id.view_key_pager);
+        mSlidingTabLayout = (PagerSlidingTabStrip) findViewById(R.id.view_key_sliding_tab_layout);
+
+        int switchToTab = TAB_MAIN;
+        Intent intent = getIntent();
+        if (intent.getExtras() != null && intent.getExtras().containsKey(EXTRA_SELECTED_TAB)) {
+            switchToTab = intent.getExtras().getInt(EXTRA_SELECTED_TAB);
+        }
+
+        mDataUri = getIntent().getData();
+        if (mDataUri == null) {
+            Log.e(Constants.TAG, "Data missing. Should be uri of key!");
+            finish();
+            return;
+        }
+        if (mDataUri.getHost().equals(ContactsContract.AUTHORITY)) {
+            mDataUri = ContactHelper.dataUriFromContactUri(this, mDataUri);
+            if (mDataUri == null) {
+                Log.e(Constants.TAG, "Contact Data missing. Should be uri of key!");
+                Toast.makeText(this, R.string.error_contacts_key_id_missing, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+        }
+
+        Log.i(Constants.TAG, "mDataUri: " + mDataUri.toString());
+
+        // Prepare the loaders. Either re-connect with an existing ones,
+        // or start new ones.
+        getSupportLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this);
+
+        initTabs(mDataUri);
+
+        // switch to tab selected by extra
+        mViewPager.setCurrentItem(switchToTab);
+    }
+
+    @Override
+    protected void initLayout() {
+        setContentView(R.layout.view_key_adv_activity);
+    }
+
+    private void initTabs(Uri dataUri) {
+        mTabsAdapter = new PagerTabStripAdapter(this);
+        mViewPager.setAdapter(mTabsAdapter);
+
+        Bundle mainBundle = new Bundle();
+        mainBundle.putParcelable(ViewKeyAdvMainFragment.ARG_DATA_URI, dataUri);
+        mTabsAdapter.addTab(ViewKeyAdvMainFragment.class,
+                mainBundle, getString(R.string.key_view_tab_main));
+
+        Bundle shareBundle = new Bundle();
+        shareBundle.putParcelable(ViewKeyAdvMainFragment.ARG_DATA_URI, dataUri);
+        mTabsAdapter.addTab(ViewKeyAdvShareFragment.class,
+                shareBundle, getString(R.string.key_view_tab_share));
+
+        Bundle keysBundle = new Bundle();
+        keysBundle.putParcelable(ViewKeyAdvKeysFragment.ARG_DATA_URI, dataUri);
+        mTabsAdapter.addTab(ViewKeyAdvKeysFragment.class,
+                keysBundle, getString(R.string.key_view_tab_keys));
+
+        Bundle certsBundle = new Bundle();
+        certsBundle.putParcelable(ViewKeyAdvCertsFragment.ARG_DATA_URI, dataUri);
+        mTabsAdapter.addTab(ViewKeyAdvCertsFragment.class,
+                certsBundle, getString(R.string.key_view_tab_certs));
+
+        // update layout after operations
+        mSlidingTabLayout.setViewPager(mViewPager);
+    }
+
+    // These are the rows that we will retrieve.
+    static final String[] PROJECTION = new String[]{
+            KeychainContract.KeyRings._ID,
+            KeychainContract.KeyRings.MASTER_KEY_ID,
+            KeychainContract.KeyRings.USER_ID,
+            KeychainContract.KeyRings.IS_REVOKED,
+            KeychainContract.KeyRings.EXPIRY,
+            KeychainContract.KeyRings.VERIFIED,
+            KeychainContract.KeyRings.HAS_ANY_SECRET
+    };
+
+    static final int INDEX_MASTER_KEY_ID = 1;
+    static final int INDEX_USER_ID = 2;
+    static final int INDEX_IS_REVOKED = 3;
+    static final int INDEX_EXPIRY = 4;
+    static final int INDEX_VERIFIED = 5;
+    static final int INDEX_HAS_ANY_SECRET = 6;
+
+    @Override
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        switch (id) {
+            case LOADER_ID_UNIFIED: {
+                Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingUri(mDataUri);
+                return new CursorLoader(this, baseUri, PROJECTION, null, null, null);
+            }
+
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        /* TODO better error handling? May cause problems when a key is deleted,
+         * because the notification triggers faster than the activity closes.
+         */
+        // Avoid NullPointerExceptions...
+        if (data.getCount() == 0) {
+            return;
+        }
+        // Swap the new cursor in. (The framework will take care of closing the
+        // old cursor once we return.)
+        switch (loader.getId()) {
+            case LOADER_ID_UNIFIED: {
+                if (data.moveToFirst()) {
+                    // get name, email, and comment from USER_ID
+                    String[] mainUserId = KeyRing.splitUserId(data.getString(INDEX_USER_ID));
+                    if (mainUserId[0] != null) {
+                        setTitle(mainUserId[0]);
+                    } else {
+                        setTitle(R.string.user_id_no_name);
+                    }
+
+                    // get key id from MASTER_KEY_ID
+                    long masterKeyId = data.getLong(INDEX_MASTER_KEY_ID);
+                    getSupportActionBar().setSubtitle(KeyFormattingUtils.beautifyKeyIdWithPrefix(this, masterKeyId));
+
+                    boolean isSecret = data.getInt(INDEX_HAS_ANY_SECRET) != 0;
+                    boolean isRevoked = data.getInt(INDEX_IS_REVOKED) > 0;
+                    boolean isExpired = !data.isNull(INDEX_EXPIRY)
+                            && new Date(data.getLong(INDEX_EXPIRY) * 1000).before(new Date());
+                    boolean isVerified = data.getInt(INDEX_VERIFIED) > 0;
+
+                    // Note: order is important
+                    int color;
+                    if (isRevoked || isExpired) {
+                        color = getResources().getColor(R.color.android_red_light);
+                    } else if (isSecret) {
+                        color = getResources().getColor(R.color.primary);
+                    } else {
+                        if (isVerified) {
+                            color = getResources().getColor(R.color.primary);
+                        } else {
+                            color = getResources().getColor(R.color.android_orange_light);
+                        }
+                    }
+                    mToolbar.setBackgroundColor(color);
+                    mStatusBar.setBackgroundColor(color);
+                    mSlidingTabLayout.setBackgroundColor(color);
+
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onLoaderReset(Loader<Cursor> loader) {
+
+    }
+}

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvCertsFragment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2014-2015 Dominik Schürmann <dominik@dominikschuermann.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
@@ -39,7 +38,6 @@ import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.pgp.WrappedSignature;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase;
-import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.Log;
 
@@ -47,23 +45,16 @@ import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 
-public class ViewKeyAdvancedFragment extends LoaderFragment implements
+public class ViewKeyAdvCertsFragment extends LoaderFragment implements
         LoaderManager.LoaderCallbacks<Cursor>, AdapterView.OnItemClickListener {
 
     public static final String ARG_DATA_URI = "data_uri";
 
-    private ListView mSubkeysList;
-    private SubkeysAdapter mSubkeysAdapter;
-
     private StickyListHeadersListView mStickyList;
     private CertListAdapter mCertsAdapter;
 
-    private Uri mDataUriSubkeys;
     private Uri mDataUriCerts;
 
-    private static final int LOADER_SUBKEYS = 1;
-    private static final int LOADER_CERTS = 2;
-
     // These are the rows that we will retrieve.
     static final String[] CERTS_PROJECTION = new String[]{
             KeychainContract.Certs._ID,
@@ -86,8 +77,8 @@ public class ViewKeyAdvancedFragment extends LoaderFragment implements
     /**
      * Creates new instance of this fragment
      */
-    public static ViewKeyAdvancedFragment newInstance(Uri dataUri) {
+    public static ViewKeyAdvCertsFragment newInstance(Uri dataUri) {
-        ViewKeyAdvancedFragment frag = new ViewKeyAdvancedFragment();
+        ViewKeyAdvCertsFragment frag = new ViewKeyAdvCertsFragment();
 
         Bundle args = new Bundle();
         args.putParcelable(ARG_DATA_URI, dataUri);
@@ -99,9 +90,8 @@ public class ViewKeyAdvancedFragment extends LoaderFragment implements
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
         View root = super.onCreateView(inflater, superContainer, savedInstanceState);
-        View view = inflater.inflate(R.layout.view_key_advanced_fragment, getContainer());
+        View view = inflater.inflate(R.layout.view_key_adv_certs_fragment, getContainer());
 
-        mSubkeysList = (ListView) view.findViewById(R.id.keys);
         mStickyList = (StickyListHeadersListView) view.findViewById(R.id.certs_list);
 
         return root;
@@ -122,7 +112,6 @@ public class ViewKeyAdvancedFragment extends LoaderFragment implements
     }
 
     private void loadData(Uri dataUri) {
-        mDataUriSubkeys = KeychainContract.Keys.buildKeysUri(dataUri);
         mDataUriCerts = KeychainContract.Certs.buildCertsUri(dataUri);
 
         mStickyList.setAreHeadersSticky(true);
@@ -132,34 +121,23 @@ public class ViewKeyAdvancedFragment extends LoaderFragment implements
         mStickyList.setEmptyView(getActivity().findViewById(R.id.empty));
 
         // Create an empty adapter we will use to display the loaded data.
-        mSubkeysAdapter = new SubkeysAdapter(getActivity(), null, 0);
-        mSubkeysList.setAdapter(mSubkeysAdapter);
-
         mCertsAdapter = new CertListAdapter(getActivity(), null);
         mStickyList.setAdapter(mCertsAdapter);
 
         // Prepare the loaders. Either re-connect with an existing ones,
         // or start new ones.
-        getLoaderManager().initLoader(LOADER_SUBKEYS, null, this);
+        getLoaderManager().initLoader(0, null, this);
-        getLoaderManager().initLoader(LOADER_CERTS, null, this);
     }
 
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         setContentShown(false);
-        switch (id) {
-            case LOADER_SUBKEYS:
-                return new CursorLoader(getActivity(), mDataUriSubkeys,
-                        SubkeysAdapter.SUBKEYS_PROJECTION, null, null, null);
 
-            case LOADER_CERTS:
+
         // Now create and return a CursorLoader that will take care of
         // creating a Cursor for the data being displayed.
         return new CursorLoader(getActivity(), mDataUriCerts,
                 CERTS_PROJECTION, null, null, CERTS_SORT_ORDER);
 
-            default:
-                return null;
-        }
     }
 
     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
@@ -170,15 +148,8 @@ public class ViewKeyAdvancedFragment extends LoaderFragment implements
 
         // Swap the new cursor in. (The framework will take care of closing the
         // old cursor once we return.)
-        switch (loader.getId()) {
-            case LOADER_SUBKEYS:
-                mSubkeysAdapter.swapCursor(data);
-                break;
-            case LOADER_CERTS:
         mCertsAdapter.swapCursor(data);
         mStickyList.setAdapter(mCertsAdapter);
-                break;
-        }
 
         // TODO: maybe show not before both are loaded!
         setContentShown(true);
@@ -189,14 +160,7 @@ public class ViewKeyAdvancedFragment extends LoaderFragment implements
      * We need to make sure we are no longer using it.
      */
     public void onLoaderReset(Loader<Cursor> loader) {
-        switch (loader.getId()) {
-            case LOADER_SUBKEYS:
-                mSubkeysAdapter.swapCursor(null);
-                break;
-            case LOADER_CERTS:
         mCertsAdapter.swapCursor(null);
-                break;
-        }
     }
 
     /**

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvKeysFragment.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2014-2015 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui;
+
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.CursorLoader;
+import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter;
+import org.sufficientlysecure.keychain.util.Log;
+
+public class ViewKeyAdvKeysFragment extends LoaderFragment implements
+        LoaderManager.LoaderCallbacks<Cursor> {
+
+    public static final String ARG_DATA_URI = "data_uri";
+
+    private ListView mSubkeysList;
+    private SubkeysAdapter mSubkeysAdapter;
+
+    private Uri mDataUriSubkeys;
+
+    /**
+     * Creates new instance of this fragment
+     */
+    public static ViewKeyAdvKeysFragment newInstance(Uri dataUri) {
+        ViewKeyAdvKeysFragment frag = new ViewKeyAdvKeysFragment();
+
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_DATA_URI, dataUri);
+
+        frag.setArguments(args);
+        return frag;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
+        View root = super.onCreateView(inflater, superContainer, savedInstanceState);
+        View view = inflater.inflate(R.layout.view_key_adv_subkeys_fragment, getContainer());
+
+        mSubkeysList = (ListView) view.findViewById(R.id.keys);
+
+        return root;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        Uri dataUri = getArguments().getParcelable(ARG_DATA_URI);
+        if (dataUri == null) {
+            Log.e(Constants.TAG, "Data missing. Should be Uri of key!");
+            getActivity().finish();
+            return;
+        }
+
+        loadData(dataUri);
+    }
+
+    private void loadData(Uri dataUri) {
+        mDataUriSubkeys = KeychainContract.Keys.buildKeysUri(dataUri);
+
+        // Create an empty adapter we will use to display the loaded data.
+        mSubkeysAdapter = new SubkeysAdapter(getActivity(), null, 0);
+        mSubkeysList.setAdapter(mSubkeysAdapter);
+
+        // Prepare the loaders. Either re-connect with an existing ones,
+        // or start new ones.
+        getLoaderManager().initLoader(0, null, this);
+    }
+
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        setContentShown(false);
+
+        return new CursorLoader(getActivity(), mDataUriSubkeys,
+                SubkeysAdapter.SUBKEYS_PROJECTION, null, null, null);
+    }
+
+    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        // Avoid NullPointerExceptions, if we get an empty result set.
+        if (data.getCount() == 0) {
+            return;
+        }
+
+        // Swap the new cursor in. (The framework will take care of closing the
+        // old cursor once we return.)
+        mSubkeysAdapter.swapCursor(data);
+
+        // TODO: maybe show not before both are loaded!
+        setContentShown(true);
+    }
+
+    /**
+     * 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.
+     */
+    public void onLoaderReset(Loader<Cursor> loader) {
+        mSubkeysAdapter.swapCursor(null);
+    }
+
+}

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvMainFragment.java

@@ -50,7 +50,7 @@ import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.Date;
 
-public class ViewKeyMainFragment extends LoaderFragment implements
+public class ViewKeyAdvMainFragment extends LoaderFragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
     public static final String ARG_DATA_URI = "uri";

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java

@@ -56,7 +56,7 @@ import org.sufficientlysecure.keychain.util.Log;
 import java.io.IOException;
 
 
-public class ViewKeyShareFragment extends LoaderFragment implements
+public class ViewKeyAdvShareFragment extends LoaderFragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
     public static final String ARG_DATA_URI = "uri";
@@ -81,9 +81,9 @@ public class ViewKeyShareFragment extends LoaderFragment implements
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
         View root = super.onCreateView(inflater, superContainer, savedInstanceState);
-        View view = inflater.inflate(R.layout.view_key_share_fragment, getContainer());
+        View view = inflater.inflate(R.layout.view_key_adv_share_fragment, getContainer());
 
-        mProviderHelper = new ProviderHelper(ViewKeyShareFragment.this.getActivity());
+        mProviderHelper = new ProviderHelper(ViewKeyAdvShareFragment.this.getActivity());
 
         mFingerprint = (TextView) view.findViewById(R.id.view_key_fingerprint);
         mFingerprintQrCode = (ImageView) view.findViewById(R.id.view_key_fingerprint_qr_code_image);
@@ -358,7 +358,7 @@ public class ViewKeyShareFragment extends LoaderFragment implements
 
                     protected void onPostExecute(Bitmap qrCode) {
                         // only change view, if fragment is attached to activity
-                        if (ViewKeyShareFragment.this.isAdded()) {
+                        if (ViewKeyAdvShareFragment.this.isAdded()) {
 
                             // scale the image up to our actual size. we do this in code rather
                             // than let the ImageView do this because we don't require filtering.

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedActivity.java

@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2013 Bahtiar 'kalkin' Gadimov
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.ui;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.util.ExportHelper;
-import org.sufficientlysecure.keychain.util.Log;
-
-public class ViewKeyAdvancedActivity extends BaseActivity {
-
-    ExportHelper mExportHelper;
-    ProviderHelper mProviderHelper;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mExportHelper = new ExportHelper(this);
-        mProviderHelper = new ProviderHelper(this);
-
-        // Inflate a "Done" custom action bar
-        setFullScreenDialogClose(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        // "Done"
-                        finish();
-                    }
-                }
-        );
-
-        Uri dataUri = getIntent().getData();
-        if (dataUri == null) {
-            Log.e(Constants.TAG, "Data missing. Should be uri of key!");
-            finish();
-            return;
-        }
-
-        Log.i(Constants.TAG, "mDataUri: " + dataUri.toString());
-
-        startFragment(savedInstanceState, dataUri);
-    }
-
-    @Override
-    protected void initLayout() {
-        setContentView(R.layout.view_key_advanced_activity);
-    }
-
-    private void startFragment(Bundle savedInstanceState, Uri dataUri) {
-        // However, if we're being restored from a previous state,
-        // then we don't need to do anything and should return or else
-        // we could end up with overlapping fragments.
-        if (savedInstanceState != null) {
-            return;
-        }
-
-        // Create an instance of the fragment
-        ViewKeyAdvancedFragment frag = ViewKeyAdvancedFragment.newInstance(dataUri);
-
-        // Add the fragment to the 'fragment_container' FrameLayout
-        // NOTE: We use commitAllowingStateLoss() to prevent weird crashes!
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.view_key_advanced_fragment, frag)
-                .commitAllowingStateLoss();
-        // do it immediately!
-        getSupportFragmentManager().executePendingTransactions();
-    }
-
-}

OpenKeychain/src/main/res/layout/view_key_adv_activity.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:visibility="gone"
+            android:id="@+id/view_key_status_divider" />
+
+        <com.astuetz.PagerSlidingTabStrip
+            android:id="@+id/view_key_sliding_tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:textColor="@color/tab_text"
+            app:pstsTextColorSelected="@color/tab_text_selected"
+            app:pstsIndicatorColor="@color/tab_indicator" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/view_key_pager"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"
+            android:background="@android:color/white" />
+
+    </LinearLayout>
+</RelativeLayout>

OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml

@@ -1,6 +1,4 @@
-<!--<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"--><!--android:layout_width="match_parent"--><!--android:layout_height="match_parent">-->
+<?xml version="1.0" encoding="utf-8"?>
-
-<!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -9,31 +7,6 @@
     android:descendantFocusability="beforeDescendants"
     android:orientation="vertical">
 
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:text="@string/section_keys" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.4">
-
-        <ListView
-            android:id="@+id/keys"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scrollbarStyle="outsideOverlay"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:layout_marginBottom="8dp" />
-    </FrameLayout>
-
     <TextView
         style="@style/SectionHeader"
         android:layout_width="wrap_content"
@@ -60,8 +33,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent">
-        android:layout_weight="0.6">
 
         <se.emilsjolander.stickylistheaders.StickyListHeadersListView
             android:layout_width="match_parent"
@@ -83,5 +55,3 @@
     </FrameLayout>
 
 </LinearLayout>
-
-    <!--</ScrollView>-->

OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml

@@ -0,0 +1,34 @@
+<?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:focusable="true"
+    android:focusableInTouchMode="true"
+    android:descendantFocusability="beforeDescendants"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="@string/section_keys" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ListView
+            android:id="@+id/keys"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbarStyle="outsideOverlay"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:layout_marginBottom="8dp" />
+    </FrameLayout>
+
+</LinearLayout>

OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml

@@ -1,32 +0,0 @@
-<?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">
-
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar_include"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/notify_area" />
-
-        <FrameLayout
-            android:id="@+id/content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <FrameLayout
-                android:id="@+id/view_key_advanced_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical" />
-
-        </FrameLayout>
-
-    </LinearLayout>
-</RelativeLayout>