fix: Allow comma as separator when checking permissions via adb

M-Reimer · Rob--W · commit f187d76a2d86 · 2019-05-02T12:38:17.000+02:00
The separator between permission name and "granted=true" is a comma on older Android versions. Verified on Samsung Galaxy S5 (original ROM).
diff --git a/src/util/adb.js b/src/util/adb.js
@@ -160,7 +160,8 @@ export default class ADBUtils {
     // Set to true the required permissions that have been granted.
     for (const line of pmDumpLogs) {
       for (const perm of permissions) {
-        if (line.includes(`${perm}: granted=true`)) {
+        if (line.includes(`${perm}: granted=true`) ||
+            line.includes(`${perm}, granted=true`)) {
           permissionsMap[perm] = true;
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,8 @@ export default class ADBUtils {`
`160`	`160`	`// Set to true the required permissions that have been granted.`
`161`	`161`	`for (const line of pmDumpLogs) {`
`162`	`162`	`for (const perm of permissions) {`
`163`		- if (line.includes(`${perm}: granted=true`)) {
	`163`	+ if (line.includes(`${perm}: granted=true`) \|\|
	`164`	+ line.includes(`${perm}, granted=true`)) {
`164`	`165`	`permissionsMap[perm] = true;`
`165`	`166`	`}`
`166`	`167`	`}`