Mercurial > 510Connectbot

changeset 468:74b507d491c9 stable-1.9.3-7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix parsing of global:: scheme
author Carl Byington <carl@five-ten-sg.com>
date Thu, 12 Sep 2019 15:35:51 -0700
parents bf8c2af0f106
children fbb1a98998fb
files app/src/main/AndroidManifest.xml app/src/main/java/com/five_ten_sg/connectbot/HostListActivity.java build.gradle gradle/wrapper/gradle-wrapper.properties
diffstat 4 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.five_ten_sg.connectbot"
-	android:versionName="1.9.3-6"
-	android:versionCode="1936"
+	android:versionName="1.9.3-7"
+	android:versionCode="1937"
 	android:installLocation="auto">
 
     <!--  permissions must match 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);
--- 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'
     }
 }
 
--- 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