From b2123eaab989ebe93e20e886347ad625c2bad961 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 28 Dec 2015 12:35:51 -0600 Subject: Update instrumentation tests for new source layout The ViewHolder was moved out into its own inner class, so use that instead of the HostAdapter.ViewHolder that used to exist. --- .../java/org/connectbot/ConnectbotMatchers.java | 16 ++++++++-------- app/src/main/java/org/connectbot/HostListActivity.java | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java b/app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java index 76864e2..b7cf7aa 100644 --- a/app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java +++ b/app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java @@ -21,9 +21,9 @@ public class ConnectbotMatchers { */ @NonNull public static Matcher withHostNickname(final String content) { - return new BoundedMatcher(HostListActivity.HostAdapter.ViewHolder.class) { + return new BoundedMatcher(HostListActivity.HostViewHolder.class) { @Override - public boolean matchesSafely(HostListActivity.HostAdapter.ViewHolder holder) { + public boolean matchesSafely(HostListActivity.HostViewHolder holder) { return holder.host.getNickname().matches(content); } @@ -36,9 +36,9 @@ public class ConnectbotMatchers { @NonNull public static Matcher withConnectedHost() { - return new BoundedMatcher(HostListActivity.HostAdapter.ViewHolder.class) { + return new BoundedMatcher(HostListActivity.HostViewHolder.class) { @Override - public boolean matchesSafely(HostListActivity.HostAdapter.ViewHolder holder) { + public boolean matchesSafely(HostListActivity.HostViewHolder holder) { return hasDrawableState(holder.icon, android.R.attr.state_checked); } @@ -51,9 +51,9 @@ public class ConnectbotMatchers { @NonNull public static Matcher withDisconnectedHost() { - return new BoundedMatcher(HostListActivity.HostAdapter.ViewHolder.class) { + return new BoundedMatcher(HostListActivity.HostViewHolder.class) { @Override - public boolean matchesSafely(HostListActivity.HostAdapter.ViewHolder holder) { + public boolean matchesSafely(HostListActivity.HostViewHolder holder) { return hasDrawableState(holder.icon, android.R.attr.state_expanded); } @@ -66,9 +66,9 @@ public class ConnectbotMatchers { @NonNull public static Matcher withColoredText(@ColorInt final int expectedColor) { - return new BoundedMatcher(HostListActivity.HostAdapter.ViewHolder.class) { + return new BoundedMatcher(HostListActivity.HostViewHolder.class) { @Override - public boolean matchesSafely(HostListActivity.HostAdapter.ViewHolder holder) { + public boolean matchesSafely(HostListActivity.HostViewHolder holder) { return hasTextColor(holder.nickname, expectedColor); } diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index d83bd0c..3a7a383 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -370,7 +370,8 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta updateList(); } - private class HostViewHolder extends ItemViewHolder { + @VisibleForTesting + public class HostViewHolder extends ItemViewHolder { public final ImageView icon; public final TextView nickname; public final TextView caption; -- cgit v1.2.3 From a51815901effa4ad9b504ad09fd90d7033e61b48 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 28 Dec 2015 13:08:30 -0600 Subject: Update to version 2.2.2 of sshlib This fixes some problems with EC keys on a large field (e.g., P521) which would cause both ECDSA and ECDH signature verification to fail randomly. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 9e35927..0c53b90 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ buildscript { } dependencies { - compile 'org.connectbot:sshlib:2.2.1' + compile 'org.connectbot:sshlib:2.2.2' testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' -- cgit v1.2.3