updated checksums, EditKeyTest

OpenKeychain/build.gradle

@@ -91,7 +91,9 @@ dependencyVerification {
             'com.android.support:support-v4:246c99385a84fe179d7b833c9ddaf2576f217b0abba5e74b5353cc78756f5880',
             'com.android.support:appcompat-v7:bf8db89d678286043778990fc967346e94321cc8d8bad99e9b0db20588509156',
             'com.android.support:design:391d3d1fd274c3150e949653b9863af61e80953bbb90f3cbd40e9d2f1bd548d9',
+            'com.android.support:recyclerview-v7:e89e0ba2b73bb4002965ff42f93cfe3e7da05162716b15218e31f7dd140fa40e',
             'com.android.support:cardview-v7:eb74ab41045d182fcf783c7479c5b35fb1f4d771ed307b2e7b84ab3a8fe10e96',
+            'com.android.support:support-annotations:bac4e534657165b0c4c362c97db389dcb152e43273435d2ccaa939a82e03f42c',
             'com.journeyapps:zxing-android-embedded:afe4cd51d95ba0fd3a4bfe08c5a160bd32602aa174d511600ac824b6de4c79f1',
             'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
             'com.jpardogo.materialtabstrip:library:24d19232b319f8c73e25793432357919a7ed972186f57a3b2c9093ea74ad8311',
@@ -117,23 +119,18 @@ dependencyVerification {
             'com.mikepenz:fontawesome-typeface:033cf3460d8074bd37a1fefc2ff4eac8f2e3db835ec78bf386d46710e4d0827c',
             'com.mikepenz:community-material-typeface:382e8446fc08fe03cb1e0f91ee329ffd514c113ad22f8389b88424ac71ed5fbb',
             'com.fidesmo:nordpol-android:56f43fe2b1676817bcb4085926de14a08282ef6729c855c198d81aec62b20d65',
-//            'open-keychain:openpgp-api-lib:18482410c533bbfee8dcf0b67b4f65af470c06c5e08b479b9dd3bc709ce0a17e',
-//            'open-keychain:openkeychain-api-lib:d1ec24e0bad7b987e9b3ea7775d33e49857ad5bd5b038200e4d85e33fa9e6c51',
-//            'open-keychain.extern.bouncycastle:core:5f50d7d16b5196996652916154ab6bda8f3e131b221778cad6bf0121e67c84bf',
-//            'open-keychain.extern.bouncycastle:pg:852a345f389cc205e25ca18bd69e64eef732ace05fd5532c78bc3c5e2f236a78',
-//            'open-keychain.extern.bouncycastle:prov:c8b0076249595b80dcba19d20ad177edc7ec6878085463dbb99c35a25e5c0d1e',
-//            'open-keychain.extern:minidns:effae7e986ac9f5b5448d7e385b5721c722c834bfc2c812a5573c9bf388bc07d',
-//            'open-keychain:KeybaseLib:d7931761e7dcf8c09256d81fb51b639c297ce17b0e9934e30b83679fed81dc13',
-//            'open-keychain:safeslinger-exchange:b4c5afcae270da3779c65519f2ae66e3417ecf2c28a78152d5f187579c3f8f97',
+//            'open-keychain:openpgp-api-lib:00d6ae7e3c4cc9b9ffbb279ba511732fb30c2fb3c5f408171c74cce9b1dfe67f',
+//            'open-keychain:openkeychain-api-lib:842dd4c4469e3e1e76790bd37c8474422d385b09a6cb55d0baeacabfdaf0bc58',
+//            'open-keychain.extern.bouncycastle:core:cab27a0fe17ea07a94624c29855ac8bc8f8d55dff277349007152bc778959f03',
+//            'open-keychain.extern.bouncycastle:pg:c45a5caf65c5b0e7be2c4b59948fb3717f93fd58d680191b7b20d3f1898cdb9a',
+//            'open-keychain.extern.bouncycastle:prov:12f98852e8d3f129816516ea7a244a218eb7f7f0423c66e5084f35421e286c8e',
+//            'open-keychain.extern:minidns:f3deaa17cf92e0b1828e6f261cc423ff8a11c4717c25f5a2edf75d53a7a164e0',
+//            'open-keychain:KeybaseLib:5ebab9bc7aa43271c80f2de91216c886264ab30289ae4fb5cd08fbde9aa10981',
+//            'open-keychain:safeslinger-exchange:a1cda62f799df6b416aca75d0e91d93d42c6171aab7da831086b522bfbef454f',
             'com.android.support:animated-vector-drawable:4fcd1fc36034a804200ef3e552b0f2f688a0a7a8a007de43201e40bfedda73b3',
             'com.android.support:support-vector-drawable:45b1f180b437a750429f6c1457181c167ba211c17fcb992f83cdbefef5eb1519',
             'com.squareup.okio:okio:114bdc1f47338a68bcbc95abf2f5cdc72beeec91812f2fcd7b521c1937876266',
             'com.fidesmo:nordpol-core:3de58e850a00bba5b4d3a604d1399bcd89f695ea191ec0b03a57222e18062d15',
-            'com.android.support:recyclerview-v7:0381214757a2e6581918f3cd4acde55811f98b6f3a2e4500bf68430dcf98aa67',
-            'com.android.support:support-compat:de70ac981118229b70ca29961b6df510d6f498c0ececd1e11e19a8073d1580c9',
-            'com.android.support:support-core-ui:6cd8723abdeafbd8d05816d7b4a307dd4dbebba9cb145f98e12834ab3ebd9212',
-            'com.android.support:support-annotations:af5868da6750bdf42aec5d85fa87ac30de2b72939ca80437a6247e5753a07cad',
-
     ]
 }
 

OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java

@@ -27,10 +27,13 @@ import android.view.View;
 import android.widget.ViewAnimator;
 
 import com.nispok.snackbar.Snackbar;
+
+import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter.KeyItem;
+import org.sufficientlysecure.keychain.ui.adapter.KeySectionedListAdapter;
 import org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView;
 
 import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
@@ -86,6 +89,21 @@ public abstract class CustomMatchers {
         };
     }
 
+    public static Matcher<RecyclerView.ViewHolder> withKeyHolderId(final long keyId) {
+        return new BoundedMatcher<RecyclerView.ViewHolder, KeySectionedListAdapter.KeyItemViewHolder>
+                (KeySectionedListAdapter.KeyItemViewHolder.class) {
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("with ViewHolder id: " + keyId);
+            }
+
+            @Override
+            protected boolean matchesSafely(KeySectionedListAdapter.KeyItemViewHolder item) {
+                return item.getItemId() == keyId;
+            }
+        };
+    }
+
     public static Matcher<View> withKeyToken(@ColorRes final long keyId) {
         return new BoundedMatcher<View, EncryptKeyCompletionView>(EncryptKeyCompletionView.class) {
             public void describeTo(Description description) {

OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/EditKeyTest.java

@@ -20,14 +20,19 @@ package org.sufficientlysecure.keychain.ui;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.support.test.espresso.contrib.RecyclerViewActions;
 import android.support.test.espresso.matcher.ViewMatchers;
 import android.support.test.rule.ActivityTestRule;
+import android.support.v7.widget.RecyclerView;
 import android.widget.AdapterView;
 
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
 import org.junit.FixMethodOrder;
 import org.junit.Rule;
 import org.junit.runners.MethodSorters;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.matcher.CustomMatchers;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 
@@ -70,10 +75,12 @@ public class EditKeyTest {
         importKeysFromResource(activity, "x.sec.asc");
 
         // navigate to edit key dialog
-        onData(withKeyItemId(0x9D604D2F310716A3L))
-                .inAdapterView(allOf(isAssignableFrom(AdapterView.class),
-                        isDescendantOfA(ViewMatchers.withId(R.id.key_list_list))))
-                .perform(click());
+        onView(allOf(
+                isAssignableFrom(RecyclerView.class),
+                withId(android.R.id.list)
+        )).perform(RecyclerViewActions.actionOnHolderItem(
+                                CustomMatchers.withKeyHolderId(0x9D604D2F310716A3L), click()));
+
         onView(withId(R.id.view_key_card_user_ids_edit)).perform(click());
 
         // no-op should yield snackbar

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

@@ -297,7 +297,7 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
         }
     }
 
-    private class KeyItemViewHolder extends SectionCursorAdapter.ViewHolder
+    public class KeyItemViewHolder extends SectionCursorAdapter.ViewHolder
             implements View.OnClickListener, View.OnLongClickListener {
 
         private TextView mMainUserId;