mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to reflect isContentAvailable supports iPhone 6s and newer

Browse Source
This commit is contained in:
Devin Bileck 2019-10-29 17:09:21 -07:00
parent 0cdf54a992
commit 4c27d08b73
No known key found for this signature in database
GPG Key ID: 38750B26EA8B8C93
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/bisq/core/notifications/MobileModel.java
View File

@ -131,7 +131,7 @@ public class MobileModel {
iPad Pro 12.9 Inch 2. Generation iPad Pro 12.9 Inch 2. Generation
iPad Pro 10.5 Inch iPad Pro 10.5 Inch
*/ */
// iPhone 6 does not support isContentAvailable, iPhone 7 does. // iPhone 6 does not support isContentAvailable, iPhone 6s and 7 does.
// We don't know for other versions, but lets assume all above iPhone 6 are ok. // We don't know for other versions, but lets assume all above iPhone 6 are ok.
if (descriptor != null) { if (descriptor != null) {
String[] descriptorTokens = descriptor.split(" "); String[] descriptorTokens = descriptor.split(" ");
@ -143,14 +143,17 @@ public class MobileModel {
if (Arrays.asList(validVersions).contains(versionString)) { if (Arrays.asList(validVersions).contains(versionString)) {
return true; return true;
} }
String versionSuffix = "";
if (versionString.matches("\\d[^\\d]")) { if (versionString.matches("\\d[^\\d]")) {
versionSuffix = versionString.substring(1);
versionString = versionString.substring(0, 1); versionString = versionString.substring(0, 1);
} else if (versionString.matches("\\d{2}[^\\d]")) { } else if (versionString.matches("\\d{2}[^\\d]")) {
versionSuffix = versionString.substring(2);
versionString = versionString.substring(0, 2); versionString = versionString.substring(0, 2);
} }
try { try {
int version = Integer.parseInt(versionString); int version = Integer.parseInt(versionString);
return version > 5; return version > 6 || (version == 6 && versionSuffix.equalsIgnoreCase("s"));
} catch (Throwable ignore) { } catch (Throwable ignore) {
} }
} else { } else {

4
core/src/test/java/bisq/core/notifications/MobileModelTest.java
View File

@ -43,8 +43,8 @@ public class MobileModelTest {
new Tuple2<>("iPhone 5c", false), new Tuple2<>("iPhone 5c", false),
new Tuple2<>("iPhone 5s", false), new Tuple2<>("iPhone 5s", false),
new Tuple2<>("iPhone 6", true), new Tuple2<>("iPhone 6", false),
new Tuple2<>("iPhone 6 Plus", true), new Tuple2<>("iPhone 6 Plus", false),
new Tuple2<>("iPhone 6s", true), new Tuple2<>("iPhone 6s", true),
new Tuple2<>("iPhone 6s Plus", true), new Tuple2<>("iPhone 6s Plus", true),