From f443e8ca63c09d68ad0999167bf00cf623202425 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 21 Aug 2019 03:00:21 +0200 Subject: [PATCH] Fix weird issues with activities --- .../java/eu/depau/etchdroid/StateKeeper.kt | 1 - .../ui/activities/ConfirmationActivity.kt | 20 +++++++++++++------ .../ui/activities/UsbDrivePickerActivity.kt | 1 - .../res/layout/activity_usb_drive_picker.xml | 2 +- app/src/main/res/values-night/styles.xml | 2 +- app/src/main/res/values-notnight/styles.xml | 2 +- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt index 3ff7f65..225602d 100644 --- a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt +++ b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt @@ -12,5 +12,4 @@ object StateKeeper { var imageRepr: Image? = null var usbDevice: UsbDevice? = null - var usbMassStorageDevice: EtchDroidUsbMassStorageDevice? = null } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt index 4899974..de1e7e0 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt @@ -3,23 +3,29 @@ package eu.depau.etchdroid.ui.activities import android.content.Intent import android.os.Build import android.os.Bundle +import android.util.Log import android.view.View import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import eu.depau.etchdroid.R import eu.depau.etchdroid.StateKeeper +import eu.depau.etchdroid.libaums_wrapper.EtchDroidUsbMassStorageDevice.Companion.getMassStorageDevices import eu.depau.etchdroid.libaums_wrapper.kotlinexts.size +import eu.depau.etchdroid.services.UsbApiDmgWriteService +import eu.depau.etchdroid.services.UsbApiImgWriteService import eu.depau.etchdroid.ui.adapters.PartitionTableRecyclerViewAdapter +import eu.depau.etchdroid.ui.misc.DoNotShowAgainDialogFragment import eu.depau.etchdroid.utils.enums.FlashMethod import eu.depau.etchdroid.utils.imagetypes.DMGImage import eu.depau.etchdroid.utils.ktexts.* -import eu.depau.etchdroid.services.UsbApiDmgWriteService -import eu.depau.etchdroid.services.UsbApiImgWriteService -import eu.depau.etchdroid.ui.misc.DoNotShowAgainDialogFragment import kotlinx.android.synthetic.main.activity_confirmation.* import java.io.IOException class ConfirmationActivity : ActivityBase() { + companion object { + const val TAG = ".ui.a.ConfActvt" + } + var canContinue: Boolean = false var issuesFound: String? = null @@ -94,9 +100,10 @@ class ConfirmationActivity : ActivityBase() { confirm_sel_usbdev.text = StateKeeper.usbDevice?.name for (trial in 0..1) { + val aumsDev = StateKeeper.usbDevice!!.getMassStorageDevices(this)[0] try { - StateKeeper.usbMassStorageDevice!!.init() - val blockDev = StateKeeper.usbMassStorageDevice!!.blockDevices[0] + aumsDev.init() + val blockDev = aumsDev.blockDevices[0] if (blockDev != null) { val devSize = (blockDev.size.toLong() * blockDev.blockSize.toLong()) @@ -113,6 +120,7 @@ class ConfirmationActivity : ActivityBase() { confirm_extra_info.text = getString(R.string.cant_read_usbdev) } } catch (e: IOException) { + Log.e(TAG, "Unable to query size from the USB device:", e) if (trial == 0) { continue } else { @@ -120,7 +128,7 @@ class ConfirmationActivity : ActivityBase() { break } } finally { - StateKeeper.usbMassStorageDevice!!.close() + aumsDev.close() } } } diff --git a/app/src/main/java/eu/depau/etchdroid/ui/activities/UsbDrivePickerActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/UsbDrivePickerActivity.kt index 037ccf7..1a72019 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/activities/UsbDrivePickerActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/UsbDrivePickerActivity.kt @@ -183,7 +183,6 @@ class UsbDrivePickerActivity : ActivityBase(), SwipeRefreshLayout.OnRefreshListe } StateKeeper.usbDevice = device - StateKeeper.usbMassStorageDevice = device!!.getMassStorageDevices(context)[0] nextStep() } diff --git a/app/src/main/res/layout/activity_usb_drive_picker.xml b/app/src/main/res/layout/activity_usb_drive_picker.xml index d16ad6b..9e85df8 100644 --- a/app/src/main/res/layout/activity_usb_drive_picker.xml +++ b/app/src/main/res/layout/activity_usb_drive_picker.xml @@ -15,7 +15,7 @@ android:layout_height="match_parent" android:theme="@style/CardContentStyle"> - - diff --git a/app/src/main/res/values-notnight/styles.xml b/app/src/main/res/values-notnight/styles.xml index ef86738..92deee2 100644 --- a/app/src/main/res/values-notnight/styles.xml +++ b/app/src/main/res/values-notnight/styles.xml @@ -2,7 +2,7 @@ -