use KeyAdapter for AllowedKeysListFragment

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java

@@ -17,10 +17,11 @@
 
 package org.sufficientlysecure.keychain.remote.ui;
 
-import android.content.Context;
+
+import java.util.Set;
+
 import android.content.OperationApplicationException;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -35,23 +36,17 @@ import android.widget.ListView;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.compatibility.ListFragmentWorkaround;
-import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
-import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.ui.adapter.SelectKeyCursorAdapter;
+import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter;
+import org.sufficientlysecure.keychain.ui.adapter.KeySelectableAdapter;
 import org.sufficientlysecure.keychain.ui.widget.FixedListView;
 import org.sufficientlysecure.keychain.util.Log;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
-
 public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround implements LoaderManager.LoaderCallbacks<Cursor> {
     private static final String ARG_DATA_URI = "uri";
 
-    private SelectKeyCursorAdapter mAdapter;
+    private KeySelectableAdapter mAdapter;
-    private Set<Long> mSelectedMasterKeyIds;
     private ProviderHelper mProviderHelper;
 
     private Uri mDataUri;
@@ -80,8 +75,7 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View layout = super.onCreateView(inflater, container,
+        View layout = super.onCreateView(inflater, container, savedInstanceState);
-                savedInstanceState);
         ListView lv = (ListView) layout.findViewById(android.R.id.list);
         ViewGroup parent = (ViewGroup) lv.getParent();
 
@@ -109,67 +103,29 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
 
         mDataUri = getArguments().getParcelable(ARG_DATA_URI);
 
-        getListView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-
         // Give some text to display if there is no data. In a real
         // application this would come from a resource.
         setEmptyText(getString(R.string.list_empty));
 
-        mAdapter = new SecretKeyCursorAdapter(getActivity(), null, 0, getListView());
+        Set<Long> checked = mProviderHelper.getAllKeyIdsForApp(mDataUri);
-
+        mAdapter = new KeySelectableAdapter(getActivity(), null, 0, checked);
         setListAdapter(mAdapter);
+        getListView().setOnItemClickListener(mAdapter);
 
         // Start out with a progress indicator.
         setListShown(false);
 
-        mSelectedMasterKeyIds = mProviderHelper.getAllKeyIdsForApp(mDataUri);
-        Log.d(Constants.TAG, "allowed: " + mSelectedMasterKeyIds.toString());
-
         // Prepare the loader. Either re-connect with an existing one,
         // or start a new one.
         getLoaderManager().initLoader(0, null, this);
-    }
 
-    /**
-     * Selects items based on master key ids in list view
-     *
-     * @param masterKeyIds
-     */
-    private void preselectMasterKeyIds(Set<Long> masterKeyIds) {
-        for (int i = 0; i < getListView().getCount(); ++i) {
-            long listKeyId = mAdapter.getMasterKeyId(i);
-            for (long keyId : masterKeyIds) {
-                if (listKeyId == keyId) {
-                    getListView().setItemChecked(i, true);
-                    break;
-                }
-            }
-        }
     }
-
+    /** Returns all selected master key ids. */
-    /**
-     * Returns all selected master key ids
-     *
-     * @return
-     */
     public Set<Long> getSelectedMasterKeyIds() {
-        // mListView.getCheckedItemIds() would give the row ids of the KeyRings not the master key
+        return mAdapter.getSelectedMasterKeyIds();
-        // ids!
-        Set<Long> keyIds = new HashSet<>();
-        for (int i = 0; i < getListView().getCount(); ++i) {
-            if (getListView().isItemChecked(i)) {
-                keyIds.add(mAdapter.getMasterKeyId(i));
-            }
-        }
-
-        return keyIds;
     }
 
-    /**
+    /** Returns all selected user ids.
-     * Returns all selected user ids
-     *
-     * @return
-     */
     public String[] getSelectedUserIds() {
         Vector<String> userIds = new Vector<>();
         for (int i = 0; i < getListView().getCount(); ++i) {
@@ -181,7 +137,7 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
         // make empty array to not return null
         String userIdArray[] = new String[0];
         return userIds.toArray(userIdArray);
-    }
+    } */
 
     public void saveAllowedKeys() {
         try {
@@ -192,46 +148,11 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
     }
 
     @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+    public Loader<Cursor> onCreateLoader(int loaderId, Bundle data) {
-        Uri baseUri = KeyRings.buildUnifiedKeyRingsUri();
+        Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingsUri();
+        String where = KeychainContract.KeyRings.HAS_ANY_SECRET + " = 1";
 
-        // These are the rows that we will retrieve.
+        return new CursorLoader(getActivity(), baseUri, KeyAdapter.PROJECTION, where, null, null);
-        String[] projection = new String[]{
-                KeyRings._ID,
-                KeyRings.MASTER_KEY_ID,
-                KeyRings.USER_ID,
-                KeyRings.IS_EXPIRED,
-                KeyRings.IS_REVOKED,
-                KeyRings.HAS_ENCRYPT,
-                KeyRings.VERIFIED,
-                KeyRings.HAS_ANY_SECRET,
-                KeyRings.HAS_DUPLICATE_USER_ID,
-                KeyRings.CREATION,
-        };
-
-        String inMasterKeyList = null;
-        if (mSelectedMasterKeyIds != null && mSelectedMasterKeyIds.size() > 0) {
-            inMasterKeyList = Tables.KEYS + "." + KeyRings.MASTER_KEY_ID + " IN (";
-            Iterator iter = mSelectedMasterKeyIds.iterator();
-            while (iter.hasNext()) {
-                inMasterKeyList += DatabaseUtils.sqlEscapeString("" + iter.next());
-                if (iter.hasNext()) {
-                    inMasterKeyList += ", ";
-                }
-            }
-            inMasterKeyList += ")";
-        }
-
-        String selection = KeyRings.HAS_ANY_SECRET + " != 0";
-
-        String orderBy = KeyRings.USER_ID + " ASC";
-        if (inMasterKeyList != null) {
-            // sort by selected master keys
-            orderBy = inMasterKeyList + " DESC, " + orderBy;
-        }
-        // Now create and return a CursorLoader that will take care of
-        // creating a Cursor for the data being displayed.
-        return new CursorLoader(getActivity(), baseUri, projection, selection, null, orderBy);
     }
 
     @Override
@@ -246,9 +167,6 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
         } else {
             setListShownNoAnimation(true);
         }
-
-        // preselect given master keys
-        preselectMasterKeyIds(mSelectedMasterKeyIds);
     }
 
     @Override
@@ -259,36 +177,4 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
         mAdapter.swapCursor(null);
     }
 
-    private class SecretKeyCursorAdapter extends SelectKeyCursorAdapter {
-
-        public SecretKeyCursorAdapter(Context context, Cursor c, int flags, ListView listView) {
-            super(context, c, flags, listView);
-        }
-
-        @Override
-        protected void initIndex(Cursor cursor) {
-            super.initIndex(cursor);
-        }
-
-        @Override
-        public void bindView(View view, Context context, Cursor cursor) {
-            super.bindView(view, context, cursor);
-            ViewHolderItem h = (ViewHolderItem) view.getTag();
-
-            // We care about the checkbox
-            h.selected.setVisibility(View.VISIBLE);
-            // the getListView works because this is not a static subclass!
-            h.selected.setChecked(getListView().isItemChecked(cursor.getPosition()));
-
-            boolean enabled = false;
-            if ((Boolean) h.statusIcon.getTag()) {
-                h.statusIcon.setVisibility(View.GONE);
-                enabled = true;
-            }
-
-            h.setEnabled(enabled);
-        }
-
-    }
-
 }

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java

@@ -95,6 +95,8 @@ public class KeyAdapter extends CursorAdapter {
         public View mSlinger;
         public ImageButton mSlingerButton;
 
+        public KeyItem mDisplayedItem;
+
         public KeyItemViewHolder(View view) {
             mView = view;
             mMainUserId = (TextView) view.findViewById(R.id.key_list_item_name);
@@ -107,6 +109,8 @@ public class KeyAdapter extends CursorAdapter {
 
         public void setData(Context context, KeyItem item, Highlighter highlighter) {
 
+            mDisplayedItem = item;
+
             { // set name and stuff, common to both key types
                 KeyRing.UserId userIdSplit = item.mUserId;
                 if (userIdSplit.name != null) {
@@ -143,6 +147,9 @@ public class KeyAdapter extends CursorAdapter {
                 } else if (item.mIsSecret) {
                     mStatus.setVisibility(View.GONE);
                     if (mSlingerButton.hasOnClickListeners()) {
+                        mSlingerButton.setColorFilter(
+                                context.getResources().getColor(R.color.tertiary_text_light),
+                                PorterDuff.Mode.SRC_IN);
                         mSlinger.setVisibility(View.VISIBLE);
                     } else {
                         mSlinger.setVisibility(View.GONE);
@@ -192,8 +199,6 @@ public class KeyAdapter extends CursorAdapter {
         View view = mInflater.inflate(R.layout.key_list_item, parent, false);
         KeyItemViewHolder holder = new KeyItemViewHolder(view);
         view.setTag(holder);
-        holder.mSlingerButton.setColorFilter(context.getResources().getColor(R.color.tertiary_text_light),
-                PorterDuff.Mode.SRC_IN);
         return view;
     }
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySelectableAdapter.java

@@ -0,0 +1,87 @@
+package org.sufficientlysecure.keychain.ui.adapter;
+
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.v7.internal.widget.AdapterViewCompat;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.CheckBox;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.util.Log;
+
+
+public class KeySelectableAdapter extends KeyAdapter implements OnItemClickListener {
+
+    HashSet<Long> mSelectedItems = new HashSet<>();
+
+    public KeySelectableAdapter(Context context, Cursor c, int flags, Set<Long> initialChecked) {
+        super(context, c, flags);
+        if (initialChecked != null) {
+            mSelectedItems.addAll(initialChecked);
+        }
+    }
+
+    public static class KeySelectableItemViewHolder extends KeyItemViewHolder {
+
+        public CheckBox mCheckbox;
+
+        public KeySelectableItemViewHolder(View view) {
+            super(view);
+            mCheckbox = (CheckBox) view.findViewById(R.id.selected);
+        }
+
+        public void setCheckedState(boolean checked) {
+            mCheckbox.setChecked(checked);
+        }
+
+    }
+
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+        View view = mInflater.inflate(R.layout.key_list_selectable_item, parent, false);
+        KeySelectableItemViewHolder holder = new KeySelectableItemViewHolder(view);
+        view.setTag(holder);
+        return view;
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        super.bindView(view, context, cursor);
+
+        KeySelectableItemViewHolder h = (KeySelectableItemViewHolder) view.getTag();
+        h.setCheckedState(mSelectedItems.contains(h.mDisplayedItem.mKeyId));
+
+    }
+
+    public void setCheckedStates(Set<Long> checked) {
+        mSelectedItems.clear();
+        mSelectedItems.addAll(checked);
+        notifyDataSetChanged();
+    }
+
+    public Set<Long> getSelectedMasterKeyIds() {
+        return Collections.unmodifiableSet(mSelectedItems);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Log.d(Constants.TAG, "clicked id: " + id);
+        long masterKeyId = getMasterKeyId(position);
+        if (mSelectedItems.contains(masterKeyId)) {
+            mSelectedItems.remove(masterKeyId);
+        } else {
+            mSelectedItems.add(masterKeyId);
+        }
+        notifyDataSetChanged();
+    }
+
+}

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

@@ -0,0 +1,22 @@
+<?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="wrap_content"
+    android:gravity="center_vertical"
+    android:singleLine="true"
+    android:orientation="horizontal"
+    android:descendantFocusability="blocksDescendants"
+    android:focusable="false">
+
+    <CheckBox
+        android:id="@+id/selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:layout_margin="6dp" />
+
+    <include layout="@layout/key_list_item" />
+
+</LinearLayout>