# HG changeset patch # User Carl Byington # Date 1568327751 25200 # Node ID 74b507d491c99d26f3a0a7ef87587534ae3be742 # Parent bf8c2af0f1069673faa3b8116addb850c1679a70 fix parsing of global:: scheme diff -r bf8c2af0f106 -r 74b507d491c9 app/src/main/AndroidManifest.xml --- a/app/src/main/AndroidManifest.xml Thu Sep 05 09:25:55 2019 -0700 +++ b/app/src/main/AndroidManifest.xml Thu Sep 12 15:35:51 2019 -0700 @@ -17,8 +17,8 @@ --> diff -r bf8c2af0f106 -r 74b507d491c9 app/src/main/java/com/five_ten_sg/connectbot/HostListActivity.java --- a/app/src/main/java/com/five_ten_sg/connectbot/HostListActivity.java Thu Sep 05 09:25:55 2019 -0700 +++ b/app/src/main/java/com/five_ten_sg/connectbot/HostListActivity.java Thu Sep 12 15:35:51 2019 -0700 @@ -449,7 +449,11 @@ Uri uri = Uri.parse(line); ContentValues values = null; - while ((line = reader.readLine()).length() > 0) { + while ((line = reader.readLine()) != null) { + if (line.length() == 0) break; // empty + + if (line.substring(0, 1).equals("#")) continue; // comment + String [] parts = line.split("="); if (parts.length != 2) continue; @@ -459,7 +463,8 @@ values.put(parts[0].trim(), parts[1].trim()); } - if (uri.getScheme().equals("global")) { + String scheme = uri.getScheme(); + if (scheme.equals("global")) { String dd = "delete_deployment"; if (values.containsKey(dd)) { String sv = values.getAsString(dd); diff -r bf8c2af0f106 -r 74b507d491c9 build.gradle --- a/build.gradle Thu Sep 05 09:25:55 2019 -0700 +++ b/build.gradle Thu Sep 12 15:35:51 2019 -0700 @@ -6,7 +6,7 @@ google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff -r bf8c2af0f106 -r 74b507d491c9 gradle/wrapper/gradle-wrapper.properties --- a/gradle/wrapper/gradle-wrapper.properties Thu Sep 05 09:25:55 2019 -0700 +++ b/gradle/wrapper/gradle-wrapper.properties Thu Sep 12 15:35:51 2019 -0700 @@ -1,6 +1,6 @@ -#Wed Apr 17 12:40:18 PDT 2019 +#Thu Sep 12 14:30:22 PDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip