mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Escape the semicolons: this was easier than I imagined. Tested with an ssid containing multiple semicolons. Also some minor code cleanups.

Browse source 
Still to be done:
1. Rename 'nopass' to something cleaner, so it looks crisp in Android's Barcode Scanner UI.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1441 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
vikrama 2010-06-17 05:24:42 +00:00
parent 737fee3e69
commit b9f47fdc59
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/WifiGenerator.java
View file

@ -32,12 +32,11 @@ public class WifiGenerator implements GeneratorSource {
Grid table = null; Grid table = null;
TextBox ssid = new TextBox(); TextBox ssid = new TextBox();
TextBox password = new TextBox(); TextBox password = new TextBox();
// Do not allow multiple selections, thus the false final boolean multipleSelections = false;
ListBox networkType = new ListBox(false); ListBox networkType = new ListBox(multipleSelections);
TextBox[] widgets = {ssid, password }; TextBox[] widgets = {ssid, password };
public WifiGenerator(ChangeListener changeListener, public WifiGenerator(ChangeListener changeListener, KeyPressHandler keyListener) {
KeyPressHandler keyListener) {
networkType.addItem("WEP", "WEP"); networkType.addItem("WEP", "WEP");
networkType.addItem("WPA/WPA2", "WPA"); networkType.addItem("WPA/WPA2", "WPA");
networkType.addItem("No encryption", "nopass"); networkType.addItem("No encryption", "nopass");
@ -58,15 +57,12 @@ public class WifiGenerator implements GeneratorSource {
String networkType = getNetworkTypeField(); String networkType = getNetworkTypeField();
// Build the output with obtained data. // Build the output with obtained data.
// note that some informations may just be "" if they were not specified.
//return getVCard(name, company, tel, url, email, address, memo);
return getWifiString(ssid, password, networkType); return getWifiString(ssid, password, networkType);
} }
private String getWifiString(String ssid, String password, String type) { private String getWifiString(String ssid, String password, String type) {
StringBuilder output = new StringBuilder(); StringBuilder output = new StringBuilder();
output.append("WIFI:"); output.append("WIFI:");
// TODO(vikrama): Escape the semicolons in ssid and password
output.append("S:").append(ssid).append(';'); output.append("S:").append(ssid).append(';');
maybeAppend(output, "T:", type); maybeAppend(output, "T:", type);
maybeAppend(output, "P:", password); maybeAppend(output, "P:", password);
@ -88,10 +84,7 @@ public class WifiGenerator implements GeneratorSource {
if (input.contains("\n")) { if (input.contains("\n")) {
throw new GeneratorException(name + " field must not contain \\n characters."); throw new GeneratorException(name + " field must not contain \\n characters.");
} }
if (input.contains(";")) { input = input.replace(";", "\\;");
// TODO(viki): Escape semicolons and colons
throw new GeneratorException(name + " field must not contains ; characters");
}
return input; return input;
} }