diff app/src/main/java/com/five_ten_sg/connectbot/HostListActivity.java @ 468:74b507d491c9 stable-1.9.3-7

fix parsing of global:: scheme
author Carl Byington <carl@five-ten-sg.com>
date Thu, 12 Sep 2019 15:35:51 -0700
parents 12e2d9dd95df
children ece82b571900
line wrap: on
line diff
--- 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);