From c6a5c42a1b6d93de467c4e0de5cad3bec56ca6f8 Mon Sep 17 00:00:00 2001
From: Davide Depau <davide@depau.eu>
Date: Fri, 17 Aug 2018 21:50:34 +0200
Subject: [PATCH] Log dmg2img output to stderr

---
 app/build.gradle                                           | 1 +
 app/src/main/AndroidManifest.xml                           | 7 ++++---
 app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b2ebfeb..1f0aa91 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,6 +31,7 @@ dependencies {
     implementation 'com.android.support:design:28.0.0-rc01'
     implementation 'com.android.support:recyclerview-v7:28.0.0-rc01'
     implementation 'com.android.support:gridlayout-v7:28.0.0-rc01'
+    api 'com.google.guava:guava:26.0-android'
 
     implementation 'com.github.isabsent:filepicker:1.1.01'
 //    implementation 'com.github.mjdev:libaums:0.5.5'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e4b3918..5db273d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,9 +22,10 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <service
-            android:name=".services.UsbAPIWriteService"
-            android:exported="false"/>
+        <service android:name=".services.UsbApiImgWriteService"
+                 android:exported="false"/>
+        <service android:name=".services.UsbApiDmgWriteService"
+                 android:exported="false"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt b/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt
index 7216bfe..6417f19 100644
--- a/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt
+++ b/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt
@@ -22,6 +22,7 @@ private fun readPartitionTable(dmg2img: File, libDir: String, file: File): Pair<
 
     val p = pb.start()
     val out = p.inputStream.readString()
+    System.err.println(out)
     p.waitFor()
     val matches = partRegex.findAll(out)