Merge remote-tracking branch 'upstream/master'

5 files changed, 70 insertions, 65 deletions

diff --git a/.travis.yml b/.travis.yml
index c3ea0d5..ef9e16c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ addons:
       - ia32-libs-multiarch
       - libgd2-xpm
       - p7zip-full
-      - libxml2-utils # ./scripts/check-lint-count.sh
+      - xqilla # ./scripts/check-lint-count.bash
   coverity_scan:
     project:
       name: "connectbot/connectbot"
@@ -55,6 +55,6 @@ android:
 
 script:
   - ./gradlew clean build check jacocoUnitTestDebugReport
-  - ./scripts/check-lint-count.sh app/build/outputs/lint-results.xml $HOME/.cache/lint/lint-results.xml
+  - ./scripts/check-lint-count.bash app/build/outputs/lint-results.xml $HOME/.cache/lint/lint-results.xml
 
 after_success: ./gradlew coveralls
diff --git a/app/build.gradle b/app/build.gradle
index 1526ab7..84b3bd6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ apply from: '../config/translations.gradle'
 apply from: '../config/jacoco.gradle'
 
 ext {
-    supportLibraryVersion = '23.0.1'
+    supportLibraryVersion = '23.1.0'
     testRunnerVersion = '0.3'
     espressoVersion = '2.2'
 }
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 3aebd41..0bb7858 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -170,17 +170,22 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 
 			// create views for all bridges on this service
 			adapter.notifyDataSetChanged();
-			int requestedIndex = bound.getBridges().indexOf(requestedBridge);
+			final int requestedIndex = bound.getBridges().indexOf(requestedBridge);
 
 			if (requestedIndex != -1) {
-				setDisplayedTerminal(requestedIndex);
+				pager.post(new Runnable() {
+					@Override
+					public void run() {
+						setDisplayedTerminal(requestedIndex);
+					}
+				});
 			}
 		}
 
 		public void onServiceDisconnected(ComponentName className) {
+			bound = null;
 			adapter.notifyDataSetChanged();
 			updateEmptyVisible();
-			bound = null;
 		}
 	};
 
@@ -1035,8 +1040,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 		// Maintain selected host if connected.
 		if (adapter.getCurrentTerminalView() != null
 				&& !adapter.getCurrentTerminalView().bridge.isDisconnected()) {
-			Uri uri = adapter.getCurrentTerminalView().bridge.host.getUri();
-			savedInstanceState.putString(STATE_SELECTED_URI, uri.toString());
+			requested = adapter.getCurrentTerminalView().bridge.host.getUri();
+			savedInstanceState.putString(STATE_SELECTED_URI, requested.toString());
 		}
 
 		super.onSaveInstanceState(savedInstanceState);
diff --git a/scripts/check-lint-count.bash b/scripts/check-lint-count.bash
new file mode 100755
index 0000000..c02f70e
--- /dev/null
+++ b/scripts/check-lint-count.bash
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+#
+# Checks the number of lint issues against historical values. Used in
+# Travis CI builds to fail when the number increases by exploiting the
+# caching mechanism.
+
+if [[ $# != 2 || ! -f $1 ]]; then \
+  echo "Usage: $0 <lint.xml file> <historical.xml file>"
+  exit 1
+fi
+
+lint_file="$1"
+historical_file="$2"
+
+xqilla="$(which xqilla)"
+
+if [[ ! -x $xqilla ]]; then \
+  echo "Error: cannot find xqilla"
+  exit 1
+fi
+
+if [[ ! -f $historical_file ]]; then \
+  # no cache history, store this one and exit
+  cp "$lint_file" "$historical_file"
+  exit 0
+fi
+
+tmp_dir="$(mktemp -d lint.XXXXXXXX)"
+trap 'rm -rf $tmp_dir' ERR EXIT
+
+lint_results="$tmp_dir/lint.txt"
+hist_results="$tmp_dir/hist.txt"
+
+run_query() {
+  local xqilla_script='string-join(//issue/location/(concat("file=", @file, " line=", @line, " column=", @column, " reason=", ../@summary)), "&#10;")'
+  xqilla -i "$1" <(echo "$xqilla_script") | sed "s,$PWD/,,g" > "$2"
+}
+
+run_query "$lint_file" "$lint_results"
+run_query "$historical_file" "$hist_results"
+
+old_count=$(wc -l < "$hist_results")
+new_count=$(wc -l < "$lint_results")
+
+echo "Historical count: $old_count, new count: $new_count"
+
+if [[ $new_count > $old_count ]]; then \
+  echo "FAILURE: lint issues increased from $old_count to $new_count"
+  diff -u "$hist_results" "$lint_results"
+  exit 2
+fi
+
+if [[ $TRAVIS_PULL_REQUEST == false ]]; then \
+  # Okay, we either stayed the same or reduced our number.
+  # Write it out so we can check it next build!
+  cp "$lint_file" "$historical_file"
+fi
diff --git a/scripts/check-lint-count.sh b/scripts/check-lint-count.sh
deleted file mode 100755
index 5184e13..0000000
--- a/scripts/check-lint-count.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-#
-# Checks the number of lint issues against historical values. Used in
-# Travis CI builds to fail when the number increases by exploiting the
-# caching mechanism.
-
-if [[ $# != 2 || ! -f $1 ]]; then \
-    echo "Usage: $0 <lint.xml file> <historical.xml file>"
-    exit 1
-fi
-
-lint_file="$1"
-historical_file="$2"
-
-xmllint="$(which xmllint)"
-
-if [[ ! -x $xmllint ]]; then \
-    echo "Error: cannot find xmllint"
-    exit 1
-fi
-
-if [[ ! -f $historical_file ]]; then \
-  # no cache history, store this one and exit
-  cp $lint_file $historical_file
-  exit 0
-fi
-
-tmp_dir="$(mktemp -d lint.XXXXXXXX)"
-trap "rm -rf $tmp_dir" ERR EXIT
-
-lint_results="$tmp_dir/lint.txt"
-hist_results="$tmp_dir/hist.txt"
-
-echo "cat //issue/location" | \
-    xmllint --shell $historical_file | \
-    grep '<location' >$lint_results
-    
-echo "cat //issue/location" | \
-    xmllint --shell $lint_file | \
-    grep '<location' >$hist_results
-
-old_count=$(cat $lint_results | wc -l)
-new_count=$(cat $hist_results | wc -l)
-
-echo "Historical count : $old_count, new count : $new_count"
-
-if [[ $new_count > $old_count ]]; then \
-    echo "FAILURE: lint issues increased from $old_count to $new_count"
-    diff $lint_results $hist_results
-    exit 2
-fi
-
-if [[ $TRAVIS_PULL_REQUEST == false ]]; then \
-    # Okay, we either stayed the same or reduced our number.
-    # Write it out so we can check it next build!
-    cp $lint_file $historical_file 
-fi