depau/EtchDroid
1
0
Fork 0
Code Issues Releases Activity

Log dmg2img output to stderr

Browse source
This commit is contained in:
Davide Depau 2018-08-17 21:50:34 +02:00
parent 95af3899d3
commit c6a5c42a1b
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -31,6 +31,7 @@ dependencies {
implementation 'com.android.support:design:28.0.0-rc01' implementation 'com.android.support:design:28.0.0-rc01'
implementation 'com.android.support:recyclerview-v7:28.0.0-rc01' implementation 'com.android.support:recyclerview-v7:28.0.0-rc01'
implementation 'com.android.support:gridlayout-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.isabsent:filepicker:1.1.01'
// implementation 'com.github.mjdev:libaums:0.5.5' // implementation 'com.github.mjdev:libaums:0.5.5'

5
app/src/main/AndroidManifest.xml
View file

@ -22,8 +22,9 @@
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<service <service android:name=".services.UsbApiImgWriteService"
android:name=".services.UsbAPIWriteService" android:exported="false"/>
<service android:name=".services.UsbApiDmgWriteService"
android:exported="false"/> android:exported="false"/>
</application> </application>

1
app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt
View file

@ -22,6 +22,7 @@ private fun readPartitionTable(dmg2img: File, libDir: String, file: File): Pair<
val p = pb.start() val p = pb.start()
val out = p.inputStream.readString() val out = p.inputStream.readString()
System.err.println(out)
p.waitFor() p.waitFor()
val matches = partRegex.findAll(out) val matches = partRegex.findAll(out)