Fix ADB root detection command quoting & add another possibility

Quoting was definitely wrong here - it turns out that ADB is actually
extra-quoting our arguments under the hood, so we were effectively doing
it twice, and this definitely didn't work as intended. The new logic
definitely does send the correct command however, so should work for the
devices affected by that issue.

This also adds a similar case for the 'su root' devices, just in case
some are also affected, and reorders the commands a little (I think this
order is preferably, but really it shouldn't make much difference given
the new unambiguous testing approach).

Author: pimterry

src/interceptors/android/adb-commands.ts

@@ -153,12 +153,15 @@ export async function pushFile(
 const runAsRootCommands = [
     // Maybe we're already root?
     (...cmd: string[]) => [...cmd],
-    // 'su' as available on official emulators:
-    (...cmd: string[]) => ['su', 'root', ...cmd],
-    // Su on many physical rooted devices requires quotes:
-    (...cmd: string[]) => ['su', '-c', `'${cmd.join(' ').replace("'", "\\'")}'`],
+    // Su on many physical rooted devices requires quotes. Adbkit automatically quotes
+    // each argument in the array, so we just have to make it a single arg:
+    (...cmd: string[]) => ['su', '-c', cmd.join(' ')],
     // But sometimes it doesn't like them, so try that too:
-    (...cmd: string[]) => ['su', '-c', ...cmd]
+    (...cmd: string[]) => ['su', '-c', ...cmd],
+    // 'su' as available on official emulators, no quoting of commands required:
+    (...cmd: string[]) => ['su', 'root', ...cmd],
+    // 'su' with a single-arg command here too, just in case:
+    (...cmd: string[]) => ['su', 'root', cmd.join(' ')]
 ];
 
 type RootCmd = (...cmd: string[]) => string[];