bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Alternative key exchange by providing the public key in the URI (bugfixes)

Browse Source
This commit is contained in:
Christian Basler
2017-04-19 00:20:51 +02:00
parent 911dfa7a27
commit a8dada6c89
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/ch/dissem/apps/abit/CreateAddressActivity.java
View File

@@ -64,18 +64,20 @@ public class CreateAddressActivity extends AppCompatActivity {
String[] parameters = getParameters(uri);
for (String parameter : parameters) {
Matcher matcher = KEY_VALUE_PATTERN.matcher(parameter);
String key = matcher.group(1).toLowerCase();
String value = matcher.group(2);
switch (key) {
case "label":
label.setText(value.trim());
break;
case "action":
subscribe.setChecked(value.trim().equalsIgnoreCase("subscribe"));
break;
case "pubkey":
pubkeyBytes = Base64.decode(value, URL_SAFE);
break;
if (matcher.find()) {
String key = matcher.group(1).toLowerCase();
String value = matcher.group(2);
switch (key) {
case "label":
label.setText(value.trim());
break;
case "action":
subscribe.setChecked(value.trim().equalsIgnoreCase("subscribe"));
break;
case "pubkey":
pubkeyBytes = Base64.decode(value, URL_SAFE);
break;
}
}
}

3
app/src/main/java/ch/dissem/apps/abit/util/Drawables.java
View File

@@ -43,6 +43,7 @@ import ch.dissem.bitmessage.exception.ApplicationException;
import static android.graphics.Color.BLACK;
import static android.graphics.Color.WHITE;
import static android.util.Base64.NO_WRAP;
import static android.util.Base64.URL_SAFE;
/**
@@ -85,7 +86,7 @@ public class Drawables {
} catch (IOException e) {
throw new ApplicationException(e);
}
link.append("pubkey=").append(Base64.encodeToString(pubkey.toByteArray(), URL_SAFE));
link.append("pubkey=").append(Base64.encodeToString(pubkey.toByteArray(), URL_SAFE | NO_WRAP));
}
BitMatrix result;
try {