comparison 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
comparison
equal deleted inserted replaced
467:bf8c2af0f106 468:74b507d491c9
447 if (!line.contains("://")) continue; // invalid uri 447 if (!line.contains("://")) continue; // invalid uri
448 448
449 Uri uri = Uri.parse(line); 449 Uri uri = Uri.parse(line);
450 ContentValues values = null; 450 ContentValues values = null;
451 451
452 while ((line = reader.readLine()).length() > 0) { 452 while ((line = reader.readLine()) != null) {
453 if (line.length() == 0) break; // empty
454
455 if (line.substring(0, 1).equals("#")) continue; // comment
456
453 String [] parts = line.split("="); 457 String [] parts = line.split("=");
454 458
455 if (parts.length != 2) continue; 459 if (parts.length != 2) continue;
456 460
457 if (values == null) values = new ContentValues(); 461 if (values == null) values = new ContentValues();
458 462
459 values.put(parts[0].trim(), parts[1].trim()); 463 values.put(parts[0].trim(), parts[1].trim());
460 } 464 }
461 465
462 if (uri.getScheme().equals("global")) { 466 String scheme = uri.getScheme();
467 if (scheme.equals("global")) {
463 String dd = "delete_deployment"; 468 String dd = "delete_deployment";
464 if (values.containsKey(dd)) { 469 if (values.containsKey(dd)) {
465 String sv = values.getAsString(dd); 470 String sv = values.getAsString(dd);
466 del = Boolean.parseBoolean(sv); 471 del = Boolean.parseBoolean(sv);
467 } 472 }