From 53c21a814eb49262f12100caa94036a34a0fbf2c Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 22 Dec 2018 01:16:44 +0100 Subject: [PATCH 01/85] Structure refactor --- app/src/main/AndroidManifest.xml | 16 +-- .../java/eu/depau/etchdroid/StateKeeper.kt | 4 +- .../etchdroid/activities/LicensesActivity.kt | 72 ---------- .../adapters/LicenseRecyclerViewAdapter.kt | 43 ------ .../eu/depau/etchdroid/enums/PartitionType.kt | 3 - .../services/UsbApiDmgWriteService.kt | 8 +- .../services/UsbApiImgWriteService.kt | 6 +- .../etchdroid/services/UsbApiWriteService.kt | 6 +- .../etchdroid/services/UsbWriteService.kt | 6 +- .../{ => ui}/activities/ActivityBase.kt | 8 +- .../activities/ConfirmationActivity.kt | 12 +- .../{ => ui}/activities/ErrorActivity.kt | 2 +- .../{ => ui}/activities/StartActivity.kt | 6 +- .../activities/UsbDrivePickerActivity.kt | 14 +- .../PartitionTableRecyclerViewAdapter.kt | 4 +- .../adapters/UsbDrivesRecyclerViewAdapter.kt | 4 +- .../{utils => ui/misc}/ClickListener.kt | 2 +- .../misc}/DoNotShowAgainDialogFragment.kt | 2 +- .../{utils => ui/misc}/EmptyRecyclerView.kt | 2 +- .../{utils => ui/misc}/NightModeHelper.kt | 2 +- .../misc}/RecyclerViewTouchListener.kt | 2 +- .../java/eu/depau/etchdroid/utils/License.kt | 10 -- .../eu/depau/etchdroid/utils/Partition.kt | 4 +- .../depau/etchdroid/utils/PartitionBuilder.kt | 4 +- .../{ => utils}/enums/FilesystemType.kt | 2 +- .../{ => utils}/enums/FlashMethod.kt | 2 +- .../{ => utils}/enums/ImageLocation.kt | 2 +- .../{ => utils}/enums/PartitionTableType.kt | 2 +- .../etchdroid/utils/enums/PartitionType.kt | 3 + .../etchdroid/{ => utils}/enums/WizardStep.kt | 2 +- .../exception/CannotGetFilePathException.kt | 3 + .../utils/exception/UsbWriteException.kt | 8 ++ .../etchdroid/utils/imagetypes/DMGImage.kt | 112 +++++++++++++++ .../depau/etchdroid/utils/imagetypes/Image.kt | 10 ++ .../utils/ktexts/ContextGetBinary.kt | 56 ++++++++ .../etchdroid/utils/ktexts/ContextToast.kt | 8 ++ .../utils/ktexts/InputStreamToString.kt | 18 +++ .../utils/ktexts/NumberToSizeString.kt | 18 +++ .../utils/ktexts/NumberToTimeString.kt | 31 ++++ .../utils/ktexts/UriGetDisplayName.kt | 29 ++++ .../etchdroid/utils/ktexts/UriGetFileExt.kt | 16 +++ .../etchdroid/utils/ktexts/UriGetFilePath.kt | 135 ++++++++++++++++++ .../etchdroid/utils/ktexts/UriGetFileSize.kt | 39 +++++ .../utils/ktexts/UsbDeviceVidPidName.kt | 17 +++ .../etchdroid/utils/ktexts/ViewSnackbar.kt | 8 ++ .../main/res/layout/activity_confirmation.xml | 2 +- app/src/main/res/layout/activity_error.xml | 2 +- app/src/main/res/layout/activity_licenses.xml | 2 +- app/src/main/res/layout/activity_start.xml | 2 +- .../res/layout/activity_usb_drive_picker.xml | 2 +- app/src/main/res/menu/menu_main.xml | 2 +- 51 files changed, 579 insertions(+), 196 deletions(-) delete mode 100644 app/src/main/java/eu/depau/etchdroid/activities/LicensesActivity.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/adapters/LicenseRecyclerViewAdapter.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt rename app/src/main/java/eu/depau/etchdroid/{ => ui}/activities/ActivityBase.kt (95%) rename app/src/main/java/eu/depau/etchdroid/{ => ui}/activities/ConfirmationActivity.kt (95%) rename app/src/main/java/eu/depau/etchdroid/{ => ui}/activities/ErrorActivity.kt (93%) rename app/src/main/java/eu/depau/etchdroid/{ => ui}/activities/StartActivity.kt (97%) rename app/src/main/java/eu/depau/etchdroid/{ => ui}/activities/UsbDrivePickerActivity.kt (95%) rename app/src/main/java/eu/depau/etchdroid/{ => ui}/adapters/PartitionTableRecyclerViewAdapter.kt (96%) rename app/src/main/java/eu/depau/etchdroid/{ => ui}/adapters/UsbDrivesRecyclerViewAdapter.kt (95%) rename app/src/main/java/eu/depau/etchdroid/{utils => ui/misc}/ClickListener.kt (80%) rename app/src/main/java/eu/depau/etchdroid/{utils => ui/misc}/DoNotShowAgainDialogFragment.kt (98%) rename app/src/main/java/eu/depau/etchdroid/{utils => ui/misc}/EmptyRecyclerView.kt (97%) rename app/src/main/java/eu/depau/etchdroid/{utils => ui/misc}/NightModeHelper.kt (99%) rename app/src/main/java/eu/depau/etchdroid/{utils => ui/misc}/RecyclerViewTouchListener.kt (97%) delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/License.kt rename app/src/main/java/eu/depau/etchdroid/{ => utils}/enums/FilesystemType.kt (98%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/enums/FlashMethod.kt (71%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/enums/ImageLocation.kt (56%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/enums/PartitionTableType.kt (96%) create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/enums/PartitionType.kt rename app/src/main/java/eu/depau/etchdroid/{ => utils}/enums/WizardStep.kt (73%) create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/exception/CannotGetFilePathException.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/exception/UsbWriteException.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextGetBinary.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextToast.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/InputStreamToString.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToSizeString.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToTimeString.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetDisplayName.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileExt.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFilePath.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileSize.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/UsbDeviceVidPidName.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/ViewSnackbar.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d0b32cf..e397b26 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> @@ -31,14 +31,14 @@ + android:value="eu.depau.etchdroid.ui.activities.StartActivity"/> @@ -126,17 +126,17 @@ + android:value="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity"/> - - private fun updateLicenses() { - if (!::licenses.isInitialized) { - licenses = arrayOf( - License(getString(R.string.this_app), Uri.parse("https://github.com/Depau/EtchDroid"), getString(R.string.license_gpl3)), - License("Storage Chooser 2.0", Uri.parse("https://github.com/codekidX/storage-chooser"), getString(R.string.license_mpl_2_0), getString(R.string.storagechooser_license_description)), - License("libaums (fork)", Uri.parse("https://github.com/Depau/libaums"), getString(R.string.license_apache2_0), getString(R.string.libaums_license_desc)), - License("dmg2img (fork)", Uri.parse("https://github.com/Depau/dmg2img-cmake"), getString(R.string.license_gpl2), getString(R.string.dmg2img_license_desc)), - License("bzip2", Uri.parse("https://github.com/LuaDist/bzip2/"), getString(R.string.license_bzip2)), - License("LibreSSL", Uri.parse("https://github.com/libressl-portable/portable"), getString(R.string.license_custom)) - ) - } - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_licenses) - updateLicenses() - - // Enable back button in action bar - supportActionBar!!.setDisplayHomeAsUpEnabled(true) - - viewManager = LinearLayoutManager(this) - recyclerView = licenses_recycler_view - viewAdapter = LicenseRecyclerViewAdapter(licenses) - recyclerView.adapter = viewAdapter - recyclerView.layoutManager = viewManager - - recyclerView.addOnItemTouchListener(RecyclerViewTouchListener(this, recyclerView, object : ClickListener { - override fun onClick(view: View, position: Int) { - val intent = Intent(Intent.ACTION_VIEW, viewAdapter.get(position).url) - startActivity(intent) - } - - override fun onLongClick(view: View, position: Int) {} - })) - } - - override fun onOptionsItemSelected(item: MenuItem?): Boolean { - when (item?.itemId) { - android.R.id.home -> { - finish() - return true - } - } - return super.onOptionsItemSelected(item) - } -} diff --git a/app/src/main/java/eu/depau/etchdroid/adapters/LicenseRecyclerViewAdapter.kt b/app/src/main/java/eu/depau/etchdroid/adapters/LicenseRecyclerViewAdapter.kt deleted file mode 100644 index 01dbffb..0000000 --- a/app/src/main/java/eu/depau/etchdroid/adapters/LicenseRecyclerViewAdapter.kt +++ /dev/null @@ -1,43 +0,0 @@ -package eu.depau.etchdroid.adapters - -import android.annotation.SuppressLint -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.RelativeLayout -import androidx.recyclerview.widget.RecyclerView -import eu.depau.etchdroid.R -import eu.depau.etchdroid.utils.License -import kotlinx.android.synthetic.main.license_row.view.* - - -class LicenseRecyclerViewAdapter(private val dataset: Array) : RecyclerView.Adapter() { - - class ViewHolder(val relLayout: RelativeLayout) : RecyclerView.ViewHolder(relLayout) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): - ViewHolder { - - val relLayout = LayoutInflater.from(parent.context) - .inflate(R.layout.license_row, parent, false) as RelativeLayout - return ViewHolder(relLayout) - } - - @SuppressLint("SetTextI18n") - override fun onBindViewHolder(holder: ViewHolder, position: Int) { - val license = dataset[position] - - holder.relLayout.software_name.text = license.name - holder.relLayout.software_desc.text = license.description - holder.relLayout.software_license.text = license.license - holder.relLayout.software_url.text = license.url.toString() - - holder.relLayout.software_desc.visibility = if (license.description == null) View.GONE else View.VISIBLE - } - - override fun getItemCount(): Int = dataset.size - - fun get(position: Int): License { - return dataset[position] - } -} diff --git a/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt b/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt deleted file mode 100644 index ebc8d6f..0000000 --- a/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt +++ /dev/null @@ -1,3 +0,0 @@ -package eu.depau.etchdroid.enums - -enum class PartitionType \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbApiDmgWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbApiDmgWriteService.kt index f3f7925..4c73d9b 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/UsbApiDmgWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/UsbApiDmgWriteService.kt @@ -5,10 +5,10 @@ import android.net.Uri import com.google.common.util.concurrent.SimpleTimeLimiter import com.google.common.util.concurrent.TimeLimiter import com.google.common.util.concurrent.UncheckedTimeoutException -import eu.depau.etchdroid.kotlin_exts.getBinary -import eu.depau.etchdroid.kotlin_exts.getFileName -import eu.depau.etchdroid.kotlin_exts.getFileSize -import eu.depau.etchdroid.kotlin_exts.name +import eu.depau.etchdroid.utils.ktexts.getBinary +import eu.depau.etchdroid.utils.ktexts.getFileName +import eu.depau.etchdroid.utils.ktexts.getFileSize +import eu.depau.etchdroid.utils.ktexts.name import java.io.BufferedReader import java.io.InputStream import java.util.concurrent.Executors diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbApiImgWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbApiImgWriteService.kt index 9e86d62..5917283 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/UsbApiImgWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/UsbApiImgWriteService.kt @@ -2,9 +2,9 @@ package eu.depau.etchdroid.services import android.hardware.usb.UsbDevice import android.net.Uri -import eu.depau.etchdroid.kotlin_exts.getFileName -import eu.depau.etchdroid.kotlin_exts.getFileSize -import eu.depau.etchdroid.kotlin_exts.name +import eu.depau.etchdroid.utils.ktexts.getFileName +import eu.depau.etchdroid.utils.ktexts.getFileSize +import eu.depau.etchdroid.utils.ktexts.name import java.io.InputStream class UsbApiImgWriteService : UsbApiWriteService("UsbApiImgWriteService") { diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt index ca2438f..34aeed7 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt @@ -5,9 +5,9 @@ import android.hardware.usb.UsbDevice import android.net.Uri import android.util.Log import com.github.mjdev.libaums.UsbMassStorageDevice -import eu.depau.etchdroid.exceptions.UsbWriteException -import eu.depau.etchdroid.kotlin_exts.getFileName -import eu.depau.etchdroid.kotlin_exts.name +import eu.depau.etchdroid.utils.exception.UsbWriteException +import eu.depau.etchdroid.utils.ktexts.getFileName +import eu.depau.etchdroid.utils.ktexts.name import java.io.BufferedInputStream import java.io.InputStream import java.nio.ByteBuffer diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt index 9f2e0e8..39689e4 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt @@ -7,9 +7,9 @@ import android.os.Build import android.os.PowerManager import androidx.core.app.NotificationCompat import eu.depau.etchdroid.R -import eu.depau.etchdroid.activities.ErrorActivity -import eu.depau.etchdroid.kotlin_exts.toHRSize -import eu.depau.etchdroid.kotlin_exts.toHRTime +import eu.depau.etchdroid.ui.activities.ErrorActivity +import eu.depau.etchdroid.utils.ktexts.toHRSize +import eu.depau.etchdroid.utils.ktexts.toHRTime import java.util.* import kotlin.math.max diff --git a/app/src/main/java/eu/depau/etchdroid/activities/ActivityBase.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/ActivityBase.kt similarity index 95% rename from app/src/main/java/eu/depau/etchdroid/activities/ActivityBase.kt rename to app/src/main/java/eu/depau/etchdroid/ui/activities/ActivityBase.kt index d3e9019..a02fcb1 100644 --- a/app/src/main/java/eu/depau/etchdroid/activities/ActivityBase.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/ActivityBase.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.activities +package eu.depau.etchdroid.ui.activities import android.Manifest import android.content.pm.PackageManager @@ -10,9 +10,9 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import eu.depau.etchdroid.R -import eu.depau.etchdroid.kotlin_exts.toast -import eu.depau.etchdroid.utils.DoNotShowAgainDialogFragment -import eu.depau.etchdroid.utils.NightModeHelper +import eu.depau.etchdroid.utils.ktexts.toast +import eu.depau.etchdroid.ui.misc.DoNotShowAgainDialogFragment +import eu.depau.etchdroid.ui.misc.NightModeHelper import me.jfenn.attribouter.Attribouter import android.content.Intent import android.net.Uri diff --git a/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt similarity index 95% rename from app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt rename to app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt index 0bbcf06..8af296e 100644 --- a/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.activities +package eu.depau.etchdroid.ui.activities import android.content.Intent import android.os.Build @@ -8,13 +8,13 @@ import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import eu.depau.etchdroid.R import eu.depau.etchdroid.StateKeeper -import eu.depau.etchdroid.adapters.PartitionTableRecyclerViewAdapter -import eu.depau.etchdroid.enums.FlashMethod -import eu.depau.etchdroid.img_types.DMGImage -import eu.depau.etchdroid.kotlin_exts.* +import eu.depau.etchdroid.ui.adapters.PartitionTableRecyclerViewAdapter +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.utils.DoNotShowAgainDialogFragment +import eu.depau.etchdroid.ui.misc.DoNotShowAgainDialogFragment import kotlinx.android.synthetic.main.activity_confirmation.* import java.io.IOException diff --git a/app/src/main/java/eu/depau/etchdroid/activities/ErrorActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/ErrorActivity.kt similarity index 93% rename from app/src/main/java/eu/depau/etchdroid/activities/ErrorActivity.kt rename to app/src/main/java/eu/depau/etchdroid/ui/activities/ErrorActivity.kt index 50a35ed..15a14f8 100644 --- a/app/src/main/java/eu/depau/etchdroid/activities/ErrorActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/ErrorActivity.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.activities +package eu.depau.etchdroid.ui.activities import android.os.Bundle import eu.depau.etchdroid.R diff --git a/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt similarity index 97% rename from app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt rename to app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt index 1f60bbd..2e8207a 100644 --- a/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.activities +package eu.depau.etchdroid.ui.activities import android.content.Intent import android.content.pm.PackageManager @@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatActivity import com.codekidlabs.storagechooser.StorageChooser import eu.depau.etchdroid.R import eu.depau.etchdroid.StateKeeper -import eu.depau.etchdroid.enums.FlashMethod -import eu.depau.etchdroid.utils.DoNotShowAgainDialogFragment +import eu.depau.etchdroid.utils.enums.FlashMethod +import eu.depau.etchdroid.ui.misc.DoNotShowAgainDialogFragment import kotlinx.android.synthetic.main.activity_start.* import java.io.File diff --git a/app/src/main/java/eu/depau/etchdroid/activities/UsbDrivePickerActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/UsbDrivePickerActivity.kt similarity index 95% rename from app/src/main/java/eu/depau/etchdroid/activities/UsbDrivePickerActivity.kt rename to app/src/main/java/eu/depau/etchdroid/ui/activities/UsbDrivePickerActivity.kt index 6463dd5..621d384 100644 --- a/app/src/main/java/eu/depau/etchdroid/activities/UsbDrivePickerActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/UsbDrivePickerActivity.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.activities +package eu.depau.etchdroid.ui.activities import android.app.PendingIntent import android.content.BroadcastReceiver @@ -19,12 +19,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.github.mjdev.libaums.UsbMassStorageDevice import eu.depau.etchdroid.R import eu.depau.etchdroid.StateKeeper -import eu.depau.etchdroid.adapters.UsbDrivesRecyclerViewAdapter -import eu.depau.etchdroid.enums.FlashMethod -import eu.depau.etchdroid.kotlin_exts.* -import eu.depau.etchdroid.utils.ClickListener -import eu.depau.etchdroid.utils.EmptyRecyclerView -import eu.depau.etchdroid.utils.RecyclerViewTouchListener +import eu.depau.etchdroid.ui.adapters.UsbDrivesRecyclerViewAdapter +import eu.depau.etchdroid.utils.enums.FlashMethod +import eu.depau.etchdroid.utils.ktexts.* +import eu.depau.etchdroid.ui.misc.ClickListener +import eu.depau.etchdroid.ui.misc.EmptyRecyclerView +import eu.depau.etchdroid.ui.misc.RecyclerViewTouchListener import kotlinx.android.synthetic.main.activity_usb_drive_picker.* import java.io.File diff --git a/app/src/main/java/eu/depau/etchdroid/adapters/PartitionTableRecyclerViewAdapter.kt b/app/src/main/java/eu/depau/etchdroid/ui/adapters/PartitionTableRecyclerViewAdapter.kt similarity index 96% rename from app/src/main/java/eu/depau/etchdroid/adapters/PartitionTableRecyclerViewAdapter.kt rename to app/src/main/java/eu/depau/etchdroid/ui/adapters/PartitionTableRecyclerViewAdapter.kt index d2602b8..a145c11 100644 --- a/app/src/main/java/eu/depau/etchdroid/adapters/PartitionTableRecyclerViewAdapter.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/adapters/PartitionTableRecyclerViewAdapter.kt @@ -1,11 +1,11 @@ -package eu.depau.etchdroid.adapters +package eu.depau.etchdroid.ui.adapters import android.view.LayoutInflater import android.view.ViewGroup import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView import eu.depau.etchdroid.R -import eu.depau.etchdroid.kotlin_exts.toHRSize +import eu.depau.etchdroid.utils.ktexts.toHRSize import eu.depau.etchdroid.utils.Partition import kotlinx.android.synthetic.main.part_data_keyvalue.view.* import kotlinx.android.synthetic.main.partition_row.view.* diff --git a/app/src/main/java/eu/depau/etchdroid/adapters/UsbDrivesRecyclerViewAdapter.kt b/app/src/main/java/eu/depau/etchdroid/ui/adapters/UsbDrivesRecyclerViewAdapter.kt similarity index 95% rename from app/src/main/java/eu/depau/etchdroid/adapters/UsbDrivesRecyclerViewAdapter.kt rename to app/src/main/java/eu/depau/etchdroid/ui/adapters/UsbDrivesRecyclerViewAdapter.kt index 3ee467d..e015a94 100644 --- a/app/src/main/java/eu/depau/etchdroid/adapters/UsbDrivesRecyclerViewAdapter.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/adapters/UsbDrivesRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.adapters +package eu.depau.etchdroid.ui.adapters import android.annotation.SuppressLint import android.os.Build @@ -8,7 +8,7 @@ import android.widget.RelativeLayout import androidx.recyclerview.widget.RecyclerView import com.github.mjdev.libaums.UsbMassStorageDevice import eu.depau.etchdroid.R -import eu.depau.etchdroid.kotlin_exts.vidpid +import eu.depau.etchdroid.utils.ktexts.vidpid import kotlinx.android.synthetic.main.usb_device_row.view.* class UsbDrivesRecyclerViewAdapter(private val dataset: Array) : RecyclerView.Adapter() { diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ClickListener.kt b/app/src/main/java/eu/depau/etchdroid/ui/misc/ClickListener.kt similarity index 80% rename from app/src/main/java/eu/depau/etchdroid/utils/ClickListener.kt rename to app/src/main/java/eu/depau/etchdroid/ui/misc/ClickListener.kt index 835fd9e..6f2a0ed 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/ClickListener.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/misc/ClickListener.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.utils +package eu.depau.etchdroid.ui.misc import android.view.View diff --git a/app/src/main/java/eu/depau/etchdroid/utils/DoNotShowAgainDialogFragment.kt b/app/src/main/java/eu/depau/etchdroid/ui/misc/DoNotShowAgainDialogFragment.kt similarity index 98% rename from app/src/main/java/eu/depau/etchdroid/utils/DoNotShowAgainDialogFragment.kt rename to app/src/main/java/eu/depau/etchdroid/ui/misc/DoNotShowAgainDialogFragment.kt index 8b05be1..dc51347 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/DoNotShowAgainDialogFragment.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/misc/DoNotShowAgainDialogFragment.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.utils +package eu.depau.etchdroid.ui.misc import android.annotation.SuppressLint import android.app.Dialog diff --git a/app/src/main/java/eu/depau/etchdroid/utils/EmptyRecyclerView.kt b/app/src/main/java/eu/depau/etchdroid/ui/misc/EmptyRecyclerView.kt similarity index 97% rename from app/src/main/java/eu/depau/etchdroid/utils/EmptyRecyclerView.kt rename to app/src/main/java/eu/depau/etchdroid/ui/misc/EmptyRecyclerView.kt index b0479ce..025036a 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/EmptyRecyclerView.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/misc/EmptyRecyclerView.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.utils +package eu.depau.etchdroid.ui.misc import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/eu/depau/etchdroid/utils/NightModeHelper.kt b/app/src/main/java/eu/depau/etchdroid/ui/misc/NightModeHelper.kt similarity index 99% rename from app/src/main/java/eu/depau/etchdroid/utils/NightModeHelper.kt rename to app/src/main/java/eu/depau/etchdroid/ui/misc/NightModeHelper.kt index 510313b..cff1fe5 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/NightModeHelper.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/misc/NightModeHelper.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.utils +package eu.depau.etchdroid.ui.misc import android.content.SharedPreferences import android.content.res.Configuration diff --git a/app/src/main/java/eu/depau/etchdroid/utils/RecyclerViewTouchListener.kt b/app/src/main/java/eu/depau/etchdroid/ui/misc/RecyclerViewTouchListener.kt similarity index 97% rename from app/src/main/java/eu/depau/etchdroid/utils/RecyclerViewTouchListener.kt rename to app/src/main/java/eu/depau/etchdroid/ui/misc/RecyclerViewTouchListener.kt index aca5810..7f17f9d 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/RecyclerViewTouchListener.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/misc/RecyclerViewTouchListener.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.utils +package eu.depau.etchdroid.ui.misc import android.content.Context import android.view.GestureDetector diff --git a/app/src/main/java/eu/depau/etchdroid/utils/License.kt b/app/src/main/java/eu/depau/etchdroid/utils/License.kt deleted file mode 100644 index bfe3048..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/License.kt +++ /dev/null @@ -1,10 +0,0 @@ -package eu.depau.etchdroid.utils - -import android.net.Uri - -data class License( - val name: String, - val url: Uri, - val license: String, - val description: String? = null -) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/Partition.kt b/app/src/main/java/eu/depau/etchdroid/utils/Partition.kt index 31d2305..7ab46ea 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/Partition.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/Partition.kt @@ -1,7 +1,7 @@ package eu.depau.etchdroid.utils -import eu.depau.etchdroid.enums.FilesystemType -import eu.depau.etchdroid.enums.PartitionType +import eu.depau.etchdroid.utils.enums.FilesystemType +import eu.depau.etchdroid.utils.enums.PartitionType data class Partition( val number: Int?, diff --git a/app/src/main/java/eu/depau/etchdroid/utils/PartitionBuilder.kt b/app/src/main/java/eu/depau/etchdroid/utils/PartitionBuilder.kt index 363dbcc..901e6d2 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/PartitionBuilder.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/PartitionBuilder.kt @@ -1,7 +1,7 @@ package eu.depau.etchdroid.utils -import eu.depau.etchdroid.enums.FilesystemType -import eu.depau.etchdroid.enums.PartitionType +import eu.depau.etchdroid.utils.enums.FilesystemType +import eu.depau.etchdroid.utils.enums.PartitionType class PartitionBuilder { var number: Int? = null diff --git a/app/src/main/java/eu/depau/etchdroid/enums/FilesystemType.kt b/app/src/main/java/eu/depau/etchdroid/utils/enums/FilesystemType.kt similarity index 98% rename from app/src/main/java/eu/depau/etchdroid/enums/FilesystemType.kt rename to app/src/main/java/eu/depau/etchdroid/utils/enums/FilesystemType.kt index 43349dd..c0c26c7 100644 --- a/app/src/main/java/eu/depau/etchdroid/enums/FilesystemType.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/enums/FilesystemType.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.enums +package eu.depau.etchdroid.utils.enums import android.content.Context import eu.depau.etchdroid.R diff --git a/app/src/main/java/eu/depau/etchdroid/enums/FlashMethod.kt b/app/src/main/java/eu/depau/etchdroid/utils/enums/FlashMethod.kt similarity index 71% rename from app/src/main/java/eu/depau/etchdroid/enums/FlashMethod.kt rename to app/src/main/java/eu/depau/etchdroid/utils/enums/FlashMethod.kt index 42ca9ef..464f0a1 100644 --- a/app/src/main/java/eu/depau/etchdroid/enums/FlashMethod.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/enums/FlashMethod.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.enums +package eu.depau.etchdroid.utils.enums enum class FlashMethod { FLASH_API, diff --git a/app/src/main/java/eu/depau/etchdroid/enums/ImageLocation.kt b/app/src/main/java/eu/depau/etchdroid/utils/enums/ImageLocation.kt similarity index 56% rename from app/src/main/java/eu/depau/etchdroid/enums/ImageLocation.kt rename to app/src/main/java/eu/depau/etchdroid/utils/enums/ImageLocation.kt index aa2c410..af8f6af 100644 --- a/app/src/main/java/eu/depau/etchdroid/enums/ImageLocation.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/enums/ImageLocation.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.enums +package eu.depau.etchdroid.utils.enums enum class ImageLocation { REMOTE, diff --git a/app/src/main/java/eu/depau/etchdroid/enums/PartitionTableType.kt b/app/src/main/java/eu/depau/etchdroid/utils/enums/PartitionTableType.kt similarity index 96% rename from app/src/main/java/eu/depau/etchdroid/enums/PartitionTableType.kt rename to app/src/main/java/eu/depau/etchdroid/utils/enums/PartitionTableType.kt index d687bfe..45fa1c6 100644 --- a/app/src/main/java/eu/depau/etchdroid/enums/PartitionTableType.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/enums/PartitionTableType.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.enums +package eu.depau.etchdroid.utils.enums import android.content.Context import eu.depau.etchdroid.R diff --git a/app/src/main/java/eu/depau/etchdroid/utils/enums/PartitionType.kt b/app/src/main/java/eu/depau/etchdroid/utils/enums/PartitionType.kt new file mode 100644 index 0000000..8c75168 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/enums/PartitionType.kt @@ -0,0 +1,3 @@ +package eu.depau.etchdroid.utils.enums + +enum class PartitionType \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/enums/WizardStep.kt b/app/src/main/java/eu/depau/etchdroid/utils/enums/WizardStep.kt similarity index 73% rename from app/src/main/java/eu/depau/etchdroid/enums/WizardStep.kt rename to app/src/main/java/eu/depau/etchdroid/utils/enums/WizardStep.kt index 645ae36..5569f1d 100644 --- a/app/src/main/java/eu/depau/etchdroid/enums/WizardStep.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/enums/WizardStep.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.enums +package eu.depau.etchdroid.utils.enums enum class WizardStep { SELECT_FLASH_METHOD, diff --git a/app/src/main/java/eu/depau/etchdroid/utils/exception/CannotGetFilePathException.kt b/app/src/main/java/eu/depau/etchdroid/utils/exception/CannotGetFilePathException.kt new file mode 100644 index 0000000..180b596 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/exception/CannotGetFilePathException.kt @@ -0,0 +1,3 @@ +package eu.depau.etchdroid.utils.exception + +class CannotGetFilePathException(cause: Exception) : Exception(cause) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/exception/UsbWriteException.kt b/app/src/main/java/eu/depau/etchdroid/utils/exception/UsbWriteException.kt new file mode 100644 index 0000000..3a54fad --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/exception/UsbWriteException.kt @@ -0,0 +1,8 @@ +package eu.depau.etchdroid.utils.exception + +import eu.depau.etchdroid.utils.ktexts.toHRSize +import java.io.IOException + +class UsbWriteException(offset: Long, writtenBytes: Long, exc: Exception) : IOException( + "Write failed at block $offset, ${writtenBytes.toHRSize()} written. Error: $exc", exc +) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt new file mode 100644 index 0000000..8c73f0a --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt @@ -0,0 +1,112 @@ +package eu.depau.etchdroid.utils.imagetypes + +import android.content.Context +import android.net.Uri +import eu.depau.etchdroid.utils.enums.FilesystemType +import eu.depau.etchdroid.utils.enums.PartitionTableType +import eu.depau.etchdroid.utils.ktexts.getBinary +import eu.depau.etchdroid.utils.ktexts.readString +import eu.depau.etchdroid.utils.Partition +import eu.depau.etchdroid.utils.PartitionBuilder +import java.io.File + +val SECTOR_SIZE = 512 +private val partRegex = Regex("partition (\\d+): begin=(\\d+), size=(\\d+), decoded=(\\d+), firstsector=(\\d+), sectorcount=(\\d+), blocksruncount=(\\d+)\\s+(.*) \\((.+) : \\d+\\)", RegexOption.MULTILINE) + +private fun readPartitionTable(dmg2img: File, libDir: String, file: File): Triple?, Long?> { + val pt = ArrayList() + var ptType: PartitionTableType? = null + var imgSize = 0L + + val pb = ProcessBuilder(dmg2img.path, "-v", "-l", file.path) + pb.environment()["LD_LIBRARY_PATH"] = libDir + pb.redirectErrorStream(true) + + val p = pb.start() + val out = p.inputStream.readString() + System.err.println(out) + p.waitFor() + val matches = partRegex.findAll(out) + + matchloop@ for (m in matches) { + val ( + number, begin, size, + decoded, firstsector, + sectorcount, blocksruncount, + label, type + ) = m.destructured + + val pb = PartitionBuilder() + + pb.number = number.toInt() + pb.size = SECTOR_SIZE * sectorcount.toLong() + imgSize += pb.size!! + + if (label.isNotEmpty()) + pb.fsLabel = label + + pb.partLabel = type + + when (type) { + "Apple_partition_map" -> { + ptType = PartitionTableType.MAC + } + "MBR" -> { + ptType = PartitionTableType.MSDOS + continue@matchloop + } + } + + pb.fsType = when { + type == "Apple_Empty" || type == "Apple_Scratch" || type == "Apple_Free" -> FilesystemType.FREE + type == "Apple_HFS" -> FilesystemType.HFSPLUS + type == "Apple_HFSX" -> FilesystemType.HFSPLUS + type == "Windows_FAT_32" -> FilesystemType.FAT32 + type.startsWith("Apple_") || type == "DDM" -> FilesystemType.APT_DATA + else -> FilesystemType.UNKNOWN + } + + pt.add(pb.build()) + } + + return Triple(ptType, pt, imgSize) +} + +class DMGImage(private val uri: Uri, private val context: Context) : Image { + private val dmg2img: File = context.getBinary("dmg2img") + private val libDir: String = context.applicationInfo.nativeLibraryDir + private var loaded: Boolean = false + private var partTable: List? = null + private var partTableType: PartitionTableType? = null + private var imgSize: Long? = null + + private fun readInfo() { + if (loaded) + return + val triple = readPartitionTable(dmg2img, libDir, File(uri.path)) + loaded = true + partTableType = triple.first + partTable = triple.second + imgSize = triple.third + } + + override val partitionTable: List? + get() { + readInfo() + return partTable + } + + + override val tableType: PartitionTableType? + get() { + readInfo() + return partTableType + } + + override val size: Long? + get() { + readInfo() + return imgSize + } + +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt new file mode 100644 index 0000000..93722f9 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt @@ -0,0 +1,10 @@ +package eu.depau.etchdroid.utils.imagetypes + +import eu.depau.etchdroid.utils.enums.PartitionTableType +import eu.depau.etchdroid.utils.Partition + +interface Image { + val partitionTable: List? + val tableType: PartitionTableType? + val size: Long? +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextGetBinary.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextGetBinary.kt new file mode 100644 index 0000000..8644ef0 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextGetBinary.kt @@ -0,0 +1,56 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.content.Context +import android.os.Build +import java.io.File +import java.io.FileOutputStream + + +private val copiedBinaries: MutableMap = HashMap() + + +fun Context.getBinary(name: String): File { + if (name in copiedBinaries.keys) + return copiedBinaries[name]!! + + val abi = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) + Build.SUPPORTED_ABIS[0] + else + Build.CPU_ABI + + val arch = when { + abi.contains("armeabi-v7a") -> "armeabi-v7a" + abi.contains("x86_64") -> "x86_64" + abi.contains("x86") -> "x86" + abi.contains("arm64-v8a") -> "arm64-v8a" + else -> null!! + } + + val assetManager = assets + val assetIn = assetManager.open("bin/$arch/$name") + + val bin = File("$filesDir/bin/$arch/$name") + bin.parentFile?.mkdirs() + if (!bin.exists()) + bin.createNewFile() + val binOut = FileOutputStream(bin) + + // Copy executable + var size: Long = 0 + val buff = ByteArray(1024) + var nRead = assetIn.read(buff) + + while (nRead != -1) { + binOut.write(buff, 0, nRead) + size += nRead.toLong() + nRead = assetIn.read(buff) + } + assetIn.close() + binOut.close() + + bin.setExecutable(true) + + copiedBinaries[name] = bin + + return bin +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextToast.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextToast.kt new file mode 100644 index 0000000..03e9dfe --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextToast.kt @@ -0,0 +1,8 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.content.Context +import android.widget.Toast + +fun Context.toast(message: CharSequence, duration: Int = Toast.LENGTH_LONG) { + Toast.makeText(this, message, duration).show() +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/InputStreamToString.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/InputStreamToString.kt new file mode 100644 index 0000000..6b9a752 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/InputStreamToString.kt @@ -0,0 +1,18 @@ +package eu.depau.etchdroid.utils.ktexts + +import java.io.ByteArrayOutputStream +import java.io.IOException +import java.io.InputStream + +@Throws(IOException::class) +fun InputStream.readString(): String { + val baos = ByteArrayOutputStream() + val buffer = ByteArray(1024) + var length = this.read(buffer) + + while (length != -1) { + baos.write(buffer, 0, length) + length = this.read(buffer) + } + return baos.toString("UTF-8") +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToSizeString.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToSizeString.kt new file mode 100644 index 0000000..1e65fab --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToSizeString.kt @@ -0,0 +1,18 @@ +package eu.depau.etchdroid.utils.ktexts + +// https://stackoverflow.com/a/3758880/1124621 + +private fun humanReadableByteCount(bytes: T, si: Boolean = true): String where T : Comparable, T : Number { + val unit: Long = if (si) 1000 else 1024 + if (bytes.toLong() < unit) return String.format("%.1f B", bytes.toDouble()) + val exp = (Math.log(bytes.toDouble()) / Math.log(unit.toDouble())).toInt() + val pre = (if (si) "kMGTPE" else "KMGTPE")[exp - 1] + if (si) "" else "i" + return String.format("%.1f %sB", bytes.toDouble() / Math.pow(unit.toDouble(), exp.toDouble()), pre) +} + +fun Long.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) +fun Float.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) +fun Double.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) +fun Int.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) +fun Byte.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) +fun Short.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToTimeString.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToTimeString.kt new file mode 100644 index 0000000..983c43b --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToTimeString.kt @@ -0,0 +1,31 @@ +package eu.depau.etchdroid.utils.ktexts + +private val timeStrings = arrayOf("s", "m", "h", "d") +private val timeDivs = arrayOf(60, 60, 24) + +fun humanReadableTimeDelta(time: T): String where T : Number { + var dbTime = time.toDouble() / 1000.0 + var outString = "" + + for (i in 0..(timeDivs.size - 1)) { + val div = timeDivs[i] + val str = timeStrings[i] + + outString = "${(dbTime % div).toInt()}$str$outString" + + if (dbTime < div) + return outString + + outString = " $outString" + dbTime /= div + } + + return "${dbTime.toInt()}${timeStrings[-1]} $outString" +} + +fun Long.toHRTime() = humanReadableTimeDelta(this) +fun Float.toHRTime() = humanReadableTimeDelta(this) +fun Double.toHRTime() = humanReadableTimeDelta(this) +fun Int.toHRTime() = humanReadableTimeDelta(this) +fun Byte.toHRTime() = humanReadableTimeDelta(this) +fun Short.toHRTime() = humanReadableTimeDelta(this) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetDisplayName.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetDisplayName.kt new file mode 100644 index 0000000..34d8fbf --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetDisplayName.kt @@ -0,0 +1,29 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.content.Context +import android.net.Uri +import android.provider.OpenableColumns + + +fun Uri.getFileName(context: Context): String? { + val TAG = "UriGetFileNameExt" + var result: String? = null + + if (this.scheme == "content") { + val cursor = context.getContentResolver().query(this, null, null, null, null) + cursor.use { + if (it != null && it.moveToFirst()) { + result = it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME)) + } + } + } + if (result == null) { + result = this.getPath() + val cut = result!!.lastIndexOf('/') + if (cut != -1) { + result = result!!.substring(cut + 1) + } + } + + return result +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileExt.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileExt.kt new file mode 100644 index 0000000..2e058a7 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileExt.kt @@ -0,0 +1,16 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.content.ContentResolver +import android.net.Uri +import android.webkit.MimeTypeMap +import java.io.File + +fun Uri.getExtension(contentResolver: ContentResolver): String { + return when (scheme) { + ContentResolver.SCHEME_CONTENT -> { + val mime = MimeTypeMap.getSingleton() + mime.getExtensionFromMimeType(contentResolver.getType(this))!! + } + else -> MimeTypeMap.getFileExtensionFromUrl(Uri.fromFile(File(path)).toString()) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFilePath.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFilePath.kt new file mode 100644 index 0000000..6981ca3 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFilePath.kt @@ -0,0 +1,135 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.content.ContentUris +import android.content.Context +import android.net.Uri +import android.os.Build +import android.os.Environment +import android.provider.DocumentsContract +import android.provider.MediaStore +import eu.depau.etchdroid.utils.exception.CannotGetFilePathException + + +/** + * Get a file path from a Uri. This will get the the path for Storage Access + * Framework Documents, as well as the _data field for the MediaStore and + * other file-based ContentProviders. + * + * @param context The context. + * @author paulburke + * + * https://stackoverflow.com/a/27271131/1124621 + */ +fun Uri.getFilePath(context: Context): String? { + val isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT + + try { + if (isKitKat && DocumentsContract.isDocumentUri(context, this)) { + // DocumentProvider + + if (isExternalStorageDocument) { + // ExternalStorageProvider + + val docId = DocumentsContract.getDocumentId(this) + val split = docId.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() + val type = split[0] + + if (type.equals("primary", ignoreCase = true)) { + return Environment.getExternalStorageDirectory().path + "/" + split[1] + } + + // TODO handle non-primary volumes + + } else if (isDownloadsDocument) { + // DownloadsProvider + + val id = DocumentsContract.getDocumentId(this) + + if (id.startsWith("raw:/")) + return Uri.parse(id).path + + val contentUri = ContentUris.withAppendedId( + Uri.parse("content://downloads/public_downloads"), java.lang.Long.valueOf(id)) + + + return contentUri.getDataColumn(context, null, null) + + } else if (isMediaDocument) { + // MediaProvider + + val docId = DocumentsContract.getDocumentId(this) + val split = docId.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() + val type = split[0] + + val contentUri = when (type) { + "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI + "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + else -> null + } + + val selection = "_id=?" + val selectionArgs = arrayOf(split[1]) + + return contentUri?.getDataColumn(context, selection, selectionArgs) + } + + } else if ("content".equals(scheme, ignoreCase = true)) { + // MediaStore (and general) + + return getDataColumn(context, null, null) + + } else if ("file".equals(scheme, ignoreCase = true)) { + // File + + return path + } + } catch (e: Exception) { + // Wrap into own exception to make debugging easier + throw CannotGetFilePathException(e) + } + + return null +} + +/** + * Get the value of the data column for this Uri. This is useful for + * MediaStore Uris, and other file-based ContentProviders. + * + * @param context The context. + * @param selection (Optional) Filter used in the query. + * @param selectionArgs (Optional) Selection arguments used in the query. + * @return The value of the _data column, which is typically a file path. + */ +fun Uri.getDataColumn(context: Context, selection: String?, selectionArgs: Array?): String? { + val column = "_data" + val projection = arrayOf(column) + + context.contentResolver.query(this, projection, selection, selectionArgs, null)?.use { + if (it.moveToFirst()) { + val columnIndex = it.getColumnIndexOrThrow(column) + return it.getString(columnIndex) + } + } + + return null +} + + +/** + * Whether the Uri authority is ExternalStorageProvider. + */ +val Uri.isExternalStorageDocument: Boolean + get() = "com.android.externalstorage.documents" == authority + +/** + * Whether the Uri authority is DownloadsProvider. + */ +val Uri.isDownloadsDocument: Boolean + get() = "com.android.providers.downloads.documents" == authority + +/** + * Whether the Uri authority is MediaProvider. + */ +val Uri.isMediaDocument: Boolean + get() = "com.android.providers.media.documents" == authority \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileSize.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileSize.kt new file mode 100644 index 0000000..91fa893 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileSize.kt @@ -0,0 +1,39 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.content.ContentResolver +import android.content.Context +import android.database.Cursor +import android.database.SQLException +import android.net.Uri +import android.provider.OpenableColumns +import java.io.File + +// https://github.com/android-rcs/rcsjta/blob/master/RI/src/com/gsma/rcs/ri/utils/FileUtils.java#L214 + +fun Uri.getFileSize(context: Context): Long { + when (this.scheme) { + ContentResolver.SCHEME_FILE -> { + val f = File(this.path) + return f.length() + } + + ContentResolver.SCHEME_CONTENT -> { + val cursor: Cursor? = context.contentResolver.query(this, null, null, null, null) + + cursor.use { + if (it == null) { + throw SQLException("Failed to query file $this") + } + return if (it.moveToFirst()) { + java.lang.Long.valueOf(it.getString(it + .getColumnIndexOrThrow(OpenableColumns.SIZE))) + } else { + throw IllegalArgumentException( + "Error in retrieving this size form the URI") + } + } + } + + else -> throw IllegalArgumentException("Unsupported URI scheme") + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UsbDeviceVidPidName.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UsbDeviceVidPidName.kt new file mode 100644 index 0000000..b0cd036 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UsbDeviceVidPidName.kt @@ -0,0 +1,17 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.hardware.usb.UsbDevice +import android.os.Build + +fun formatID(id: Int): String = Integer.toHexString(id).padStart(4, '0') + +val UsbDevice.vidpid: String + get() = "${formatID(this.vendorId)}:${formatID(this.productId)}" + + +val UsbDevice.name: String + get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + "${this.manufacturerName} ${this.productName}" + } else { + this.deviceName + } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ViewSnackbar.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ViewSnackbar.kt new file mode 100644 index 0000000..9e67127 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ViewSnackbar.kt @@ -0,0 +1,8 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.view.View +import com.google.android.material.snackbar.Snackbar + +fun View.snackbar(message: CharSequence, duration: Int = Snackbar.LENGTH_LONG) { + Snackbar.make(this, message, duration).show() +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_confirmation.xml b/app/src/main/res/layout/activity_confirmation.xml index 283aabd..13f5458 100644 --- a/app/src/main/res/layout/activity_confirmation.xml +++ b/app/src/main/res/layout/activity_confirmation.xml @@ -7,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:theme="@style/DarkThemeOverlay" - tools:context=".activities.ConfirmationActivity"> + tools:context=".ui.activities.ConfirmationActivity"> + tools:context=".ui.activities.ErrorActivity"> + tools:context=".ui.activities.LicensesActivity"> + tools:context=".ui.activities.StartActivity"> + tools:context=".ui.activities.UsbDrivePickerActivity"> + tools:context=".ui.activities.StartActivity"> Date: Mon, 24 Dec 2018 02:59:40 +0100 Subject: [PATCH 02/85] Add block device Input/Output Stream wrappers --- .../blockdevice/BlockDeviceInputStream.kt | 116 ++++++++++++++++++ .../blockdevice/BlockDeviceOutputStream.kt | 85 +++++++++++++ 2 files changed, 201 insertions(+) create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt new file mode 100644 index 0000000..a980cd3 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt @@ -0,0 +1,116 @@ +package eu.depau.etchdroid.utils.blockdevice + +import com.github.mjdev.libaums.driver.BlockDeviceDriver +import java.io.InputStream +import java.nio.ByteBuffer + +class BlockDeviceInputStream( + private val blockDev: BlockDeviceDriver, + private val prefetchBlocks: Int = 2048 +) : InputStream() { + + private val byteBuffer = ByteBuffer.allocate(blockDev.blockSize * prefetchBlocks) + + private var currentBlockOffset: Long = 0 + private val currentByteOffset: Long + get() = currentBlockOffset * blockDev.blockSize + byteBuffer.position() + + private var markedBlock: Long = 0 + private var markedBufferPosition: Int = 0 + + private val sizeBytes: Long + get() = blockDev.size.toLong() * blockDev.blockSize + + private fun isNextByteAfterEOF(): Boolean { + if (byteBuffer.hasRemaining()) + return false + return currentBlockOffset + 1 >= blockDev.size + } + + private fun fetch() { + byteBuffer.clear() + + if (blockDev.size - currentBlockOffset < prefetchBlocks) + byteBuffer.limit( + (currentBlockOffset - blockDev.size).toInt() * blockDev.blockSize + ) + + blockDev.read(currentBlockOffset, byteBuffer) + } + + private fun fetchNextIfNeeded() { + if (byteBuffer.hasRemaining()) + return + currentBlockOffset++ + fetch() + } + + override fun read(): Int { + if (isNextByteAfterEOF()) + return -1 + fetchNextIfNeeded() + return byteBuffer.get().toInt() and 0xFF + } + + override fun read(b: ByteArray): Int { + return read(b, 0, b.size) + } + + override fun read(b: ByteArray, off: Int, len: Int): Int { + if (isNextByteAfterEOF()) + return -1 + + val maxPos = (off + len) % (b.size + 1) + + if (len <= 0 || off > b.size) + return 0 + + var bytesRead = 0 + + for (i in off until maxPos) { + val readByte = read() + + if (readByte == -1) + break + + b[i] = readByte.toByte() + } + + return bytesRead + } + + override fun skip(n: Long): Long { + val actualSkipDistance = when { + currentByteOffset + n > sizeBytes -> sizeBytes - currentByteOffset + currentByteOffset + n < 0 -> -currentByteOffset + else -> n + } + + val newByteOffset = currentByteOffset + actualSkipDistance + currentBlockOffset = newByteOffset / blockDev.blockSize + + fetch() + byteBuffer.position((newByteOffset - currentBlockOffset * blockDev.blockSize).toInt()) + + return actualSkipDistance + } + + override fun available(): Int { + return byteBuffer.remaining() + } + + override fun mark(readlimit: Int) { + markedBlock = currentBlockOffset + markedBufferPosition = byteBuffer.position() + } + + override fun markSupported(): Boolean { + return true + } + + override fun reset() { + currentBlockOffset = markedBlock + fetch() + byteBuffer.position(markedBufferPosition) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt new file mode 100644 index 0000000..f9f3a69 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt @@ -0,0 +1,85 @@ +package eu.depau.etchdroid.utils.blockdevice + +import com.github.mjdev.libaums.driver.BlockDeviceDriver +import java.io.IOException +import java.io.OutputStream +import java.nio.ByteBuffer + +class BlockDeviceOutputStream( + private val blockDev: BlockDeviceDriver, + bufferBlocks: Int = 2048 +) : OutputStream() { + + private val byteBuffer = ByteBuffer.allocate(blockDev.blockSize * bufferBlocks) + + private var currentBlockOffset: Long = 0 + private val currentByteOffset: Long + get() = currentBlockOffset * blockDev.blockSize + byteBuffer.position() + + private val sizeBytes: Long + get() = blockDev.size.toLong() * blockDev.blockSize + + private val bytesUntilEOF: Long + get() = blockDev.size.toLong() * blockDev.size - currentByteOffset + + override fun write(b: Int) { + if (bytesUntilEOF < 1) + throw IOException("No space left on device") + + byteBuffer.put(b.toByte()) + + if (byteBuffer.remaining() == 0) + flush() + } + + override fun write(b: ByteArray) { + write(b, 0, b.size) + } + + override fun write(b: ByteArray, off: Int, len: Int) { + val maxPos = (off + len) % (b.size + 1) + + if (len <= 0 || off > b.size) + return + + for (i in off until maxPos) + write(b[i].toInt()) + } + + override fun flush() { + byteBuffer.flip() + + val toWrite = byteBuffer.limit() + val incompleteBlockFullBytes = toWrite % blockDev.blockSize + val fullBlocks = (toWrite - incompleteBlockFullBytes) / blockDev.blockSize + + // Check if we're trying to flush while the last written block isn't full + if (incompleteBlockFullBytes > 0) { + val incompleteBlockBuffer = ByteBuffer.allocate(blockDev.blockSize) + + // Load last block from device + blockDev.read(currentBlockOffset + fullBlocks, incompleteBlockBuffer) + + // Add it to the incomplete block + byteBuffer.limit(fullBlocks * blockDev.blockSize) + byteBuffer.put( + incompleteBlockBuffer.array(), + toWrite, blockDev.blockSize - incompleteBlockFullBytes + ) + byteBuffer.position(0) + } + + // Flush to device + blockDev.write(currentBlockOffset, byteBuffer) + + // Copy the incomplete block at the beginning, then push back the position + byteBuffer.apply { + position(fullBlocks * blockDev.blockSize) + limit(toWrite) + compact() + clear() + position(incompleteBlockFullBytes) + } + currentBlockOffset += fullBlocks; + } +} \ No newline at end of file From 6755b3ca7fdfe42a14a8ca9a2db9272075b5d879 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 24 Dec 2018 03:01:35 +0100 Subject: [PATCH 03/85] Remove files lost during previous refactoring --- .../exceptions/CannotGetFilePathException.kt | 3 - .../etchdroid/exceptions/UsbWriteException.kt | 8 -- .../eu/depau/etchdroid/img_types/DMGImage.kt | 112 --------------- .../eu/depau/etchdroid/img_types/Image.kt | 10 -- .../etchdroid/kotlin_exts/ContextGetBinary.kt | 56 -------- .../etchdroid/kotlin_exts/ContextToast.kt | 8 -- .../kotlin_exts/InputStreamToString.kt | 18 --- .../kotlin_exts/NumberToSizeString.kt | 18 --- .../kotlin_exts/NumberToTimeString.kt | 31 ---- .../kotlin_exts/UriGetDisplayName.kt | 29 ---- .../etchdroid/kotlin_exts/UriGetFileExt.kt | 16 --- .../etchdroid/kotlin_exts/UriGetFilePath.kt | 135 ------------------ .../etchdroid/kotlin_exts/UriGetFileSize.kt | 39 ----- .../kotlin_exts/UsbDeviceVidPidName.kt | 17 --- .../etchdroid/kotlin_exts/ViewSnackbar.kt | 8 -- .../ui/activities/UsbDrivePickerActivity.kt | 2 +- 16 files changed, 1 insertion(+), 509 deletions(-) delete mode 100644 app/src/main/java/eu/depau/etchdroid/exceptions/CannotGetFilePathException.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/exceptions/UsbWriteException.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/img_types/Image.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextGetBinary.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/InputStreamToString.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileExt.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFilePath.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt diff --git a/app/src/main/java/eu/depau/etchdroid/exceptions/CannotGetFilePathException.kt b/app/src/main/java/eu/depau/etchdroid/exceptions/CannotGetFilePathException.kt deleted file mode 100644 index 7e5ccd6..0000000 --- a/app/src/main/java/eu/depau/etchdroid/exceptions/CannotGetFilePathException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package eu.depau.etchdroid.exceptions - -class CannotGetFilePathException(cause: Exception) : Exception(cause) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/exceptions/UsbWriteException.kt b/app/src/main/java/eu/depau/etchdroid/exceptions/UsbWriteException.kt deleted file mode 100644 index d79681e..0000000 --- a/app/src/main/java/eu/depau/etchdroid/exceptions/UsbWriteException.kt +++ /dev/null @@ -1,8 +0,0 @@ -package eu.depau.etchdroid.exceptions - -import eu.depau.etchdroid.kotlin_exts.toHRSize -import java.io.IOException - -class UsbWriteException(offset: Long, writtenBytes: Long, exc: Exception) : IOException( - "Write failed at block $offset, ${writtenBytes.toHRSize()} written. Error: $exc", exc -) \ 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 deleted file mode 100644 index d1422f7..0000000 --- a/app/src/main/java/eu/depau/etchdroid/img_types/DMGImage.kt +++ /dev/null @@ -1,112 +0,0 @@ -package eu.depau.etchdroid.img_types - -import android.content.Context -import android.net.Uri -import eu.depau.etchdroid.enums.FilesystemType -import eu.depau.etchdroid.enums.PartitionTableType -import eu.depau.etchdroid.kotlin_exts.getBinary -import eu.depau.etchdroid.kotlin_exts.readString -import eu.depau.etchdroid.utils.Partition -import eu.depau.etchdroid.utils.PartitionBuilder -import java.io.File - -val SECTOR_SIZE = 512 -private val partRegex = Regex("partition (\\d+): begin=(\\d+), size=(\\d+), decoded=(\\d+), firstsector=(\\d+), sectorcount=(\\d+), blocksruncount=(\\d+)\\s+(.*) \\((.+) : \\d+\\)", RegexOption.MULTILINE) - -private fun readPartitionTable(dmg2img: File, libDir: String, file: File): Triple?, Long?> { - val pt = ArrayList() - var ptType: PartitionTableType? = null - var imgSize = 0L - - val pb = ProcessBuilder(dmg2img.path, "-v", "-l", file.path) - pb.environment()["LD_LIBRARY_PATH"] = libDir - pb.redirectErrorStream(true) - - val p = pb.start() - val out = p.inputStream.readString() - System.err.println(out) - p.waitFor() - val matches = partRegex.findAll(out) - - matchloop@ for (m in matches) { - val ( - number, begin, size, - decoded, firstsector, - sectorcount, blocksruncount, - label, type - ) = m.destructured - - val pb = PartitionBuilder() - - pb.number = number.toInt() - pb.size = SECTOR_SIZE * sectorcount.toLong() - imgSize += pb.size!! - - if (label.isNotEmpty()) - pb.fsLabel = label - - pb.partLabel = type - - when (type) { - "Apple_partition_map" -> { - ptType = PartitionTableType.MAC - } - "MBR" -> { - ptType = PartitionTableType.MSDOS - continue@matchloop - } - } - - pb.fsType = when { - type == "Apple_Empty" || type == "Apple_Scratch" || type == "Apple_Free" -> FilesystemType.FREE - type == "Apple_HFS" -> FilesystemType.HFSPLUS - type == "Apple_HFSX" -> FilesystemType.HFSPLUS - type == "Windows_FAT_32" -> FilesystemType.FAT32 - type.startsWith("Apple_") || type == "DDM" -> FilesystemType.APT_DATA - else -> FilesystemType.UNKNOWN - } - - pt.add(pb.build()) - } - - return Triple(ptType, pt, imgSize) -} - -class DMGImage(private val uri: Uri, private val context: Context) : Image { - private val dmg2img: File = context.getBinary("dmg2img") - private val libDir: String = context.applicationInfo.nativeLibraryDir - private var loaded: Boolean = false - private var partTable: List? = null - private var partTableType: PartitionTableType? = null - private var imgSize: Long? = null - - private fun readInfo() { - if (loaded) - return - val triple = readPartitionTable(dmg2img, libDir, File(uri.path)) - loaded = true - partTableType = triple.first - partTable = triple.second - imgSize = triple.third - } - - override val partitionTable: List? - get() { - readInfo() - return partTable - } - - - override val tableType: PartitionTableType? - get() { - readInfo() - return partTableType - } - - override val size: Long? - get() { - readInfo() - return imgSize - } - -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/img_types/Image.kt b/app/src/main/java/eu/depau/etchdroid/img_types/Image.kt deleted file mode 100644 index f87b56e..0000000 --- a/app/src/main/java/eu/depau/etchdroid/img_types/Image.kt +++ /dev/null @@ -1,10 +0,0 @@ -package eu.depau.etchdroid.img_types - -import eu.depau.etchdroid.enums.PartitionTableType -import eu.depau.etchdroid.utils.Partition - -interface Image { - val partitionTable: List? - val tableType: PartitionTableType? - val size: Long? -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextGetBinary.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextGetBinary.kt deleted file mode 100644 index cb89b83..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextGetBinary.kt +++ /dev/null @@ -1,56 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import android.content.Context -import android.os.Build -import java.io.File -import java.io.FileOutputStream - - -private val copiedBinaries: MutableMap = HashMap() - - -fun Context.getBinary(name: String): File { - if (name in copiedBinaries.keys) - return copiedBinaries[name]!! - - val abi = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) - Build.SUPPORTED_ABIS[0] - else - Build.CPU_ABI - - val arch = when { - abi.contains("armeabi-v7a") -> "armeabi-v7a" - abi.contains("x86_64") -> "x86_64" - abi.contains("x86") -> "x86" - abi.contains("arm64-v8a") -> "arm64-v8a" - else -> null!! - } - - val assetManager = assets - val assetIn = assetManager.open("bin/$arch/$name") - - val bin = File("$filesDir/bin/$arch/$name") - bin.parentFile?.mkdirs() - if (!bin.exists()) - bin.createNewFile() - val binOut = FileOutputStream(bin) - - // Copy executable - var size: Long = 0 - val buff = ByteArray(1024) - var nRead = assetIn.read(buff) - - while (nRead != -1) { - binOut.write(buff, 0, nRead) - size += nRead.toLong() - nRead = assetIn.read(buff) - } - assetIn.close() - binOut.close() - - bin.setExecutable(true) - - copiedBinaries[name] = bin - - return bin -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt deleted file mode 100644 index 9f44b4f..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt +++ /dev/null @@ -1,8 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import android.content.Context -import android.widget.Toast - -fun Context.toast(message: CharSequence, duration: Int = Toast.LENGTH_LONG) { - Toast.makeText(this, message, duration).show() -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/InputStreamToString.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/InputStreamToString.kt deleted file mode 100644 index 807f4df..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/InputStreamToString.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import java.io.ByteArrayOutputStream -import java.io.IOException -import java.io.InputStream - -@Throws(IOException::class) -fun InputStream.readString(): String { - val baos = ByteArrayOutputStream() - val buffer = ByteArray(1024) - var length = this.read(buffer) - - while (length != -1) { - baos.write(buffer, 0, length) - length = this.read(buffer) - } - return baos.toString("UTF-8") -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt deleted file mode 100644 index c259192..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -// https://stackoverflow.com/a/3758880/1124621 - -private fun humanReadableByteCount(bytes: T, si: Boolean = true): String where T : Comparable, T : Number { - val unit: Long = if (si) 1000 else 1024 - if (bytes.toLong() < unit) return String.format("%.1f B", bytes.toDouble()) - val exp = (Math.log(bytes.toDouble()) / Math.log(unit.toDouble())).toInt() - val pre = (if (si) "kMGTPE" else "KMGTPE")[exp - 1] + if (si) "" else "i" - return String.format("%.1f %sB", bytes.toDouble() / Math.pow(unit.toDouble(), exp.toDouble()), pre) -} - -fun Long.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) -fun Float.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) -fun Double.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) -fun Int.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) -fun Byte.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) -fun Short.toHRSize(si: Boolean = true) = humanReadableByteCount(this, si) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt deleted file mode 100644 index 5a0ea78..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt +++ /dev/null @@ -1,31 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -private val timeStrings = arrayOf("s", "m", "h", "d") -private val timeDivs = arrayOf(60, 60, 24) - -fun humanReadableTimeDelta(time: T): String where T : Number { - var dbTime = time.toDouble() / 1000.0 - var outString = "" - - for (i in 0..(timeDivs.size - 1)) { - val div = timeDivs[i] - val str = timeStrings[i] - - outString = "${(dbTime % div).toInt()}$str$outString" - - if (dbTime < div) - return outString - - outString = " $outString" - dbTime /= div - } - - return "${dbTime.toInt()}${timeStrings[-1]} $outString" -} - -fun Long.toHRTime() = humanReadableTimeDelta(this) -fun Float.toHRTime() = humanReadableTimeDelta(this) -fun Double.toHRTime() = humanReadableTimeDelta(this) -fun Int.toHRTime() = humanReadableTimeDelta(this) -fun Byte.toHRTime() = humanReadableTimeDelta(this) -fun Short.toHRTime() = humanReadableTimeDelta(this) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt deleted file mode 100644 index c52c4b9..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt +++ /dev/null @@ -1,29 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import android.content.Context -import android.net.Uri -import android.provider.OpenableColumns - - -fun Uri.getFileName(context: Context): String? { - val TAG = "UriGetFileNameExt" - var result: String? = null - - if (this.scheme == "content") { - val cursor = context.getContentResolver().query(this, null, null, null, null) - cursor.use { - if (it != null && it.moveToFirst()) { - result = it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME)) - } - } - } - if (result == null) { - result = this.getPath() - val cut = result!!.lastIndexOf('/') - if (cut != -1) { - result = result!!.substring(cut + 1) - } - } - - return result -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileExt.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileExt.kt deleted file mode 100644 index bc55af2..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileExt.kt +++ /dev/null @@ -1,16 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import android.content.ContentResolver -import android.net.Uri -import android.webkit.MimeTypeMap -import java.io.File - -fun Uri.getExtension(contentResolver: ContentResolver): String { - return when (scheme) { - ContentResolver.SCHEME_CONTENT -> { - val mime = MimeTypeMap.getSingleton() - mime.getExtensionFromMimeType(contentResolver.getType(this))!! - } - else -> MimeTypeMap.getFileExtensionFromUrl(Uri.fromFile(File(path)).toString()) - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFilePath.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFilePath.kt deleted file mode 100644 index 714eeda..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFilePath.kt +++ /dev/null @@ -1,135 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import android.content.ContentUris -import android.content.Context -import android.net.Uri -import android.os.Build -import android.os.Environment -import android.provider.DocumentsContract -import android.provider.MediaStore -import eu.depau.etchdroid.exceptions.CannotGetFilePathException - - -/** - * Get a file path from a Uri. This will get the the path for Storage Access - * Framework Documents, as well as the _data field for the MediaStore and - * other file-based ContentProviders. - * - * @param context The context. - * @author paulburke - * - * https://stackoverflow.com/a/27271131/1124621 - */ -fun Uri.getFilePath(context: Context): String? { - val isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT - - try { - if (isKitKat && DocumentsContract.isDocumentUri(context, this)) { - // DocumentProvider - - if (isExternalStorageDocument) { - // ExternalStorageProvider - - val docId = DocumentsContract.getDocumentId(this) - val split = docId.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() - val type = split[0] - - if (type.equals("primary", ignoreCase = true)) { - return Environment.getExternalStorageDirectory().path + "/" + split[1] - } - - // TODO handle non-primary volumes - - } else if (isDownloadsDocument) { - // DownloadsProvider - - val id = DocumentsContract.getDocumentId(this) - - if (id.startsWith("raw:/")) - return Uri.parse(id).path - - val contentUri = ContentUris.withAppendedId( - Uri.parse("content://downloads/public_downloads"), java.lang.Long.valueOf(id)) - - - return contentUri.getDataColumn(context, null, null) - - } else if (isMediaDocument) { - // MediaProvider - - val docId = DocumentsContract.getDocumentId(this) - val split = docId.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() - val type = split[0] - - val contentUri = when (type) { - "image" -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI - "video" -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI - "audio" -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI - else -> null - } - - val selection = "_id=?" - val selectionArgs = arrayOf(split[1]) - - return contentUri?.getDataColumn(context, selection, selectionArgs) - } - - } else if ("content".equals(scheme, ignoreCase = true)) { - // MediaStore (and general) - - return getDataColumn(context, null, null) - - } else if ("file".equals(scheme, ignoreCase = true)) { - // File - - return path - } - } catch (e: Exception) { - // Wrap into own exception to make debugging easier - throw CannotGetFilePathException(e) - } - - return null -} - -/** - * Get the value of the data column for this Uri. This is useful for - * MediaStore Uris, and other file-based ContentProviders. - * - * @param context The context. - * @param selection (Optional) Filter used in the query. - * @param selectionArgs (Optional) Selection arguments used in the query. - * @return The value of the _data column, which is typically a file path. - */ -fun Uri.getDataColumn(context: Context, selection: String?, selectionArgs: Array?): String? { - val column = "_data" - val projection = arrayOf(column) - - context.contentResolver.query(this, projection, selection, selectionArgs, null)?.use { - if (it.moveToFirst()) { - val columnIndex = it.getColumnIndexOrThrow(column) - return it.getString(columnIndex) - } - } - - return null -} - - -/** - * Whether the Uri authority is ExternalStorageProvider. - */ -val Uri.isExternalStorageDocument: Boolean - get() = "com.android.externalstorage.documents" == authority - -/** - * Whether the Uri authority is DownloadsProvider. - */ -val Uri.isDownloadsDocument: Boolean - get() = "com.android.providers.downloads.documents" == authority - -/** - * Whether the Uri authority is MediaProvider. - */ -val Uri.isMediaDocument: Boolean - get() = "com.android.providers.media.documents" == authority \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt deleted file mode 100644 index 46fa800..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt +++ /dev/null @@ -1,39 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import android.content.ContentResolver -import android.content.Context -import android.database.Cursor -import android.database.SQLException -import android.net.Uri -import android.provider.OpenableColumns -import java.io.File - -// https://github.com/android-rcs/rcsjta/blob/master/RI/src/com/gsma/rcs/ri/utils/FileUtils.java#L214 - -fun Uri.getFileSize(context: Context): Long { - when (this.scheme) { - ContentResolver.SCHEME_FILE -> { - val f = File(this.path) - return f.length() - } - - ContentResolver.SCHEME_CONTENT -> { - val cursor: Cursor? = context.contentResolver.query(this, null, null, null, null) - - cursor.use { - if (it == null) { - throw SQLException("Failed to query file $this") - } - return if (it.moveToFirst()) { - java.lang.Long.valueOf(it.getString(it - .getColumnIndexOrThrow(OpenableColumns.SIZE))) - } else { - throw IllegalArgumentException( - "Error in retrieving this size form the URI") - } - } - } - - else -> throw IllegalArgumentException("Unsupported URI scheme") - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt deleted file mode 100644 index 76a0ac9..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt +++ /dev/null @@ -1,17 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import android.hardware.usb.UsbDevice -import android.os.Build - -fun formatID(id: Int): String = Integer.toHexString(id).padStart(4, '0') - -val UsbDevice.vidpid: String - get() = "${formatID(this.vendorId)}:${formatID(this.productId)}" - - -val UsbDevice.name: String - get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - "${this.manufacturerName} ${this.productName}" - } else { - this.deviceName - } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt deleted file mode 100644 index 4f4192b..0000000 --- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt +++ /dev/null @@ -1,8 +0,0 @@ -package eu.depau.etchdroid.kotlin_exts - -import android.view.View -import com.google.android.material.snackbar.Snackbar - -fun View.snackbar(message: CharSequence, duration: Int = Snackbar.LENGTH_LONG) { - Snackbar.make(this, message, duration).show() -} \ No newline at end of file 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 621d384..543a7cb 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 @@ -120,7 +120,7 @@ class UsbDrivePickerActivity : ActivityBase(), SwipeRefreshLayout.OnRefreshListe } viewManager = LinearLayoutManager(this) - recyclerView = usbdevs_recycler_view + recyclerView = usbdevs_recycler_view as EmptyRecyclerView recyclerView.emptyView = usbdevs_recycler_empty_view recyclerView.addOnItemTouchListener(RecyclerViewTouchListener(this, recyclerView, object : ClickListener { From a69ce4e4b4cf9f4ea9eabe61864a1c94797a917c Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 24 Dec 2018 20:01:52 +0100 Subject: [PATCH 04/85] Add test for BlockDeviceInputStream --- .../blockdevice/BlockDeviceInputStreamTest.kt | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt diff --git a/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt b/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt new file mode 100644 index 0000000..b748502 --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt @@ -0,0 +1,110 @@ +package eu.depau.etchdroid.utils.blockdevice + +import com.github.mjdev.libaums.driver.BlockDeviceDriver +import com.github.mjdev.libaums.driver.file.FileBlockDeviceDriver +import org.junit.Assert +import org.junit.Test +import java.io.File + +class BlockDeviceInputStreamTest { + @Test + fun testWithCommonParams() { + runReadTest( + 10L * 1024 * 1024, // 10 MiB + 512, + 2048 + ) + } + + @Test + fun testWithWeirdBlockSize() { + runReadTest( + 10L * 666 * 2 * 666 * 2, // 10 MegaDevils + 666, + 2048 + ) + } + + @Test + fun testNoPrefetch() { + runReadTest( + 10L * 1024 * 1024, // 10 MiB + 512, + 1 + ) + } + + fun runReadTest(testDevSize: Long, testBlockSize: Int, testPrefetchBlocks: Int) { + val testFile = createTestFile(testDevSize) + + try { + val testDev = createTestBlockDevice(testFile, testBlockSize) + val inputStream = BlockDeviceInputStream(testDev, prefetchBlocks = testPrefetchBlocks) + + // Read first bytes + Assert.assertEquals(0, inputStream.read()) + Assert.assertEquals(1, inputStream.read()) + Assert.assertEquals(2, inputStream.read()) + Assert.assertEquals(3, inputStream.read()) + + // Seek within prefetched buffer + val skipBytes1: Long = 2L * 0xFF - 4 + Assert.assertEquals(skipBytes1, inputStream.skip(skipBytes1)) + + Assert.assertEquals(0, inputStream.read()) + Assert.assertEquals(1, inputStream.read()) + Assert.assertEquals(2, inputStream.read()) + Assert.assertEquals(3, inputStream.read()) + + // Seek outside prefetched buffer + val skipBytes2 = 5L * 0xFF * testPrefetchBlocks - 4 + 100 + Assert.assertEquals(skipBytes2, inputStream.skip(skipBytes2)) + + Assert.assertEquals(100 and 0xFF, inputStream.read()) + Assert.assertEquals(101 and 0xFF, inputStream.read()) + Assert.assertEquals(102 and 0xFF, inputStream.read()) + Assert.assertEquals(103 and 0xFF, inputStream.read()) + + // Mark stream to get back here later + // Implementation ignores readlimit so anything works + inputStream.mark(0) + + // Seek to EOF + val remainingBytes = testDevSize - (4 + skipBytes1 + 4 + skipBytes2 + 4) + Assert.assertEquals(remainingBytes, inputStream.skip(remainingBytes * 20)) + + // Ensure EOF + Assert.assertEquals(-1, inputStream.read()) + + // Seek to last byte (previous byte) + Assert.assertEquals(-1, inputStream.skip(-1)) + Assert.assertEquals((testDevSize - 1).toInt() % 0xFF, inputStream.read()) + + // Go back to marked position + inputStream.reset() + Assert.assertEquals(104 and 0xFF, inputStream.read()) + Assert.assertEquals(105 and 0xFF, inputStream.read()) + Assert.assertEquals(106 and 0xFF, inputStream.read()) + Assert.assertEquals(107 and 0xFF, inputStream.read()) + + } finally { + testFile.delete() + } + } + + companion object { + fun createTestFile(size: Long): File { + val file = File.createTempFile("etchdroid-test-", ".img") + val fileOutputStream = file.outputStream() + + for (i in 0..size) + fileOutputStream.write(i.toInt() % 0xFF) + fileOutputStream.flush() + file.deleteOnExit() + return file + } + + fun createTestBlockDevice(file: File, blockSize: Int): BlockDeviceDriver = + FileBlockDeviceDriver(file, blockSize, 0) + } +} \ No newline at end of file From 4e2f589d0055ea30f7ec138060cc1c6546646f9c Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 24 Dec 2018 20:02:18 +0100 Subject: [PATCH 05/85] Fix bugs found while testing BlockDeviceInputStream --- .../utils/blockdevice/BlockDeviceInputStream.kt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt index a980cd3..a64c0ff 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt @@ -8,6 +8,7 @@ class BlockDeviceInputStream( private val blockDev: BlockDeviceDriver, private val prefetchBlocks: Int = 2048 ) : InputStream() { + private var neverFetched = true private val byteBuffer = ByteBuffer.allocate(blockDev.blockSize * prefetchBlocks) @@ -32,13 +33,19 @@ class BlockDeviceInputStream( if (blockDev.size - currentBlockOffset < prefetchBlocks) byteBuffer.limit( - (currentBlockOffset - blockDev.size).toInt() * blockDev.blockSize + (blockDev.size - currentBlockOffset).toInt() * blockDev.blockSize ) blockDev.read(currentBlockOffset, byteBuffer) + byteBuffer.flip() } private fun fetchNextIfNeeded() { + if (neverFetched) { + fetch() + neverFetched = false + return + } if (byteBuffer.hasRemaining()) return currentBlockOffset++ @@ -87,9 +94,13 @@ class BlockDeviceInputStream( } val newByteOffset = currentByteOffset + actualSkipDistance - currentBlockOffset = newByteOffset / blockDev.blockSize + val newBlockOffset = newByteOffset / blockDev.blockSize + + if (newBlockOffset != currentBlockOffset) { + currentBlockOffset = newBlockOffset + fetch() + } - fetch() byteBuffer.position((newByteOffset - currentBlockOffset * blockDev.blockSize).toInt()) return actualSkipDistance From f10e1b982f0105165ec5a53512b3f7d1edbb5c0e Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 24 Dec 2018 23:58:27 +0100 Subject: [PATCH 06/85] Add test for array read in BlockDeviceInputStream, fix found bugs --- .../blockdevice/BlockDeviceInputStream.kt | 3 +- .../blockdevice/BlockDeviceInputStreamTest.kt | 53 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt index a64c0ff..e78feec 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt @@ -67,7 +67,7 @@ class BlockDeviceInputStream( if (isNextByteAfterEOF()) return -1 - val maxPos = (off + len) % (b.size + 1) + val maxPos = Math.min(off + len, b.size) if (len <= 0 || off > b.size) return 0 @@ -81,6 +81,7 @@ class BlockDeviceInputStream( break b[i] = readByte.toByte() + bytesRead++ } return bytesRead diff --git a/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt b/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt index b748502..3554c66 100644 --- a/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt @@ -87,6 +87,59 @@ class BlockDeviceInputStreamTest { Assert.assertEquals(106 and 0xFF, inputStream.read()) Assert.assertEquals(107 and 0xFF, inputStream.read()) + // Go back to beginning + inputStream.skip(-testDevSize) + + // Read to array + var byteArray = ByteArray(8) + Assert.assertEquals(byteArray.size, inputStream.read(byteArray)) + + Assert.assertArrayEquals( + byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7), + byteArray + ) + + // Read to array with offset + length + byteArray = byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0) + Assert.assertEquals(4, inputStream.read(byteArray, 4, 4)) + Assert.assertArrayEquals( + byteArrayOf(0, 0, 0, 0, 8, 9, 10, 11), + byteArray + ) + + // Read to array with length > array size + Assert.assertEquals(4, inputStream.read(byteArray, 4, 200)) + Assert.assertArrayEquals( + byteArrayOf(0, 0, 0, 0, 12, 13, 14, 15), + byteArray + ) + + // Read to array with offset outside of array + Assert.assertEquals(0, inputStream.read(byteArray, 10, 4)) + + // Go to end of prefetched blocks + inputStream.skip(-testDevSize) + inputStream.skip((testPrefetchBlocks * testBlockSize - 4).toLong()) + + // Read to array, second half needs to be fetched + Assert.assertEquals(byteArray.size, inputStream.read(byteArray)) + + val currentPos = testPrefetchBlocks * testBlockSize - 4 + + Assert.assertArrayEquals( + byteArrayOf( + ((currentPos + 0) % 0xFF).toByte(), + ((currentPos + 1) % 0xFF).toByte(), + ((currentPos + 2) % 0xFF).toByte(), + ((currentPos + 3) % 0xFF).toByte(), + ((currentPos + 4) % 0xFF).toByte(), + ((currentPos + 5) % 0xFF).toByte(), + ((currentPos + 6) % 0xFF).toByte(), + ((currentPos + 7) % 0xFF).toByte() + ), + byteArray + ) + } finally { testFile.delete() } From 2b6c7eb0de2fbc1277fa537620fcc198c1048602 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 25 Dec 2018 02:58:35 +0100 Subject: [PATCH 07/85] Add test for BlockDeviceOutputStream and fix bugs found testing --- .../blockdevice/BlockDeviceOutputStream.kt | 38 ++-- .../BlockDeviceOutputStreamTest.kt | 167 ++++++++++++++++++ 2 files changed, 191 insertions(+), 14 deletions(-) create mode 100644 app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStreamTest.kt diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt index f9f3a69..6f9e2cd 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt @@ -7,7 +7,7 @@ import java.nio.ByteBuffer class BlockDeviceOutputStream( private val blockDev: BlockDeviceDriver, - bufferBlocks: Int = 2048 + private val bufferBlocks: Int = 2048 ) : OutputStream() { private val byteBuffer = ByteBuffer.allocate(blockDev.blockSize * bufferBlocks) @@ -16,15 +16,14 @@ class BlockDeviceOutputStream( private val currentByteOffset: Long get() = currentBlockOffset * blockDev.blockSize + byteBuffer.position() - private val sizeBytes: Long - get() = blockDev.size.toLong() * blockDev.blockSize - private val bytesUntilEOF: Long - get() = blockDev.size.toLong() * blockDev.size - currentByteOffset + get() = blockDev.size.toLong() * blockDev.blockSize - currentByteOffset override fun write(b: Int) { - if (bytesUntilEOF < 1) + if (bytesUntilEOF < 1) { + flush() throw IOException("No space left on device") + } byteBuffer.put(b.toByte()) @@ -37,7 +36,7 @@ class BlockDeviceOutputStream( } override fun write(b: ByteArray, off: Int, len: Int) { - val maxPos = (off + len) % (b.size + 1) + val maxPos = Math.min(off + len, b.size) if (len <= 0 || off > b.size) return @@ -61,12 +60,16 @@ class BlockDeviceOutputStream( blockDev.read(currentBlockOffset + fullBlocks, incompleteBlockBuffer) // Add it to the incomplete block - byteBuffer.limit(fullBlocks * blockDev.blockSize) - byteBuffer.put( - incompleteBlockBuffer.array(), - toWrite, blockDev.blockSize - incompleteBlockFullBytes - ) - byteBuffer.position(0) + byteBuffer.apply { + position(toWrite) + limit((fullBlocks + 1) * blockDev.blockSize) + put( + incompleteBlockBuffer.array(), + incompleteBlockFullBytes, + blockDev.blockSize - incompleteBlockFullBytes + ) + position(0) + } } // Flush to device @@ -80,6 +83,13 @@ class BlockDeviceOutputStream( clear() position(incompleteBlockFullBytes) } - currentBlockOffset += fullBlocks; + + // Ensure the buffer is limited on EOF + if (blockDev.size - currentBlockOffset < bufferBlocks) + byteBuffer.limit( + (blockDev.size - currentBlockOffset).toInt() * blockDev.blockSize + ) + + currentBlockOffset += fullBlocks } } \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStreamTest.kt b/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStreamTest.kt new file mode 100644 index 0000000..0120ed5 --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStreamTest.kt @@ -0,0 +1,167 @@ +package eu.depau.etchdroid.utils.blockdevice + +import com.github.mjdev.libaums.driver.BlockDeviceDriver +import com.github.mjdev.libaums.driver.file.FileBlockDeviceDriver +import org.junit.Assert +import org.junit.Test +import java.io.File +import java.io.IOException +import java.io.RandomAccessFile + +class BlockDeviceOutputStreamTest { + @Test + fun testWithCommonParams() { + runWriteTest( + 10L * 1024 * 1024, // 10 MiB + 512, + 2048 + ) + } + + @Test + fun testWithWeirdBlockSize() { + runWriteTest( + 10L * 666 * 2 * 666 * 2, // 10 MegaDevils + 666, + 2048 + ) + } + + @Test + fun testUnbuffered() { + runWriteTest( + 10L * 1024 * 1024, // 10 MiB + 512, + 1 + ) + } + + fun runWriteTest(testDevSize: Long, testBlockSize: Int, testBufferBlocks: Int) { + val testFile = createTestFile(testDevSize) + + try { + val testDev = createTestBlockDevice(testFile, testBlockSize) + val outputStream = BlockDeviceOutputStream(testDev, bufferBlocks = testBufferBlocks) + + val deviceRandomAccessFile: RandomAccessFile = testDev::class.java + .getDeclaredField("file") + .apply { isAccessible = true } + .get(testDev) as RandomAccessFile + var byteArray: ByteArray + + + // Write some bytes + outputStream.write(0) + outputStream.write(1) + outputStream.write(2) + outputStream.write(3) + outputStream.flush() + deviceRandomAccessFile.fd.sync() + + byteArray = ByteArray(8) + RandomAccessFile(testFile, "r").use { + it.read(byteArray) + } + + Assert.assertArrayEquals( + byteArrayOf( + 0, 1, 2, 3, 0xFA.toByte(), 0xF9.toByte(), 0xF8.toByte(), 0xF7.toByte() + ), + byteArray + ) + + // Fill current block + byteArray = ByteArray(testBlockSize - 4) + outputStream.write(byteArray) + outputStream.flush() + deviceRandomAccessFile.fd.sync() + + byteArray = ByteArray(testBlockSize + 8) + RandomAccessFile(testFile, "r").use { + it.read(byteArray) + } + + Assert.assertArrayEquals( + byteArrayOf( + 0, 1, 2, 3 + ), + byteArray.copyOfRange(0, 4) + ) + Assert.assertArrayEquals( + (4 until testBlockSize).map { 0.toByte() }.toByteArray(), + byteArray.copyOfRange(4, testBlockSize) + ) + Assert.assertArrayEquals( + (testBlockSize until testBlockSize + 8).map { (0xFE - it % 0xFF).toByte() }.toByteArray(), + byteArray.copyOfRange(testBlockSize, testBlockSize + 8) + ) + + // Fill the buffer except for the last 8 bytes + // Note that flush successfully wrote one full block, so the block offset is now 1 + byteArray = ByteArray(testBufferBlocks * testBlockSize - 8) + outputStream.write(byteArray) + + // Now do a write that goes out of the buffer + byteArray = (0 until 16).map { 42.toByte() }.toByteArray() + outputStream.write(byteArray) + outputStream.flush() + deviceRandomAccessFile.fd.sync() + + val fullBufferOffset = (testBufferBlocks + 1) * testBlockSize + + val byteArray1 = ByteArray(20) + RandomAccessFile(testFile, "r").use { + it.seek(fullBufferOffset - 8L) + it.read(byteArray1) + } + + Assert.assertArrayEquals( + byteArray, + byteArray1.copyOfRange(0, 16) + ) + Assert.assertArrayEquals( + (fullBufferOffset + 8 until fullBufferOffset + 12) + .map { (0xFE - it % 0xFF).toByte() } + .toByteArray(), + byteArray1.copyOfRange(16, 20) + ) + + // Go to end of file - 4 bytes + val remainingBytes = testDevSize - (fullBufferOffset + 8) + byteArray = ByteArray(remainingBytes.toInt() - 4) + outputStream.write(byteArray) + + // This should work + byteArray = ByteArray(4) + outputStream.write(byteArray) + + // This should not + try { + outputStream.write(0) + Assert.fail("Did not throw exception on EOF") + } catch (e: IOException) { + Assert.assertEquals("No space left on device", e.message) + } + + } finally { + testFile.delete() + } + } + + companion object { + fun createTestFile(size: Long): File { + val file = File.createTempFile("etchdroid-test-", ".img") + val fileOutputStream = file.outputStream() + + // Writes 0xFE, 0xFD, ..., 0x00 + for (i in 0..size) + fileOutputStream.write(0xFE - i.toInt() % 0xFF) + fileOutputStream.flush() + file.deleteOnExit() + return file + } + + fun createTestBlockDevice(file: File, blockSize: Int): BlockDeviceDriver = + FileBlockDeviceDriver(file, blockSize, 0) + } +} \ No newline at end of file From e987268ad686801523bc3a5a75cd27cf417b8a94 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 25 Dec 2018 03:00:37 +0100 Subject: [PATCH 08/85] Add comments to BlockDeviceInputStream --- .../depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt index e78feec..b24f0bc 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt @@ -31,6 +31,7 @@ class BlockDeviceInputStream( private fun fetch() { byteBuffer.clear() + // Ensure the buffer is limited on EOF if (blockDev.size - currentBlockOffset < prefetchBlocks) byteBuffer.limit( (blockDev.size - currentBlockOffset).toInt() * blockDev.blockSize From f130e3a1d495d8cc8c3a416f9e817a1ecb2a9f2d Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 5 Jan 2019 17:15:16 +0100 Subject: [PATCH 09/85] Backup of work in progress so I can pick it up later --- .../eu/depau/etchdroid/ui/misc/SparseFile.kt | 19 ++ .../etchdroid/utils/imagetypes/DMGImage.kt | 167 +++++++++++------- .../depau/etchdroid/utils/imagetypes/Image.kt | 5 +- .../etchdroid/utils/imagetypes/RawImage.kt | 16 ++ .../utils/streams/AbstractSizedInputStream.kt | 7 + .../streams/AbstractSizedOutputStream.kt | 7 + .../utils/streams/SizedInputStream.kt | 48 +++++ .../utils/streams/SizedOutputStream.kt | 31 ++++ .../etchdroid/worker/AbstractAsyncWorker.kt | 8 + .../worker/AbstractAutoProgressAsyncWorker.kt | 41 +++++ .../worker/AbstractProgressSender.kt | 24 +++ .../eu/depau/etchdroid/worker/IAsyncWorker.kt | 6 + .../etchdroid/worker/IProgressListener.kt | 11 ++ .../depau/etchdroid/worker/IProgressSender.kt | 6 + .../etchdroid/worker/dto/ProgressDoneDTO.kt | 10 ++ .../etchdroid/worker/dto/ProgressStartDTO.kt | 13 ++ .../etchdroid/worker/dto/ProgressUpdateDTO.kt | 13 ++ .../depau/etchdroid/worker/enums/ErrorType.kt | 11 ++ .../etchdroid/worker/enums/OperationType.kt | 9 + .../depau/etchdroid/worker/enums/RateUnit.kt | 6 + .../depau/etchdroid/worker/enums/StepType.kt | 8 + .../Dmg2OutputStreamConvertAsyncService.kt | 6 + .../impl/Input2OutputStreamCopyAsyncWorker.kt | 30 ++++ build.gradle | 1 + 24 files changed, 439 insertions(+), 64 deletions(-) create mode 100644 app/src/main/java/eu/depau/etchdroid/ui/misc/SparseFile.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/imagetypes/RawImage.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/streams/AbstractSizedInputStream.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/streams/AbstractSizedOutputStream.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/streams/SizedInputStream.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/streams/SizedOutputStream.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/AbstractAsyncWorker.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/AbstractAutoProgressAsyncWorker.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/AbstractProgressSender.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/IProgressListener.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/IProgressSender.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/enums/ErrorType.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/enums/OperationType.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/enums/RateUnit.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/enums/StepType.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt diff --git a/app/src/main/java/eu/depau/etchdroid/ui/misc/SparseFile.kt b/app/src/main/java/eu/depau/etchdroid/ui/misc/SparseFile.kt new file mode 100644 index 0000000..cf87063 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/ui/misc/SparseFile.kt @@ -0,0 +1,19 @@ +package eu.depau.etchdroid.ui.misc + +import java.io.File +import java.io.FileDescriptor +import java.io.RandomAccessFile + +class SparseFile : RandomAccessFile { + constructor(file: File, mode: String) : super(file, mode) + constructor(path: String, mode: String) : super(path, mode) + + fun lseek(fd: FileDescriptor, offset: Long, whence: Int): Long { + val libcore = Class.forName("libcore.io.Libcore") + val os = libcore.getField("os").get(null) + val lseek = os.javaClass.getMethod( + "lseek", FileDescriptor::class.java, Long::class.java, Int::class.java + ) + return lseek.invoke(null, fd, offset, whence) as Long + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt index 8c73f0a..8780b07 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt @@ -2,78 +2,21 @@ package eu.depau.etchdroid.utils.imagetypes import android.content.Context import android.net.Uri +import eu.depau.etchdroid.utils.Partition +import eu.depau.etchdroid.utils.PartitionBuilder import eu.depau.etchdroid.utils.enums.FilesystemType import eu.depau.etchdroid.utils.enums.PartitionTableType import eu.depau.etchdroid.utils.ktexts.getBinary import eu.depau.etchdroid.utils.ktexts.readString -import eu.depau.etchdroid.utils.Partition -import eu.depau.etchdroid.utils.PartitionBuilder +import eu.depau.etchdroid.utils.streams.AbstractSizedInputStream +import eu.depau.etchdroid.utils.streams.SizedInputStream import java.io.File val SECTOR_SIZE = 512 private val partRegex = Regex("partition (\\d+): begin=(\\d+), size=(\\d+), decoded=(\\d+), firstsector=(\\d+), sectorcount=(\\d+), blocksruncount=(\\d+)\\s+(.*) \\((.+) : \\d+\\)", RegexOption.MULTILINE) - -private fun readPartitionTable(dmg2img: File, libDir: String, file: File): Triple?, Long?> { - val pt = ArrayList() - var ptType: PartitionTableType? = null - var imgSize = 0L - - val pb = ProcessBuilder(dmg2img.path, "-v", "-l", file.path) - pb.environment()["LD_LIBRARY_PATH"] = libDir - pb.redirectErrorStream(true) - - val p = pb.start() - val out = p.inputStream.readString() - System.err.println(out) - p.waitFor() - val matches = partRegex.findAll(out) - - matchloop@ for (m in matches) { - val ( - number, begin, size, - decoded, firstsector, - sectorcount, blocksruncount, - label, type - ) = m.destructured - - val pb = PartitionBuilder() - - pb.number = number.toInt() - pb.size = SECTOR_SIZE * sectorcount.toLong() - imgSize += pb.size!! - - if (label.isNotEmpty()) - pb.fsLabel = label - - pb.partLabel = type - - when (type) { - "Apple_partition_map" -> { - ptType = PartitionTableType.MAC - } - "MBR" -> { - ptType = PartitionTableType.MSDOS - continue@matchloop - } - } - - pb.fsType = when { - type == "Apple_Empty" || type == "Apple_Scratch" || type == "Apple_Free" -> FilesystemType.FREE - type == "Apple_HFS" -> FilesystemType.HFSPLUS - type == "Apple_HFSX" -> FilesystemType.HFSPLUS - type == "Windows_FAT_32" -> FilesystemType.FAT32 - type.startsWith("Apple_") || type == "DDM" -> FilesystemType.APT_DATA - else -> FilesystemType.UNKNOWN - } - - pt.add(pb.build()) - } - - return Triple(ptType, pt, imgSize) -} +private val partitionListRegex = Regex("\\s*partition (\\d+): begin=(\\d+), size=(\\d+), decoded=(\\d+), firstsector=(\\d+), sectorcount=(\\d+), blocksruncount=(\\d+)\\s*") class DMGImage(private val uri: Uri, private val context: Context) : Image { - private val dmg2img: File = context.getBinary("dmg2img") private val libDir: String = context.applicationInfo.nativeLibraryDir private var loaded: Boolean = false private var partTable: List? = null @@ -83,7 +26,7 @@ class DMGImage(private val uri: Uri, private val context: Context) : Image { private fun readInfo() { if (loaded) return - val triple = readPartitionTable(dmg2img, libDir, File(uri.path)) + val triple = readPartitionTable(context, libDir, File(uri.path)) loaded = true partTableType = triple.first partTable = triple.second @@ -109,4 +52,102 @@ class DMGImage(private val uri: Uri, private val context: Context) : Image { return imgSize } + override val inputStream: AbstractSizedInputStream + get() = getRawImageInputStream(context, uri) + + companion object { + private fun getDmg2ImgProcessBuilder(context: Context, vararg args: String): ProcessBuilder = + ProcessBuilder(context.getBinary("dmg2img").path, *args) + .apply { + environment()["LD_LIBRARY_PATH"] = context.applicationInfo.nativeLibraryDir + } + + private fun readPartitionTable(context: Context, libDir: String, file: File): Triple?, Long?> { + val pt = ArrayList() + var ptType: PartitionTableType? = null + var imgSize = 0L + + val pb = getDmg2ImgProcessBuilder(context, "-v", "-l", file.path) + pb.redirectErrorStream(true) + + val p = pb.start() + val out = p.inputStream.readString() + System.err.println(out) + p.waitFor() + val matches = partRegex.findAll(out) + + matchloop@ for (m in matches) { + val ( + number, begin, size, + decoded, firstsector, + sectorcount, blocksruncount, + label, type + ) = m.destructured + + val pb = PartitionBuilder() + + pb.number = number.toInt() + pb.size = SECTOR_SIZE * sectorcount.toLong() + imgSize += pb.size!! + + if (label.isNotEmpty()) + pb.fsLabel = label + + pb.partLabel = type + + when (type) { + "Apple_partition_map" -> { + ptType = PartitionTableType.MAC + } + "MBR" -> { + ptType = PartitionTableType.MSDOS + continue@matchloop + } + } + + pb.fsType = when { + type == "Apple_Empty" || type == "Apple_Scratch" || type == "Apple_Free" -> FilesystemType.FREE + type == "Apple_HFS" -> FilesystemType.HFSPLUS + type == "Apple_HFSX" -> FilesystemType.HFSPLUS + type == "Windows_FAT_32" -> FilesystemType.FAT32 + type.startsWith("Apple_") || type == "DDM" -> FilesystemType.APT_DATA + else -> FilesystemType.UNKNOWN + } + + pt.add(pb.build()) + } + + return Triple(ptType, pt, imgSize) + } + + fun getRawImageInputStream( + context: Context, + uri: Uri, + sectorSize: Int = 512 + ): AbstractSizedInputStream { + val pb = getDmg2ImgProcessBuilder(context, "-v", uri.path!!, "-") + val process = pb.start() + val errReader = process.errorStream.bufferedReader() + + // Read blocksruncount + var matched = false + var lastSector = 0L + + while (true) { + val line = errReader.readLine() ?: break + val match = partitionListRegex.find(line) ?: if (matched) break else continue + matched = true + + val (begin, size, decoded, firstsector, sectorcount, blocksruncount) = match.destructured + + val partLastSector = firstsector.toLong() + sectorcount.toLong() + if (partLastSector > lastSector) + lastSector = partLastSector + } + + val bytesTotal = lastSector * sectorSize + return SizedInputStream(bytesTotal, process.inputStream) + } + } + } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt index 93722f9..0237d4a 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt @@ -1,10 +1,13 @@ package eu.depau.etchdroid.utils.imagetypes -import eu.depau.etchdroid.utils.enums.PartitionTableType +import android.content.Context import eu.depau.etchdroid.utils.Partition +import eu.depau.etchdroid.utils.enums.PartitionTableType +import eu.depau.etchdroid.utils.streams.AbstractSizedInputStream interface Image { val partitionTable: List? val tableType: PartitionTableType? val size: Long? + val inputStream: AbstractSizedInputStream } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/RawImage.kt b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/RawImage.kt new file mode 100644 index 0000000..4ee0334 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/RawImage.kt @@ -0,0 +1,16 @@ +package eu.depau.etchdroid.utils.imagetypes + +import eu.depau.etchdroid.utils.Partition +import eu.depau.etchdroid.utils.enums.PartitionTableType +import eu.depau.etchdroid.utils.streams.AbstractSizedInputStream + +class RawImage: Image { + override val partitionTable: List? + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. + override val tableType: PartitionTableType? + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. + override val size: Long? + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. + override val inputStream: AbstractSizedInputStream + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/streams/AbstractSizedInputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/streams/AbstractSizedInputStream.kt new file mode 100644 index 0000000..4ff1f25 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/streams/AbstractSizedInputStream.kt @@ -0,0 +1,7 @@ +package eu.depau.etchdroid.utils.streams + +import java.io.InputStream + +abstract class AbstractSizedInputStream: InputStream() { + abstract val size: Long +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/streams/AbstractSizedOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/streams/AbstractSizedOutputStream.kt new file mode 100644 index 0000000..2b33e74 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/streams/AbstractSizedOutputStream.kt @@ -0,0 +1,7 @@ +package eu.depau.etchdroid.utils.streams + +import java.io.OutputStream + +abstract class AbstractSizedOutputStream: OutputStream() { + abstract val size: Long +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/streams/SizedInputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/streams/SizedInputStream.kt new file mode 100644 index 0000000..f524d82 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/streams/SizedInputStream.kt @@ -0,0 +1,48 @@ +package eu.depau.etchdroid.utils.streams + +import java.io.InputStream + +/** + * This class simply wraps an existing InputStream adding some provided size field. + */ +class SizedInputStream( + override val size: Long, + private val inputStream: InputStream +) : AbstractSizedInputStream() { + + override fun skip(n: Long): Long { + return inputStream.skip(n) + } + + override fun available(): Int { + return inputStream.available() + } + + override fun reset() { + inputStream.reset() + } + + override fun close() { + inputStream.close() + } + + override fun mark(readlimit: Int) { + inputStream.mark(readlimit) + } + + override fun markSupported(): Boolean { + return inputStream.markSupported() + } + + override fun read(): Int { + return inputStream.read() + } + + override fun read(b: ByteArray?): Int { + return inputStream.read(b) + } + + override fun read(b: ByteArray?, off: Int, len: Int): Int { + return inputStream.read(b, off, len) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/streams/SizedOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/streams/SizedOutputStream.kt new file mode 100644 index 0000000..9e73ce7 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/streams/SizedOutputStream.kt @@ -0,0 +1,31 @@ +package eu.depau.etchdroid.utils.streams + +import java.io.OutputStream + +/** + * This class simply wraps an existing OutputStream adding some provided size field. + */ +class SizedOutputStream( + override val size: Long, + private val outputStream: OutputStream +) : AbstractSizedOutputStream() { + override fun write(b: Int) { + outputStream.write(b) + } + + override fun write(b: ByteArray?) { + outputStream.write(b) + } + + override fun write(b: ByteArray?, off: Int, len: Int) { + outputStream.write(b, off, len) + } + + override fun flush() { + outputStream.flush() + } + + override fun close() { + outputStream.close() + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/AbstractAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/AbstractAsyncWorker.kt new file mode 100644 index 0000000..f53c935 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/AbstractAsyncWorker.kt @@ -0,0 +1,8 @@ +package eu.depau.etchdroid.worker + +abstract class AbstractAsyncWorker : IAsyncWorker, AbstractProgressSender() { + override suspend fun run() { + while (runStep()) { + } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/AbstractAutoProgressAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/AbstractAutoProgressAsyncWorker.kt new file mode 100644 index 0000000..fd1b2a8 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/AbstractAutoProgressAsyncWorker.kt @@ -0,0 +1,41 @@ +package eu.depau.etchdroid.worker + +import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO + +const val UPDATE_INTERVAL = 500 + +abstract class AbstractAutoProgressAsyncWorker(private val totalToDo: Long) : AbstractAsyncWorker() { + abstract val progressUpdateDTO: ProgressUpdateDTO + + private var doneAccumulator = 0L + private var doneSinceLastUpdate = 0L + private var lastUpdateTime = 0L + + fun progressUpdate(lastDone: Long) { + val currentTime = System.currentTimeMillis() + + if (lastUpdateTime == 0L) + lastUpdateTime = currentTime + + doneSinceLastUpdate += lastDone + doneAccumulator += lastDone + + if (currentTime > lastUpdateTime + UPDATE_INTERVAL) { + val progress = doneAccumulator.toDouble() / totalToDo + val speedUnitPerMillis = doneSinceLastUpdate.toDouble() / (currentTime - lastUpdateTime) + val timeRemainingMillis: Long = ((totalToDo - doneAccumulator) / speedUnitPerMillis).toLong() + + val dto = progressUpdateDTO.copy( + operationProgress = progress, + stepProgress = progress, + timeRemaining = timeRemainingMillis, + currentRate = speedUnitPerMillis * 1000 + ) + + notifyProgress(dto) + + doneSinceLastUpdate = 0 + lastUpdateTime = currentTime + } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/AbstractProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/worker/AbstractProgressSender.kt new file mode 100644 index 0000000..0174ff8 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/AbstractProgressSender.kt @@ -0,0 +1,24 @@ +package eu.depau.etchdroid.worker + +import eu.depau.etchdroid.worker.dto.ProgressDoneDTO +import eu.depau.etchdroid.worker.dto.ProgressStartDTO +import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO + +abstract class AbstractProgressSender : IProgressSender { + private val listeners = ArrayList() + + override fun attachProgressListener(listener: IProgressListener) = + listeners.add(listener) + + override fun detachProgressListener(listener: IProgressListener) = + listeners.remove(listener) + + protected fun notifyStart(dto: ProgressStartDTO) = + listeners.forEach { it.notifyStart(dto) } + + protected fun notifyProgress(dto: ProgressUpdateDTO) = + listeners.forEach { it.notifyProgress(dto) } + + protected fun notifyDone(dto: ProgressDoneDTO) = + listeners.forEach { it.notifyDone(dto) } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt new file mode 100644 index 0000000..33a89ea --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt @@ -0,0 +1,6 @@ +package eu.depau.etchdroid.worker + +interface IAsyncWorker: IProgressSender { + suspend fun run() + suspend fun runStep(): Boolean +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/IProgressListener.kt b/app/src/main/java/eu/depau/etchdroid/worker/IProgressListener.kt new file mode 100644 index 0000000..2682cef --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/IProgressListener.kt @@ -0,0 +1,11 @@ +package eu.depau.etchdroid.worker + +import eu.depau.etchdroid.worker.dto.ProgressDoneDTO +import eu.depau.etchdroid.worker.dto.ProgressStartDTO +import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO + +interface IProgressListener { + fun notifyStart(dto: ProgressStartDTO) + fun notifyProgress(dto: ProgressUpdateDTO) + fun notifyDone(dto: ProgressDoneDTO) +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/IProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/worker/IProgressSender.kt new file mode 100644 index 0000000..2a9bf4b --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/IProgressSender.kt @@ -0,0 +1,6 @@ +package eu.depau.etchdroid.worker + +interface IProgressSender { + fun attachProgressListener(listener: IProgressListener): Boolean + fun detachProgressListener(listener: IProgressListener): Boolean +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt new file mode 100644 index 0000000..58df979 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt @@ -0,0 +1,10 @@ +package eu.depau.etchdroid.worker.dto + +import android.os.Parcelable +import eu.depau.etchdroid.worker.enums.ErrorType + +data class ProgressDoneDTO( + val operationId: Int, + val error: ErrorType?, + val errorData: Parcelable? +) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt new file mode 100644 index 0000000..2b39041 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt @@ -0,0 +1,13 @@ +package eu.depau.etchdroid.worker.dto + +import eu.depau.etchdroid.worker.enums.OperationType +import eu.depau.etchdroid.worker.enums.StepType +import java.util.* + +data class ProgressStartDTO( + val operationId: Int, + val operationType: OperationType, + val inputName: String, + val outputName: String, + val steps: List> +) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt new file mode 100644 index 0000000..db7a9ac --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt @@ -0,0 +1,13 @@ +package eu.depau.etchdroid.worker.dto + +import eu.depau.etchdroid.worker.enums.RateUnit + +data class ProgressUpdateDTO( + val operationId: Int, + val currentStep: Int, + val operationProgress: Double, + val stepProgress: Double?, + val timeRemaining: Long?, + val currentRate: Double?, + val rateUnit: RateUnit? +) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/ErrorType.kt b/app/src/main/java/eu/depau/etchdroid/worker/enums/ErrorType.kt new file mode 100644 index 0000000..06604b1 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/enums/ErrorType.kt @@ -0,0 +1,11 @@ +package eu.depau.etchdroid.worker.enums + +enum class ErrorType { + UNPLUGGED, + INPUT_FORMAT_ERROR, + ENOSPC_ON_USB, + ENOSPC_ON_DEVICE, + PERMISSION_DENIED_ANDROID, + PERMISSION_DENIED_FS, + PERMISSION_DENIED_USB +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/OperationType.kt b/app/src/main/java/eu/depau/etchdroid/worker/enums/OperationType.kt new file mode 100644 index 0000000..4808c6e --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/enums/OperationType.kt @@ -0,0 +1,9 @@ +package eu.depau.etchdroid.worker.enums + +enum class OperationType { + FLASH_RAW_IMAGE, + FLASH_DMG, + FLASH_ELTORITO, + DUMP_RAW_IMAGE, + CREATE_WINDOWS_INSTALLER +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/RateUnit.kt b/app/src/main/java/eu/depau/etchdroid/worker/enums/RateUnit.kt new file mode 100644 index 0000000..54f9ce3 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/enums/RateUnit.kt @@ -0,0 +1,6 @@ +package eu.depau.etchdroid.worker.enums + +enum class RateUnit { + BYTES_PER_SECOND, + FURLONGS_PER_FORTNIGHT +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/StepType.kt b/app/src/main/java/eu/depau/etchdroid/worker/enums/StepType.kt new file mode 100644 index 0000000..8a4af00 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/enums/StepType.kt @@ -0,0 +1,8 @@ +package eu.depau.etchdroid.worker.enums + +enum class StepType { + STREAM_COPY, + FORMAT_DRIVE, + COPY_FILES, + INSTALL_BOOTLOADER +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt b/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt new file mode 100644 index 0000000..8387b8b --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt @@ -0,0 +1,6 @@ +package eu.depau.etchdroid.worker.impl + +import eu.depau.etchdroid.worker.AbstractAutoProgressAsyncWorker + +class Dmg2OutputStreamConvertAsyncService: AbstractAutoProgressAsyncWorker() { +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt new file mode 100644 index 0000000..2eee691 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt @@ -0,0 +1,30 @@ +package eu.depau.etchdroid.worker.impl + +import eu.depau.etchdroid.worker.AbstractAutoProgressAsyncWorker +import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO +import java.io.InputStream +import java.io.OutputStream + + +open class Input2OutputStreamCopyAsyncWorker( + private val source: InputStream, + private val dest: OutputStream, + chunkSize: Int, + override val progressUpdateDTO: ProgressUpdateDTO, + size: Long +) : AbstractAutoProgressAsyncWorker(size) { + + private val buffer = ByteArray(chunkSize) + + override suspend fun runStep(): Boolean { + val readBytes = source.read(buffer) + + if (readBytes < 0) + return false + + dest.write(buffer, 0, readBytes) + progressUpdate(readBytes.toLong()) + + return true + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index a1c567b..62c71dc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.kotlin_version = '1.0.0' ext.kotlin_version = '1.3.11' repositories { jcenter() From c85196baf001b23cdaf5b2c5411bc2eb291302d7 Mon Sep 17 00:00:00 2001 From: fyr77 Date: Wed, 9 Jan 2019 19:28:38 +0100 Subject: [PATCH 10/85] add german translation --- app/src/main/res/values-de-night/strings.xml | 4 + app/src/main/res/values-de/strings.xml | 156 +++++++++++++++++++ 2 files changed, 160 insertions(+) create mode 100644 app/src/main/res/values-de-night/strings.xml create mode 100644 app/src/main/res/values-de/strings.xml diff --git a/app/src/main/res/values-de-night/strings.xml b/app/src/main/res/values-de-night/strings.xml new file mode 100644 index 0000000..f214e33 --- /dev/null +++ b/app/src/main/res/values-de-night/strings.xml @@ -0,0 +1,4 @@ + + + Nachtmodus deaktivieren + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml new file mode 100644 index 0000000..0d8031d --- /dev/null +++ b/app/src/main/res/values-de/strings.xml @@ -0,0 +1,156 @@ + + EtchDroid + Abbild direkt auf Datenträger schreiben (mithilfe der Android API) + macOS DMG Abbild auf Datenträger wiederherstellen (mithilfe der Android API) + Flash im Unetbootin-Stil (nur MBR, benötigt root) + Windows Abbild schreiben (mithilfe von WoeUSB, benötigt root) + Aktualisieren + Zugriff verweigert für + Zugriff auf USB-Gerät verweigert + Ausgewähltes Abbild: + Ausgewählte Schreibmethode: + Ausgewähltes USB-Gerät: + Unbekannter Dateiname + Abbild ist größer als USB-Gerät, kann daher nicht geschrieben werden + Kann USB-Gerät nicht lesen + Tippen, um Abbild auf USB-Datenträger zu schreiben + USB Schreibstatus + Zeigt den Status der Abbilder an, die auf USB-Datenträger geschreiben werden + Initialisierung… + Schreibt Abbild… + Ausgewähltes Abbild ist kein DMG Abbild (vielleicht ist es beschädigt) + IBM AIX + AMIGA + BSD + DVH + GUID Partition Table (GPT) + Keiner + Apple Partition Table (APT) + Master Boot Record (MSDOS) + PC98 + Sun + FAT12 + FAT16 + FAT32 + ExFAT + NTFS + ReFS + macOS HFS + macOS HFS+ + Apple Filesystem (APFS) + APT data + ISO 9660 + Linux Ext2 + Linux Ext3 + Linux Ext4 + Btrfs + f2fs + LUKS verschlüsselt + Linux swap + Linux LVM2 physischer Datenträger + UFS + XFS + ZFS + Freier Platz + Unformatiert + Unbekannt + Name + Beschriftung + Typ + Größe + GNU GPLv3 + Diese app + Apache 2.0 + Userspace USB Block Gerät Implementation + GNU GPLv2 + Custom BSD-like + Custom + Über + Kovertiert komprimierte Apple® DMG Abbilder + USB-Gerät auswählen + Bereit zum Schreiben + Abbild kann nicht auf USB-Datenträger geschrieben werden + Für Fortschritt Benachrichtigung überprüfen + Partitionstabelle: + Auf das USB-Gerät kann nicht zugegriffen werden. Vielleicht wurde die App bereits ausgeführt und ist abgestürzt? USB-Datenträger entfernen und erneut anschließen, danach die App neu starten. + Raw-Abbild oder ISO + Gut für GNU/Linux distro ISOs, Raspberry Pi Abbilder und Datenträgerabbilder, die auf Windows oder Linux erstellt wurden. + Apple® DMG Abbilder schreiben + Abbild wiederherstellen, welches mit dem macOS Festplattendienstprogramm erstellt wurde + Keine USB-Datenträger erkannt.\nEs ist anzumerken, dass für SD-Karten ein SD zu USB Adapter benötigt wird. + Nicht erneut anzeigen + Hier seien Drachen + Ich verstehe + In den meisten Fällen können DMG Abbilder gut wiederhergestellt werden, aber manchmal könnten Probleme auftreten. Dies ist eine Warnung. + Abbild flashen + Wenn du fortfährst, wird das ausgewählte Abbild geschrieben und alle Daten auf dem USB-Datenträger gehen für immer verloren. + Warnung + Abbrechen + MPL-2.0 + DMG Dateiwähler + Zeigt das Ergebnis einer fertigen Schreiboperation an + USB Schreibergebnis Benachrichtigungen + Schreiben fehlgeschlagen • Tippen für Info + Schreiben abgeschlossen + %1$s wurde möglicherweise beim Schreiben ausgesteckt. + %1$s wurde erfolgreich auf %2$s geschrieben + Informationen zur Fehlerbehebung + Die Operation konnte nicht fertiggestellt werden, da der folgende Fehler aufgetreten ist: + Dies ist ein häufiger Fehler. Er passiert normalerweise, wenn der USB-Datenträger während des Schreibens entfernt wird, oder wenn er mit einem USB-Hub verbunden ist. Auf manchen Geräten existiert möglicherweise ein Bug im USB-Subsystem von Android: ein Neustart des Geräts sollte es für einige Zeit beheben. \n\nVersuche folgendes:\n• USB-Gerät ausstecken und wieder anstecken, dann die App neu starten\n• Gerät neu starten (ernsthaft, versuche es)\n• Anderes USB-Gerät ausprobieren\n• Unnötige Adapter und Hubs vermeiden\n• Vermeide, dein Smart-Gerät während des Schreibens zu benutzen\n• Defekte USB-Adapter austauschen\n\nWenn das Problem weiterhin auftaucht, reiche bitte ein Issue auf GitHub ein. + Probleme melden + Probleme können auf Github gemeldet werden:\nhttps://github.com/Depau/EtchDroid/issues + Schreiben fehlgeschlagen + Unbekannter Fehler. Versuche, den USB-Datenträger erneut anzuschließen oder starte das Gerät neu. Bitte reiche ein Issue auf GitHub ein. + (unkomprimiert) + Nachtmodus aktivieren + Android Pie Bug + Es gibt einen Fehler in Android 9, welcher manchmal Schreibfehler verursacht.\nWenn \"Schreiben fehlgeschlagen\" gemeldet wird, starte das Gerät neu und versuche es nochmal. + Alle Warnungen zurücksetzen + Alle Warnungen und Dialoge wiederhergestellt + Dateityp nicht unterstützt + Datei kann im internen Speicher nicht gefunden werden. Versuche es innerhalb der App zu öffnen. + Speicherberechtigung ist notwendig, um DMG Abbilder zu lesen. + + + + + AOSP + https://developer.android.com + AndroidX Jetpack + AndroidX is a major improvement to the original Android Support Library and provides backwards-compatibility across Android releases + https://developer.android.com/jetpack/androidx/ + 1.0.1 + true + https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/ + apache_2_0 + + + + + JetBrains + https://kotlinlang.org/ + Kotlin Standard Library + The Kotlin Standard Library provides living essentials for everyday work with Kotlin + https://kotlinlang.org/api/latest/jvm/stdlib/index.html + 1.2.71 + true + https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib + apache_2_0 + + + + + Google + https://material.io/develop/ + Material Components + Make beautiful products, faster. Material is a design system – backed by open-source code – that helps teams build digital experiences + https://material.io/develop/android/ + 1.1.0-alpha01 + true + https://github.com/material-components/material-components-android + apache_2_0 + + Eine Anwendung, um Systemabbilder auf USB-Datenträger zu schreiben, auf Android und ohne Root-Pflicht. + Kaufe mir einen Kaffee + + From 41d7f10ba77fda65fb80a07ca40b167b42fde40e Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 10 Jan 2019 12:05:52 +0100 Subject: [PATCH 11/85] Credit @fyr77 in About activity for German translation --- app/src/main/res/xml/about.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml index 518fa92..7d2bc6e 100644 --- a/app/src/main/res/xml/about.xml +++ b/app/src/main/res/xml/about.xml @@ -129,5 +129,10 @@ avatar="https://avatars1.githubusercontent.com/u/21688873" locales="tr" login="Exodus1831" /> + - \ No newline at end of file + From b0514c115dd9ad451b9328639ad593e2a22b0898 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 7 Feb 2019 19:47:22 +0100 Subject: [PATCH 12/85] Update Gradle and libraries --- app/build.gradle | 8 ++++---- build.gradle | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 044dfdf..5cfefd9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,11 +33,11 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' - implementation 'com.google.android.material:material:1.1.0-alpha02' - implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' + implementation 'com.google.android.material:material:1.1.0-alpha03' + implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha02' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.core:core:1.1.0-alpha03' + implementation 'androidx.core:core:1.1.0-alpha04' implementation 'androidx.fragment:fragment:1.1.0-alpha03' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha01' api 'com.google.guava:guava:27.0.1-android' diff --git a/build.gradle b/build.gradle index 62c71dc..4f2ea5c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.0.0' - ext.kotlin_version = '1.3.11' + ext.kotlin_version = '1.3.20' repositories { jcenter() google() maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // For libaums From e544d7409dc9e1c16e70fa117a40498aa24e8731 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 7 Feb 2019 19:51:05 +0100 Subject: [PATCH 13/85] Move all strings to main file, use references in strings-night --- app/src/main/res/values-de-night/strings.xml | 4 ---- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-it-night/strings.xml | 4 ---- app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-night/strings.xml | 2 +- app/src/main/res/values-tr-night/strings.xml | 4 ---- app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 8 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 app/src/main/res/values-de-night/strings.xml delete mode 100644 app/src/main/res/values-it-night/strings.xml delete mode 100644 app/src/main/res/values-tr-night/strings.xml diff --git a/app/src/main/res/values-de-night/strings.xml b/app/src/main/res/values-de-night/strings.xml deleted file mode 100644 index f214e33..0000000 --- a/app/src/main/res/values-de-night/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Nachtmodus deaktivieren - \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0d8031d..0f441dc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -103,6 +103,7 @@ Unbekannter Fehler. Versuche, den USB-Datenträger erneut anzuschließen oder starte das Gerät neu. Bitte reiche ein Issue auf GitHub ein. (unkomprimiert) Nachtmodus aktivieren + Nachtmodus deaktivieren Android Pie Bug Es gibt einen Fehler in Android 9, welcher manchmal Schreibfehler verursacht.\nWenn \"Schreiben fehlgeschlagen\" gemeldet wird, starte das Gerät neu und versuche es nochmal. Alle Warnungen zurücksetzen diff --git a/app/src/main/res/values-it-night/strings.xml b/app/src/main/res/values-it-night/strings.xml deleted file mode 100644 index 75780d5..0000000 --- a/app/src/main/res/values-it-night/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Disattiva modalità notturna - \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6e23546..f8567da 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -104,6 +104,7 @@ Errore sconosciuto. Prova a ricollegare il dispositivo USB o a riavviare il dispositivo. Per favore, segnala il problema su GitHub. (decompresso) Attiva modalità notturna + Disattiva modalità notturna Bug di Android Pie A causa di un bug di Android 9, alcune scritture potrebbero fallire.\nSe appare un messaggio di errore \"Scrittura fallita\", riavvia il dispositivo e prova di nuovo. Reimposta tutti gli avvisi diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml index d51af1c..8f56e6c 100644 --- a/app/src/main/res/values-night/strings.xml +++ b/app/src/main/res/values-night/strings.xml @@ -1,4 +1,4 @@ - Disable night mode + @string/nightmode_night \ No newline at end of file diff --git a/app/src/main/res/values-tr-night/strings.xml b/app/src/main/res/values-tr-night/strings.xml deleted file mode 100644 index b4583bf..0000000 --- a/app/src/main/res/values-tr-night/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Gece modunu devre dışı bırak - \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 67c1428..4aacb5e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -103,6 +103,7 @@ Bilinmeyen hata. USB aygıtınızı çıkarıp tekrar takın veya cihazınızı yeniden başlatın. Lütfen GitHub üzerinden bir sorun bildirimi oluşturun. (sıkıştırılmamış) Gece modunu etkinleştir + Gece modunu devre dışı bırak Android Pie hatası Android 9 ile yazılırken hata almanıza sebep olan bir seoun yaşıyoruz.\nEğer yazma başarısız oluyorsa cihazınızı yeniden başlatın ve tekrar deneyin. Tüm uyarıları sıfırla diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b3162ca..e6232ba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -103,6 +103,7 @@ Unknown error. Try to reattach the USB drive or reboot the device. Please file an issue on GitHub. (uncompressed) Enable night mode + Disable night mode Android Pie bug There is a bug on Android 9 which causes some writes to fail.\nIf it says \"Write failed\", reboot your device and try again. Reset all warnings From e9a0abac3e50e8f26bb482def2b5820f1fff5d5b Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 17 Feb 2019 23:16:35 +0100 Subject: [PATCH 14/85] Mark not translatable strings as such --- app/src/main/res/values/strings.xml | 104 ++++++++++++++-------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6232ba..1bc6e69 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,38 +19,38 @@ Initializing… Writing image… Selected image is not a DMG image (maybe it\'s corrupted) - IBM AIX - AMIGA - BSD - DVH + IBM AIX + AMIGA + BSD + DVH GUID Partition Table (GPT) None Apple Partition Table (APT) - Master Boot Record (MSDOS) - PC98 - Sun - FAT12 - FAT16 - FAT32 - ExFAT - NTFS - ReFS - macOS HFS - macOS HFS+ - Apple Filesystem (APFS) + Master Boot Record (MSDOS) + PC98 + Sun + FAT12 + FAT16 + FAT32 + ExFAT + NTFS + ReFS + macOS HFS + macOS HFS+ + Apple Filesystem (APFS) APT data - ISO 9660 - Linux Ext2 - Linux Ext3 - Linux Ext4 - Btrfs - f2fs + ISO 9660 + Linux Ext2 + Linux Ext3 + Linux Ext4 + Btrfs + f2fs LUKS encrypted Linux swap Linux LVM2 physical volume - UFS - XFS - ZFS + UFS + XFS + ZFS Free space Unformatted Unknown @@ -58,13 +58,13 @@ Label Type Size - GNU GPLv3 + GNU GPLv3 This app - Apache 2.0 + Apache 2.0 Userspace USB block device implementation - GNU GPLv2 - Custom BSD-like - Custom + GNU GPLv2 + Custom BSD-like + Custom About Converts compressed Apple® DMG images Select USB drive @@ -86,7 +86,7 @@ If you continue, the selected image will be written and all data stored on the USB drive will be lost forever. Warning Cancel - MPL-2.0 + MPL-2.0 DMG file selector Used to display the result of a finished write operation USB write result notifications @@ -119,37 +119,37 @@ https://developer.android.com AndroidX Jetpack AndroidX is a major improvement to the original Android Support Library and provides backwards-compatibility across Android releases - https://developer.android.com/jetpack/androidx/ - 1.0.1 - true - https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/ + https://developer.android.com/jetpack/androidx/ + 1.0.1 + true + https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/ apache_2_0 - - JetBrains - https://kotlinlang.org/ + + JetBrains + https://kotlinlang.org/ Kotlin Standard Library The Kotlin Standard Library provides living essentials for everyday work with Kotlin - https://kotlinlang.org/api/latest/jvm/stdlib/index.html - 1.2.71 - true - https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib - apache_2_0 + https://kotlinlang.org/api/latest/jvm/stdlib/index.html + 1.2.71 + true + https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib + apache_2_0 - - Google - https://material.io/develop/ - Material Components + + Google + https://material.io/develop/ + Material Components Make beautiful products, faster. Material is a design system – backed by open-source code – that helps teams build digital experiences - https://material.io/develop/android/ - 1.1.0-alpha01 - true - https://github.com/material-components/material-components-android - apache_2_0 + https://material.io/develop/android/ + 1.1.0-alpha01 + true + https://github.com/material-components/material-components-android + apache_2_0 An application to write OS images to USB drives, on Android, no root required. Buy me a coffee From 714aa897054f268c444261223f810de191202d7a Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 15 Jul 2019 06:41:21 +0200 Subject: [PATCH 15/85] Update LibreSSL to v2.9.2 --- dmg2img/src/c/libressl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmg2img/src/c/libressl b/dmg2img/src/c/libressl index 8c7e77f..78f4c17 160000 --- a/dmg2img/src/c/libressl +++ b/dmg2img/src/c/libressl @@ -1 +1 @@ -Subproject commit 8c7e77f2b1482573c3f37ea55965a60726bf967a +Subproject commit 78f4c1734d63f89adccebefd03c77218148f8072 From 85cd486b86ca683cff2ed2d6d860766bd64bb1a9 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 15 Jul 2019 06:51:18 +0200 Subject: [PATCH 16/85] Update Gradle and dependencies --- app/build.gradle | 18 +++++++++--------- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 3 ++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5cfefd9..dcecab5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,14 +32,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' - implementation 'com.google.android.material:material:1.1.0-alpha03' - implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha02' + implementation 'androidx.appcompat:appcompat:1.1.0-rc01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' + implementation 'com.google.android.material:material:1.1.0-alpha08' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.core:core:1.1.0-alpha04' - implementation 'androidx.fragment:fragment:1.1.0-alpha03' - implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha01' + implementation 'androidx.core:core:1.2.0-alpha02' + implementation 'androidx.fragment:fragment:1.2.0-alpha01' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' api 'com.google.guava:guava:27.0.1-android' api 'com.github.codekidX:storage-chooser:2.0.4.2' @@ -49,6 +49,6 @@ dependencies { implementation 'me.jfenn:Attribouter:0.1.5' testImplementation 'junit:junit:4.13-beta-1' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } diff --git a/build.gradle b/build.gradle index 4f2ea5c..6bb7db4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.20' + ext.kotlin_version = '1.3.31' repositories { jcenter() google() maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // For libaums diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0682df5..e70bdcb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Jul 15 06:44:24 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip From 670272384d7a28ae938cdcde619fc7728019dd35 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 15 Jul 2019 06:52:00 +0200 Subject: [PATCH 17/85] Drop support for KitKat, target Android Q --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dcecab5..8a0f1e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 + compileSdkVersion 29 buildToolsVersion '28.0.3' defaultConfig { applicationId "eu.depau.etchdroid" - minSdkVersion 19 - targetSdkVersion 28 + minSdkVersion 21 + targetSdkVersion 29 versionCode 8 versionName "1.3.31" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From 232cad0c2d146959f955203d3a1323a195335473 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 24 Jul 2019 01:07:43 +0200 Subject: [PATCH 18/85] Update Gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6bb7db4..204385a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // For libaums From 6afef7662b496b403af79a77558662b8f252b76b Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 24 Jul 2019 01:08:28 +0200 Subject: [PATCH 19/85] Update Kotlin --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 204385a..ccd8119 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.31' + ext.kotlin_version = '1.3.41' repositories { jcenter() google() From 40ae8639a4b0e385fe5fd221388f638d93e71588 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 24 Jul 2019 06:55:55 +0200 Subject: [PATCH 20/85] Stash --- app/build.gradle | 1 + .../broadcasts/JobProgressUpdateBroadcast.kt | 13 ++++++ .../utils/ktexts/IntentSendBroadcast.kt | 11 +++++ .../eu/depau/etchdroid/worker/IAsyncWorker.kt | 4 +- .../{ => abstractimpl}/AbstractAsyncWorker.kt | 6 ++- .../AbstractAutoProgressAsyncWorker.kt | 4 +- .../AbstractProgressSender.kt | 4 +- .../etchdroid/worker/dto/ProgressDoneDTO.kt | 25 +++++++++++- .../etchdroid/worker/dto/ProgressStartDTO.kt | 40 ++++++++++++++++--- .../etchdroid/worker/dto/ProgressUpdateDTO.kt | 35 ++++++++++++++-- .../enums/{OperationType.kt => JobType.kt} | 2 +- .../worker/impl/BroadcastProgressForwarder.kt | 29 ++++++++++++++ .../Dmg2OutputStreamConvertAsyncService.kt | 11 ++++- .../impl/Input2OutputStreamCopyAsyncWorker.kt | 4 +- 14 files changed, 166 insertions(+), 23 deletions(-) create mode 100644 app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/IntentSendBroadcast.kt rename app/src/main/java/eu/depau/etchdroid/worker/{ => abstractimpl}/AbstractAsyncWorker.kt (51%) rename app/src/main/java/eu/depau/etchdroid/worker/{ => abstractimpl}/AbstractAutoProgressAsyncWorker.kt (93%) rename app/src/main/java/eu/depau/etchdroid/worker/{ => abstractimpl}/AbstractProgressSender.kt (85%) rename app/src/main/java/eu/depau/etchdroid/worker/enums/{OperationType.kt => JobType.kt} (84%) create mode 100644 app/src/main/java/eu/depau/etchdroid/worker/impl/BroadcastProgressForwarder.kt diff --git a/app/build.gradle b/app/build.gradle index 8a0f1e3..b11f80d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation 'androidx.core:core:1.2.0-alpha02' implementation 'androidx.fragment:fragment:1.2.0-alpha01' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' + implementation 'com.github.Depau:kotlet-android:v0.2.4' api 'com.google.guava:guava:27.0.1-android' api 'com.github.codekidX:storage-chooser:2.0.4.2' diff --git a/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt new file mode 100644 index 0000000..a7d8553 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt @@ -0,0 +1,13 @@ +package eu.depau.etchdroid.broadcasts + +import android.content.Intent +import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO + +object JobProgressUpdateBroadcast { + val action = "eu.depau.etchdroid.broadcast.JOB_PROGRESS_UPDATE" + + fun getIntent(dto: ProgressUpdateDTO) = Intent().apply { + action = this@JobProgressUpdateBroadcast.action + putExtra("data", dto) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/IntentSendBroadcast.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/IntentSendBroadcast.kt new file mode 100644 index 0000000..af457ce --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/IntentSendBroadcast.kt @@ -0,0 +1,11 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.content.Context +import android.content.Intent +import androidx.localbroadcastmanager.content.LocalBroadcastManager + +fun Intent.sendBroadcast(context: Context) = context.sendBroadcast(this) +fun Intent.sendBroadcast(context: Context, receiverPermission: String) = context.sendBroadcast(this, receiverPermission) + +fun Intent.sendLocalBroadcast(context: Context) = LocalBroadcastManager.getInstance(context).sendBroadcast(this) +fun Intent.sendLocalBroadcastSync(context: Context) = LocalBroadcastManager.getInstance(context).sendBroadcastSync(this) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt index 33a89ea..3da2716 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt @@ -1,6 +1,6 @@ package eu.depau.etchdroid.worker interface IAsyncWorker: IProgressSender { - suspend fun run() - suspend fun runStep(): Boolean + fun run() + fun runStep(): Boolean } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/AbstractAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAsyncWorker.kt similarity index 51% rename from app/src/main/java/eu/depau/etchdroid/worker/AbstractAsyncWorker.kt rename to app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAsyncWorker.kt index f53c935..53fbebe 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/AbstractAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAsyncWorker.kt @@ -1,7 +1,9 @@ -package eu.depau.etchdroid.worker +package eu.depau.etchdroid.worker.abstractimpl + +import eu.depau.etchdroid.worker.IAsyncWorker abstract class AbstractAsyncWorker : IAsyncWorker, AbstractProgressSender() { - override suspend fun run() { + override fun run() { while (runStep()) { } } diff --git a/app/src/main/java/eu/depau/etchdroid/worker/AbstractAutoProgressAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAutoProgressAsyncWorker.kt similarity index 93% rename from app/src/main/java/eu/depau/etchdroid/worker/AbstractAutoProgressAsyncWorker.kt rename to app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAutoProgressAsyncWorker.kt index fd1b2a8..8a9b690 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/AbstractAutoProgressAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAutoProgressAsyncWorker.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.worker +package eu.depau.etchdroid.worker.abstractimpl import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO @@ -26,7 +26,7 @@ abstract class AbstractAutoProgressAsyncWorker(private val totalToDo: Long) : Ab val timeRemainingMillis: Long = ((totalToDo - doneAccumulator) / speedUnitPerMillis).toLong() val dto = progressUpdateDTO.copy( - operationProgress = progress, + jobProgress = progress, stepProgress = progress, timeRemaining = timeRemainingMillis, currentRate = speedUnitPerMillis * 1000 diff --git a/app/src/main/java/eu/depau/etchdroid/worker/AbstractProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractProgressSender.kt similarity index 85% rename from app/src/main/java/eu/depau/etchdroid/worker/AbstractProgressSender.kt rename to app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractProgressSender.kt index 0174ff8..a96c6ec 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/AbstractProgressSender.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractProgressSender.kt @@ -1,5 +1,7 @@ -package eu.depau.etchdroid.worker +package eu.depau.etchdroid.worker.abstractimpl +import eu.depau.etchdroid.worker.IProgressListener +import eu.depau.etchdroid.worker.IProgressSender import eu.depau.etchdroid.worker.dto.ProgressDoneDTO import eu.depau.etchdroid.worker.dto.ProgressStartDTO import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt index 58df979..0f3d701 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt @@ -1,10 +1,31 @@ package eu.depau.etchdroid.worker.dto +import android.os.Parcel import android.os.Parcelable import eu.depau.etchdroid.worker.enums.ErrorType +import eu.depau.kotlet.android.parcelable.* data class ProgressDoneDTO( - val operationId: Int, + val jobId: Long, val error: ErrorType?, val errorData: Parcelable? -) \ No newline at end of file +) : KotletParcelable { + constructor(parcel: Parcel) : this( + jobId = parcel.readLong(), + error = parcel.readNullable { parcel.readEnum() }, + errorData = parcel.readNullable { parcel.readParcelable(Parcelable::class.java.classLoader) } + ) + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeLong(jobId) + writeNullable(error) { writeEnum(it) } + writeNullable(errorData) { writeParcelable(errorData, flags) } + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator(::ProgressDoneDTO) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt index 2b39041..11b0806 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt @@ -1,13 +1,41 @@ package eu.depau.etchdroid.worker.dto -import eu.depau.etchdroid.worker.enums.OperationType +import android.os.Parcel +import eu.depau.etchdroid.worker.enums.JobType import eu.depau.etchdroid.worker.enums.StepType -import java.util.* +import eu.depau.kotlet.android.parcelable.KotletParcelable +import eu.depau.kotlet.android.parcelable.parcelableCreator +import eu.depau.kotlet.android.parcelable.readEnum +import eu.depau.kotlet.android.parcelable.writeEnum data class ProgressStartDTO( - val operationId: Int, - val operationType: OperationType, + val jobId: Long, + val jobType: JobType, val inputName: String, val outputName: String, - val steps: List> -) \ No newline at end of file + val stepsNamesResIDs: List +) : KotletParcelable { + @Suppress("UNCHECKED_CAST") + constructor(parcel: Parcel) : this( + jobId = parcel.readLong(), + jobType = parcel.readEnum()!!, + inputName = parcel.readString()!!, + outputName = parcel.readString()!!, + stepsNamesResIDs = (parcel.readSerializable() as Array).asList() + ) + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeLong(jobId) + writeEnum(jobType) + writeString(inputName) + writeString(outputName) + writeSerializable(stepsNamesResIDs.toTypedArray()) + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator(::ProgressStartDTO) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt index db7a9ac..9bb14c7 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt @@ -1,13 +1,42 @@ package eu.depau.etchdroid.worker.dto +import android.os.Parcel import eu.depau.etchdroid.worker.enums.RateUnit +import eu.depau.kotlet.android.parcelable.* data class ProgressUpdateDTO( - val operationId: Int, + val jobId: Long, val currentStep: Int, - val operationProgress: Double, + val jobProgress: Double, val stepProgress: Double?, val timeRemaining: Long?, val currentRate: Double?, val rateUnit: RateUnit? -) \ No newline at end of file +) : KotletParcelable { + constructor(parcel: Parcel) : this( + jobId = parcel.readLong(), + currentStep = parcel.readInt(), + jobProgress = parcel.readDouble(), + stepProgress = parcel.readNullable { parcel.readDouble() }, + timeRemaining = parcel.readNullable { parcel.readLong() }, + currentRate = parcel.readNullable { parcel.readDouble() }, + rateUnit = parcel.readNullable { parcel.readEnum() } + ) + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeLong(jobId) + writeInt(currentStep) + writeDouble(jobProgress) + writeNullable(stepProgress) { writeDouble(it) } + writeNullable(timeRemaining) { writeLong(it) } + writeNullable(currentRate) { writeDouble(it) } + writeNullable(rateUnit) { writeEnum(rateUnit) } + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator(::ProgressUpdateDTO) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/OperationType.kt b/app/src/main/java/eu/depau/etchdroid/worker/enums/JobType.kt similarity index 84% rename from app/src/main/java/eu/depau/etchdroid/worker/enums/OperationType.kt rename to app/src/main/java/eu/depau/etchdroid/worker/enums/JobType.kt index 4808c6e..59184e6 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/enums/OperationType.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/enums/JobType.kt @@ -1,6 +1,6 @@ package eu.depau.etchdroid.worker.enums -enum class OperationType { +enum class JobType { FLASH_RAW_IMAGE, FLASH_DMG, FLASH_ELTORITO, diff --git a/app/src/main/java/eu/depau/etchdroid/worker/impl/BroadcastProgressForwarder.kt b/app/src/main/java/eu/depau/etchdroid/worker/impl/BroadcastProgressForwarder.kt new file mode 100644 index 0000000..f5d25f9 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/worker/impl/BroadcastProgressForwarder.kt @@ -0,0 +1,29 @@ +package eu.depau.etchdroid.worker.impl + +import android.content.Context +import eu.depau.etchdroid.worker.IProgressListener +import eu.depau.etchdroid.worker.dto.ProgressDoneDTO +import eu.depau.etchdroid.worker.dto.ProgressStartDTO +import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO + +class BroadcastProgressForwarder( + val jobId: Long, + val context: Context + + ): IProgressListener { + override fun notifyStart(dto: ProgressStartDTO) { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } + + override fun notifyProgress(dto: ProgressUpdateDTO) { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } + + override fun notifyDone(dto: ProgressDoneDTO) { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } + + fun stopForwarding() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt b/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt index 8387b8b..5cfcae1 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt @@ -1,6 +1,13 @@ package eu.depau.etchdroid.worker.impl -import eu.depau.etchdroid.worker.AbstractAutoProgressAsyncWorker +import eu.depau.etchdroid.worker.abstractimpl.AbstractAutoProgressAsyncWorker +import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO -class Dmg2OutputStreamConvertAsyncService: AbstractAutoProgressAsyncWorker() { +class Dmg2OutputStreamConvertAsyncService(private val totalToDo: Long): AbstractAutoProgressAsyncWorker(totalToDo) { + override val progressUpdateDTO: ProgressUpdateDTO + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. + + override fun runStep(): Boolean { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt index 2eee691..7aef9d6 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt @@ -1,6 +1,6 @@ package eu.depau.etchdroid.worker.impl -import eu.depau.etchdroid.worker.AbstractAutoProgressAsyncWorker +import eu.depau.etchdroid.worker.abstractimpl.AbstractAutoProgressAsyncWorker import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO import java.io.InputStream import java.io.OutputStream @@ -16,7 +16,7 @@ open class Input2OutputStreamCopyAsyncWorker( private val buffer = ByteArray(chunkSize) - override suspend fun runStep(): Boolean { + override fun runStep(): Boolean { val readBytes = source.read(buffer) if (readBytes < 0) From 15ee902d9243430a40974c16fa72f755a868cb62 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 30 Jul 2019 00:11:54 +0200 Subject: [PATCH 21/85] Update dependencies --- app/build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5cfefd9..63ed256 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,14 +32,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' - implementation 'com.google.android.material:material:1.1.0-alpha03' - implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha02' + implementation 'androidx.appcompat:appcompat:1.1.0-rc01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' + implementation 'com.google.android.material:material:1.1.0-alpha09' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.core:core:1.1.0-alpha04' - implementation 'androidx.fragment:fragment:1.1.0-alpha03' - implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha01' + implementation 'androidx.core:core:1.2.0-alpha02' + implementation 'androidx.fragment:fragment:1.2.0-alpha01' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' api 'com.google.guava:guava:27.0.1-android' api 'com.github.codekidX:storage-chooser:2.0.4.2' @@ -49,6 +49,6 @@ dependencies { implementation 'me.jfenn:Attribouter:0.1.5' testImplementation 'junit:junit:4.13-beta-1' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } From 6b3ac82fa35da5949d60794ac6ee88d699f7b4f7 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 30 Jul 2019 00:17:43 +0200 Subject: [PATCH 22/85] Fix typo in build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 4e629c8..6648eed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,7 +40,7 @@ dependencies { implementation 'androidx.core:core:1.2.0-alpha02' implementation 'androidx.fragment:fragment:1.2.0-alpha01' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' - implementation 'com.github.Depau:kotlet-android:v0.2A.4' + implementation 'com.github.Depau:kotlet-android:v0.2.4' api 'com.google.guava:guava:27.0.1-android' api 'com.github.codekidX:storage-chooser:2.0.4.2' From 9fc3e94f3e666024b8bc91144493c80c0b15c09d Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 30 Jul 2019 00:24:06 +0200 Subject: [PATCH 23/85] Fix typo in gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d1bcc58..760a93c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/distsA \ No newline at end of file +zipStorePath=wrapper/dists \ No newline at end of file From 6e5b75f8ec35251c9821d4de80a30dce74d6252e Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 30 Jul 2019 00:24:06 +0200 Subject: [PATCH 24/85] Fix typo in gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d1bcc58..760a93c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/distsA \ No newline at end of file +zipStorePath=wrapper/dists \ No newline at end of file From ce8c56d047f4768507846afa408467e8afd3c153 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 18:40:45 +0200 Subject: [PATCH 25/85] Update Gradle dependencies and add new ones --- app/build.gradle | 24 +++++++++++++++++------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 6 +++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6648eed..c05447d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,29 +27,39 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + testOptions { + unitTests.includeAndroidResources = true + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.1.0-rc01' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha1' implementation 'com.google.android.material:material:1.1.0-alpha09' - implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta02' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.core:core:1.2.0-alpha02' - implementation 'androidx.fragment:fragment:1.2.0-alpha01' + implementation 'androidx.core:core:1.2.0-alpha03' + implementation 'androidx.fragment:fragment:1.2.0-alpha02' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' implementation 'com.github.Depau:kotlet-android:v0.2.4' + implementation 'com.google.code.gson:gson:2.8.5' api 'com.google.guava:guava:27.0.1-android' - api 'com.github.codekidX:storage-chooser:2.0.4.2' -// implementation 'com.github.mjdev:libaums:0.5.5' + implementation project(':libaums') implementation project(':dmg2img') implementation 'me.jfenn:Attribouter:0.1.5' - testImplementation 'junit:junit:4.13-beta-1' + implementation 'androidx.room:room-runtime:2.1.0' + annotationProcessor 'androidx.room:room-compiler:2.1.0' + androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + + testImplementation 'junit:junit:4.13-beta-3' + testImplementation 'androidx.test:core:1.2.0' + testImplementation 'org.mockito:mockito-core:2.28.2' + } diff --git a/build.gradle b/build.gradle index ccd8119..0b95843 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.6.0-alpha05' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // For libaums diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 760a93c..06f1b24 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jul 15 06:44:24 CEST 2019 +#Fri Aug 02 17:55:26 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip From 8f9c85d3a547552c24234fdc577f0e666861ea77 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 18:50:59 +0200 Subject: [PATCH 26/85] Implement basic Job service with basic tests --- .../java/eu/depau/etchdroid/AppBuildConfig.kt | 6 + .../etchdroid/broadcasts/BroadcastExtras.kt | 5 + .../broadcasts/JobProgressUpdateBroadcast.kt | 10 +- .../dto/JobProgressUpdateBroadcastDTO.kt | 26 ++++ .../depau/etchdroid/db/EtchDroidDatabase.kt | 37 ++++++ .../db/converter/JobProcedureConverter.kt | 19 +++ .../java/eu/depau/etchdroid/db/entity/Job.kt | 14 +++ .../etchdroid/db/repository/JobRepository.kt | 25 ++++ .../IServiceNotificationBuilder.kt | 7 ++ .../impl/JobServiceNotificationHandler.kt | 64 ++++++++++ .../eu/depau/etchdroid/services/JobService.kt | 59 +++++++++ .../services/dto/JobServiceIntentDTO.kt | 28 +++++ .../ui/notifications/AppNotifications.kt | 81 +++++++++++++ .../depau/etchdroid/utils/StringResBuilder.kt | 32 +++++ .../depau/etchdroid/utils/job/IJobAction.kt | 26 ++++ .../etchdroid/utils/job/IJobProcedure.kt | 8 ++ .../utils/job/IJobProcedureBuilder.kt | 7 ++ .../etchdroid/utils/job/impl/JobProcedure.kt | 26 ++++ .../etchdroid/utils/worker/IAsyncWorker.kt | 10 ++ .../utils/worker/IProgressForwarder.kt | 39 ++++++ .../utils/worker/IProgressListener.kt | 13 ++ .../{ => utils}/worker/IProgressSender.kt | 2 +- .../{ => utils}/worker/dto/ProgressDoneDTO.kt | 6 +- .../worker/dto/ProgressStartDTO.kt | 5 +- .../worker/dto/ProgressUpdateDTO.kt | 4 +- .../{ => utils}/worker/enums/ErrorType.kt | 2 +- .../{ => utils}/worker/enums/JobType.kt | 2 +- .../{ => utils}/worker/enums/RateUnit.kt | 2 +- .../{ => utils}/worker/enums/StepType.kt | 2 +- .../utils/worker/impl/AbstractAsyncWorker.kt | 6 + .../impl}/AbstractAutoProgressAsyncWorker.kt | 4 +- .../worker/impl/AbstractProgressSender.kt | 28 +++++ .../eu/depau/etchdroid/worker/IAsyncWorker.kt | 6 - .../etchdroid/worker/IProgressListener.kt | 11 -- .../abstractimpl/AbstractAsyncWorker.kt | 10 -- .../abstractimpl/AbstractProgressSender.kt | 26 ---- .../worker/impl/BroadcastProgressForwarder.kt | 29 ----- .../Dmg2OutputStreamConvertAsyncService.kt | 13 -- .../Dmg2OutputStreamConvertAsyncService.kt | 24 ++++ .../IMergedAsyncWorkerProgressSender.kt | 7 ++ .../Input2OutputStreamCopyAsyncWorker.kt | 8 +- .../workers/ProgressBroadcastForwarder.kt | 111 +++++++++++++++++ app/src/main/res/values/strings.xml | 5 + .../etchdroid/services/JobServiceTest.kt | 113 ++++++++++++++++++ .../etchdroid/testutils/job/MockJobAction.kt | 60 ++++++++++ .../testutils/worker/MockJobWorker.kt | 22 ++++ 46 files changed, 931 insertions(+), 119 deletions(-) create mode 100644 app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/broadcasts/BroadcastExtras.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/db/EtchDroidDatabase.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/db/converter/JobProcedureConverter.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/db/repository/JobRepository.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationHandler.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/services/JobService.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/services/dto/JobServiceIntentDTO.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/ui/notifications/AppNotifications.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressForwarder.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressListener.kt rename app/src/main/java/eu/depau/etchdroid/{ => utils}/worker/IProgressSender.kt (80%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/worker/dto/ProgressDoneDTO.kt (84%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/worker/dto/ProgressStartDTO.kt (90%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/worker/dto/ProgressUpdateDTO.kt (93%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/worker/enums/ErrorType.kt (80%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/worker/enums/JobType.kt (73%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/worker/enums/RateUnit.kt (61%) rename app/src/main/java/eu/depau/etchdroid/{ => utils}/worker/enums/StepType.kt (68%) create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt rename app/src/main/java/eu/depau/etchdroid/{worker/abstractimpl => utils/worker/impl}/AbstractAutoProgressAsyncWorker.kt (92%) create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/worker/IProgressListener.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAsyncWorker.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractProgressSender.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/worker/impl/BroadcastProgressForwarder.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/workers/IMergedAsyncWorkerProgressSender.kt rename app/src/main/java/eu/depau/etchdroid/{worker/impl => workers}/Input2OutputStreamCopyAsyncWorker.kt (69%) create mode 100644 app/src/main/java/eu/depau/etchdroid/workers/ProgressBroadcastForwarder.kt create mode 100644 app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt create mode 100644 app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt create mode 100644 app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt diff --git a/app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt b/app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt new file mode 100644 index 0000000..5c40345 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt @@ -0,0 +1,6 @@ +package eu.depau.etchdroid + +object AppBuildConfig { + @JvmField + var TEST_BUILD = false +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/broadcasts/BroadcastExtras.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/BroadcastExtras.kt new file mode 100644 index 0000000..d69517d --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/broadcasts/BroadcastExtras.kt @@ -0,0 +1,5 @@ +package eu.depau.etchdroid.broadcasts + +object BroadcastExtras { + const val UPDATE_DTO = "eu.depau.etchdroid.broadcast.extras.UPDATE_DTO" +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt index a7d8553..ef566be 100644 --- a/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt +++ b/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt @@ -1,13 +1,13 @@ package eu.depau.etchdroid.broadcasts import android.content.Intent -import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.broadcasts.dto.JobProgressUpdateBroadcastDTO object JobProgressUpdateBroadcast { - val action = "eu.depau.etchdroid.broadcast.JOB_PROGRESS_UPDATE" + const val ACTION = "eu.depau.etchdroid.broadcast.JOB_PROGRESS_UPDATE" - fun getIntent(dto: ProgressUpdateDTO) = Intent().apply { - action = this@JobProgressUpdateBroadcast.action - putExtra("data", dto) + fun getIntent(dto: JobProgressUpdateBroadcastDTO) = Intent().apply { + action = this@JobProgressUpdateBroadcast.ACTION + dto.writeToIntent(this) } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt new file mode 100644 index 0000000..9a6cd14 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt @@ -0,0 +1,26 @@ +package eu.depau.etchdroid.broadcasts.dto + +import android.content.Intent +import eu.depau.etchdroid.broadcasts.BroadcastExtras +import java.io.Serializable + + +data class JobProgressUpdateBroadcastDTO( + val jobId: Long, + val indefinite: Boolean, + val showProgressBar: Boolean, + val completed: Boolean, + val step: Int?, + val percentage: Double?, + val currentMessage: String?, + val error: Exception? +) : Serializable { + fun writeToIntent(intent: Intent) { + intent.putExtra(BroadcastExtras.UPDATE_DTO, this) + } + + companion object { + fun readFromIntent(intent: Intent) = + intent.getSerializableExtra(BroadcastExtras.UPDATE_DTO)!! as JobProgressUpdateBroadcastDTO + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/db/EtchDroidDatabase.kt b/app/src/main/java/eu/depau/etchdroid/db/EtchDroidDatabase.kt new file mode 100644 index 0000000..21fe7fa --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/db/EtchDroidDatabase.kt @@ -0,0 +1,37 @@ +package eu.depau.etchdroid.db + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters +import eu.depau.etchdroid.db.converter.JobProcedureConverter +import eu.depau.etchdroid.db.entity.Job +import eu.depau.etchdroid.db.repository.JobRepository + +@Database(entities = [Job::class], version = 1) +@TypeConverters(JobProcedureConverter::class) +abstract class EtchDroidDatabase : RoomDatabase() { + abstract fun jobRepository(): JobRepository + + companion object { + @Volatile + private var INSTANCE: EtchDroidDatabase? = null + + fun getDatabase(context: Context): EtchDroidDatabase { + val tempInstance = INSTANCE + if (tempInstance != null) { + return tempInstance + } + synchronized(this) { + val instance = Room.databaseBuilder( + context.applicationContext, + EtchDroidDatabase::class.java, + "etchdroid_db" + ).build() + INSTANCE = instance + return instance + } + } + } +} diff --git a/app/src/main/java/eu/depau/etchdroid/db/converter/JobProcedureConverter.kt b/app/src/main/java/eu/depau/etchdroid/db/converter/JobProcedureConverter.kt new file mode 100644 index 0000000..a8005f1 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/db/converter/JobProcedureConverter.kt @@ -0,0 +1,19 @@ +package eu.depau.etchdroid.db.converter + +import androidx.room.TypeConverter +import com.google.gson.Gson +import eu.depau.etchdroid.utils.job.IJobProcedure + +class JobProcedureConverter { + @TypeConverter + fun fromJobProcedure(value: IJobProcedure): String { + val gson = Gson() + return gson.toJson(value) + } + + @TypeConverter + fun fromString(value: String): IJobProcedure { + val gson = Gson() + return gson.fromJson(value, IJobProcedure::class.java) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt b/app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt new file mode 100644 index 0000000..893c830 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt @@ -0,0 +1,14 @@ +package eu.depau.etchdroid.db.entity + +import androidx.room.Entity +import androidx.room.PrimaryKey +import eu.depau.etchdroid.utils.job.IJobProcedure + +@Entity +data class Job( + @PrimaryKey(autoGenerate = true) val jobId: Long = 0, + var jobProcedure: IJobProcedure, + var checkpointActionIndex: Int? = null, + var checkpointData: String? = null, + var completed: Boolean = false +) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/db/repository/JobRepository.kt b/app/src/main/java/eu/depau/etchdroid/db/repository/JobRepository.kt new file mode 100644 index 0000000..51efb8d --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/db/repository/JobRepository.kt @@ -0,0 +1,25 @@ +package eu.depau.etchdroid.db.repository + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import eu.depau.etchdroid.db.entity.Job + +@Dao +interface JobRepository { + @Query("SELECT * FROM job") + fun getAll(): List + + @Query("SELECT * FROM job WHERE jobId == :jobId LIMIT 1") + fun getById(jobId: Long): Job + + @Insert + fun insert(job: Job): Long + + @Insert + fun insertAll(vararg jobs: Job) + + @Delete + fun delete(job: Job) +} diff --git a/app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt b/app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt new file mode 100644 index 0000000..58da0ff --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt @@ -0,0 +1,7 @@ +package eu.depau.etchdroid.notification + +import android.app.Notification + +interface IServiceNotificationBuilder { + fun build(): Notification +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationHandler.kt b/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationHandler.kt new file mode 100644 index 0000000..6ab05e4 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationHandler.kt @@ -0,0 +1,64 @@ +package eu.depau.etchdroid.notification.impl + +import android.app.Notification +import android.app.NotificationManager +import android.content.Context +import android.content.Context.NOTIFICATION_SERVICE +import android.os.Build +import androidx.core.app.NotificationCompat +import eu.depau.etchdroid.AppBuildConfig +import eu.depau.etchdroid.R +import eu.depau.etchdroid.notification.IServiceNotificationBuilder +import eu.depau.kotlet.android.extensions.notification.NotificationImportanceCompat +import eu.depau.kotlet.android.extensions.notification.registerNotificationChannel + +class JobServiceNotificationHandler(val context: Context) : IServiceNotificationBuilder { + private val notificationManager = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager + private val notificationChannelProgress = notificationManager + .registerNotificationChannel( + "eu.depau.etchdroid.notifications.JOB_PROGRESS", + context.getString(R.string.notif_channel_job_progress_name), + context.getString(R.string.notif_channel_job_progress_desc), + NotificationImportanceCompat.IMPORTANCE_LOW + ) + + private val notificationChannelResult = notificationManager + .registerNotificationChannel( + "eu.depau.etchdroid.notifications.JOB_RESULT", + context.getString(R.string.notif_channel_job_result_name), + context.getString(R.string.notif_channel_job_result_desc), + NotificationImportanceCompat.IMPORTANCE_DEFAULT + ) + + private fun getNotificationBuilder(channel: String): NotificationCompat.Builder? { + if (AppBuildConfig.TEST_BUILD) { + return null + } + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + NotificationCompat.Builder(context, channel) + } else { + NotificationCompat.Builder(context) + } + } + + init { + // Delete old notification channels + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + notificationManager.apply { + deleteNotificationChannel("eu.depau.etchdroid.notifications.USB_WRITE_PROGRESS") + deleteNotificationChannel("eu.depau.etchdroid.notifications.USB_WRITE_RESULT") + } + } + } + + override fun build(): Notification { + val builder = getNotificationBuilder(notificationChannelProgress) + ?: // Test build, return fake notification + return Notification() + + return builder.apply { + setContentTitle(context.getString(R.string.notif_starting_job)) + setProgress(100, 0, true) + }.build() + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/JobService.kt b/app/src/main/java/eu/depau/etchdroid/services/JobService.kt new file mode 100644 index 0000000..de93888 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/services/JobService.kt @@ -0,0 +1,59 @@ +package eu.depau.etchdroid.services + +import android.app.IntentService +import android.content.Intent +import eu.depau.etchdroid.db.EtchDroidDatabase +import eu.depau.etchdroid.notification.impl.JobServiceNotificationHandler +import eu.depau.etchdroid.services.dto.JobServiceIntentDTO + +open class JobService(name: String) : IntentService(name) { + constructor() : this("TestJobService") + + private fun startProcedure(jobId: Long) { + + } + + private fun startAction(jobId: Long, actionIndex: Int) { + + } + + override fun onHandleIntent(intent: Intent?) { + intent!! // Assert intent != null + val jobDTO = intent.getParcelableExtra(JobServiceIntentDTO.EXTRA) + val jobId = jobDTO.jobId + + assert(jobId >= 0) { "Invalid jobId (jobId < 0)" } + + val svcNotificationHandler = JobServiceNotificationHandler(this) + val notification = svcNotificationHandler.build() + startForeground(jobId.toInt(), notification) + + // TODO: Implement notification broadcast receiver and bind it here + // TODO: add and notify BroadcastProgressForwarder + + try { + val db = EtchDroidDatabase.getDatabase(this) + val job = db.jobRepository().getById(jobId) + assert(!job.completed) { "Job $jobId already completed" } + + val procedure = job.jobProcedure + // TODO: notify BroadcastProgressForwarder + startProcedure(jobId) + + for (i in 0 until procedure.size) { + val action = procedure[i] + startAction(jobId, i) + // TODO: notify BroadcastProgressForwarder + + val worker = action.getWorker() + while (worker.runStep()) { + } + + // TODO: notify BroadcastProgressForwarder + } + + } finally { + stopForeground(true) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/dto/JobServiceIntentDTO.kt b/app/src/main/java/eu/depau/etchdroid/services/dto/JobServiceIntentDTO.kt new file mode 100644 index 0000000..5eea75e --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/services/dto/JobServiceIntentDTO.kt @@ -0,0 +1,28 @@ +package eu.depau.etchdroid.services.dto + +import android.os.Parcel +import eu.depau.kotlet.android.parcelable.KotletParcelable +import eu.depau.kotlet.android.parcelable.parcelableCreator +import java.io.Serializable + +data class JobServiceIntentDTO( + val jobId: Long +) : KotletParcelable, Serializable { + constructor(parcel: Parcel) : this( + parcel.readLong() + ) + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeLong(jobId) + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator(::JobServiceIntentDTO) + + @JvmField + val EXTRA = "eu.depau.etchdroid.broadcast.extras.JOB_SERVICE_DTO" + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/ui/notifications/AppNotifications.kt b/app/src/main/java/eu/depau/etchdroid/ui/notifications/AppNotifications.kt new file mode 100644 index 0000000..e1cca64 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/ui/notifications/AppNotifications.kt @@ -0,0 +1,81 @@ +package eu.depau.etchdroid.ui.notifications + +import android.annotation.TargetApi +import android.app.Notification +import android.app.NotificationManager +import android.content.Context +import android.os.Build +import androidx.core.app.NotificationCompat +import eu.depau.etchdroid.R +import eu.depau.kotlet.android.extensions.notification.NotificationImportanceCompat +import eu.depau.kotlet.android.extensions.notification.registerNotificationChannel + +object AppNotifications { + const val asyncProgressChannelId = "eu.depau.etchdroid.notifications.ASYNC)WORKER_PROGRESS" + const val asyncResultChannelId = "eu.depau.etchdroid.notifications.ASYNC_WORKER_RESULT" + + private var channelsRegistered = false + + @TargetApi(Build.VERSION_CODES.O) + fun registerChannels(context: Context) { + if (channelsRegistered || Build.VERSION.SDK_INT < Build.VERSION_CODES.M) + return + + val notificationManager = context.getSystemService(NotificationManager::class.java)!! + + notificationManager.registerNotificationChannel( + asyncProgressChannelId, + context.getString(R.string.notchan_writestatus_title), + context.getString(R.string.notchan_writestatus_desc), + NotificationImportanceCompat.IMPORTANCE_LOW + ) + + notificationManager.registerNotificationChannel( + asyncResultChannelId, + context.getString(R.string.result_channel_name), + context.getString(R.string.result_channel_desc), + NotificationImportanceCompat.IMPORTANCE_DEFAULT + ) + + channelsRegistered = true + } + + fun getNotificationBuilder(context: Context, channel: String): NotificationCompat.Builder { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + NotificationCompat.Builder(context, channel) + } else { + NotificationCompat.Builder(context) + } + } + + fun buildAsyncWorkerProgressNotification( + context: Context, + contentTitle: String? = null, + contentText: String? = null, + subText: String? = null, + ongoing: Boolean = true, + progressPercent: Int = 0, + indeterminate: Boolean = false, + smallIcon: Int = R.drawable.ic_usb_white_24dp + ): Notification { + + val builder = getNotificationBuilder(context, asyncProgressChannelId) + + if (contentTitle != null) + builder.setContentTitle(contentTitle) + if (subText != null) + builder.setSubText(subText) + if (contentText != null) + builder.setContentText(contentText) + else + builder.setContentText(context.getString(R.string.notif_initializing)) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) + builder.setSmallIcon(smallIcon) + + builder.setOngoing(ongoing) + builder.setProgress(100, progressPercent, indeterminate) + + return builder.build() + } + +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt b/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt new file mode 100644 index 0000000..943d31c --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt @@ -0,0 +1,32 @@ +package eu.depau.etchdroid.utils + +import android.content.Context +import android.os.Parcel +import eu.depau.kotlet.android.parcelable.KotletParcelable +import eu.depau.kotlet.android.parcelable.parcelableCreator +import java.io.Serializable + +class StringResBuilder(private val resId: Int, private vararg val formatArgs: Any) : Serializable, KotletParcelable { + constructor(parcel: Parcel) : this( + parcel.readInt(), + parcel.readArray(null) as Array + ) + + fun build(context: Context): String = if (formatArgs.isNotEmpty()) { + context.getString(resId, formatArgs) + } else { + context.getString(resId) + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeInt(resId) + writeArray(formatArgs) + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator(::StringResBuilder) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt new file mode 100644 index 0000000..2e6276e --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt @@ -0,0 +1,26 @@ +package eu.depau.etchdroid.utils.job + +import android.os.Parcelable +import eu.depau.etchdroid.utils.StringResBuilder +import eu.depau.etchdroid.utils.worker.IAsyncWorker +import java.io.Serializable + +interface IJobAction : Parcelable, Serializable { + val nameResId: Int + val progressWeight: Double + + /** + * Build a worker instance that performs the action encoded in this object + * + * @return a worker instance that performs the encoded action + */ + fun getWorker(): IAsyncWorker + + /** + * Check action preconditions and return a list of StringResBuilders, which will then be + * built and rendered in the UI. + * + * @return a list of failed preconditions descriptions + */ + fun checkPreconditions(): List +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt new file mode 100644 index 0000000..7fed8c8 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt @@ -0,0 +1,8 @@ +package eu.depau.etchdroid.utils.job + +import android.os.Parcelable +import java.io.Serializable + +interface IJobProcedure: List, Parcelable, Serializable { + val nameResId: Int +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt new file mode 100644 index 0000000..392754a --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt @@ -0,0 +1,7 @@ +package eu.depau.etchdroid.utils.job + +import android.os.Parcelable + +interface IJobProcedureBuilder : Parcelable { + fun build(): IJobProcedure +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt new file mode 100644 index 0000000..b13dbdf --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt @@ -0,0 +1,26 @@ +package eu.depau.etchdroid.utils.job.impl + +import android.os.Parcel +import eu.depau.etchdroid.utils.job.IJobAction +import eu.depau.etchdroid.utils.job.IJobProcedure +import eu.depau.kotlet.android.parcelable.KotletParcelable +import eu.depau.kotlet.android.parcelable.parcelableCreator +import java.io.Serializable + +open class JobProcedure(override val nameResId: Int) : ArrayList(), IJobProcedure, KotletParcelable, Serializable { + constructor(parcel: Parcel) : this(parcel.readInt()) { + parcel.readList(this as List, IJobAction::class.java.classLoader) + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeInt(nameResId) + writeList(this@JobProcedure as List) + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator(::JobProcedure) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt new file mode 100644 index 0000000..6d49c4f --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt @@ -0,0 +1,10 @@ +package eu.depau.etchdroid.utils.worker + +interface IAsyncWorker: IProgressSender { + /** + * Make the worker run do one step. Returns whether there are more steps to do + * + * @return whether more work needs to be done + */ + fun runStep(): Boolean +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressForwarder.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressForwarder.kt new file mode 100644 index 0000000..534ad6c --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressForwarder.kt @@ -0,0 +1,39 @@ +package eu.depau.etchdroid.utils.worker + +interface IProgressForwarder { + /** + * Called by the worker service to update the forwarder on the current ACTION index. + * + * @param actionIndex the current ACTION index within the JobProcedure + */ + fun notifyActionStart(actionIndex: Int) + + /** + * Called by the worker service to notify the forwarder that the current ACTION has finished + * running. Whether it has finished successfully or not is unspecified. + * + * If it failed, a call to notifyProcedureError will follow with an Exception reference. + */ + fun notifyActionDone() + + /** + * Called by the worker service to notify the forwarder that the currently referenced procedure + * is starting. + * + * @param startActionIndex the ACTION index the procedure is starting with (which is > 0 if it's + * being bootstrapped from a checkpoint) + */ + fun notifyProcedureStart(startActionIndex: Int = 0) + + /** + * Called by the worker service to notify the forwarder that the currently referenced procedure + * has finished successfully. + */ + fun notifyProcedureDone() + + /** + * Called by the worker service to notify the forwarder that the currently referenced procedure + * has failed with the provided exception. + */ + fun notifyProcedureError(error: java.lang.Exception) +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressListener.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressListener.kt new file mode 100644 index 0000000..0f25595 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressListener.kt @@ -0,0 +1,13 @@ +package eu.depau.etchdroid.utils.worker + +import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO + +interface IProgressListener { + /** + * Called by the current worker to update the progress listener on its status relative to + * the current JobAction that describes its task. + * + * @param dto a ProgressUpdateDTO describing the current status of the worker + */ + fun notifyActionProgress(dto: ProgressUpdateDTO) +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/IProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt similarity index 80% rename from app/src/main/java/eu/depau/etchdroid/worker/IProgressSender.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt index 2a9bf4b..736c53f 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/IProgressSender.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.worker +package eu.depau.etchdroid.utils.worker interface IProgressSender { fun attachProgressListener(listener: IProgressListener): Boolean diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressDoneDTO.kt similarity index 84% rename from app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressDoneDTO.kt index 0f3d701..0b1a46a 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressDoneDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressDoneDTO.kt @@ -1,8 +1,8 @@ -package eu.depau.etchdroid.worker.dto +package eu.depau.etchdroid.utils.worker.dto import android.os.Parcel import android.os.Parcelable -import eu.depau.etchdroid.worker.enums.ErrorType +import eu.depau.etchdroid.utils.worker.enums.ErrorType import eu.depau.kotlet.android.parcelable.* data class ProgressDoneDTO( @@ -13,7 +13,7 @@ data class ProgressDoneDTO( constructor(parcel: Parcel) : this( jobId = parcel.readLong(), error = parcel.readNullable { parcel.readEnum() }, - errorData = parcel.readNullable { parcel.readParcelable(Parcelable::class.java.classLoader) } + errorData = parcel.readNullable { parcel.readParcelable(Parcelable::class.java.classLoader) as Parcelable? } ) override fun writeToParcel(parcel: Parcel, flags: Int) { diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressStartDTO.kt similarity index 90% rename from app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressStartDTO.kt index 11b0806..0ce983c 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressStartDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressStartDTO.kt @@ -1,8 +1,7 @@ -package eu.depau.etchdroid.worker.dto +package eu.depau.etchdroid.utils.worker.dto import android.os.Parcel -import eu.depau.etchdroid.worker.enums.JobType -import eu.depau.etchdroid.worker.enums.StepType +import eu.depau.etchdroid.utils.worker.enums.JobType import eu.depau.kotlet.android.parcelable.KotletParcelable import eu.depau.kotlet.android.parcelable.parcelableCreator import eu.depau.kotlet.android.parcelable.readEnum diff --git a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt similarity index 93% rename from app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt index 9bb14c7..429cbb1 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/dto/ProgressUpdateDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt @@ -1,7 +1,7 @@ -package eu.depau.etchdroid.worker.dto +package eu.depau.etchdroid.utils.worker.dto import android.os.Parcel -import eu.depau.etchdroid.worker.enums.RateUnit +import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.kotlet.android.parcelable.* data class ProgressUpdateDTO( diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/ErrorType.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/ErrorType.kt similarity index 80% rename from app/src/main/java/eu/depau/etchdroid/worker/enums/ErrorType.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/enums/ErrorType.kt index 06604b1..3871bee 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/enums/ErrorType.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/ErrorType.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.worker.enums +package eu.depau.etchdroid.utils.worker.enums enum class ErrorType { UNPLUGGED, diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/JobType.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/JobType.kt similarity index 73% rename from app/src/main/java/eu/depau/etchdroid/worker/enums/JobType.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/enums/JobType.kt index 59184e6..7ce6b3b 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/enums/JobType.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/JobType.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.worker.enums +package eu.depau.etchdroid.utils.worker.enums enum class JobType { FLASH_RAW_IMAGE, diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/RateUnit.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/RateUnit.kt similarity index 61% rename from app/src/main/java/eu/depau/etchdroid/worker/enums/RateUnit.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/enums/RateUnit.kt index 54f9ce3..2aae7b4 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/enums/RateUnit.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/RateUnit.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.worker.enums +package eu.depau.etchdroid.utils.worker.enums enum class RateUnit { BYTES_PER_SECOND, diff --git a/app/src/main/java/eu/depau/etchdroid/worker/enums/StepType.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/StepType.kt similarity index 68% rename from app/src/main/java/eu/depau/etchdroid/worker/enums/StepType.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/enums/StepType.kt index 8a4af00..d658c10 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/enums/StepType.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/StepType.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.worker.enums +package eu.depau.etchdroid.utils.worker.enums enum class StepType { STREAM_COPY, diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt new file mode 100644 index 0000000..026618c --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt @@ -0,0 +1,6 @@ +package eu.depau.etchdroid.utils.worker.impl + +import eu.depau.etchdroid.utils.worker.IAsyncWorker + +abstract class AbstractAsyncWorker : IAsyncWorker, AbstractProgressSender() { +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAutoProgressAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt similarity index 92% rename from app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAutoProgressAsyncWorker.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt index 8a9b690..1b19429 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAutoProgressAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt @@ -1,6 +1,6 @@ -package eu.depau.etchdroid.worker.abstractimpl +package eu.depau.etchdroid.utils.worker.impl -import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO const val UPDATE_INTERVAL = 500 diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt new file mode 100644 index 0000000..9b4bc5e --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt @@ -0,0 +1,28 @@ +package eu.depau.etchdroid.utils.worker.impl + +import eu.depau.etchdroid.utils.worker.IProgressListener +import eu.depau.etchdroid.utils.worker.IProgressSender +import eu.depau.etchdroid.utils.worker.dto.ProgressDoneDTO +import eu.depau.etchdroid.utils.worker.dto.ProgressStartDTO +import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO + + +abstract class AbstractProgressSender : IProgressSender { + private val listeners = ArrayList() + + override fun attachProgressListener(listener: IProgressListener) = + listeners.add(listener) + + override fun detachProgressListener(listener: IProgressListener) = + listeners.remove(listener) + + // TODO: fix +// protected fun notifyStart(dto: ProgressStartDTO) = +// listeners.forEach { it.notifyActionStart() } + + protected fun notifyProgress(dto: ProgressUpdateDTO) = + listeners.forEach { it.notifyActionProgress(dto) } + +// protected fun notifyDone(dto: ProgressDoneDTO) = +// listeners.forEach { it.notifyActionDone() } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt deleted file mode 100644 index 3da2716..0000000 --- a/app/src/main/java/eu/depau/etchdroid/worker/IAsyncWorker.kt +++ /dev/null @@ -1,6 +0,0 @@ -package eu.depau.etchdroid.worker - -interface IAsyncWorker: IProgressSender { - fun run() - fun runStep(): Boolean -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/IProgressListener.kt b/app/src/main/java/eu/depau/etchdroid/worker/IProgressListener.kt deleted file mode 100644 index 2682cef..0000000 --- a/app/src/main/java/eu/depau/etchdroid/worker/IProgressListener.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.depau.etchdroid.worker - -import eu.depau.etchdroid.worker.dto.ProgressDoneDTO -import eu.depau.etchdroid.worker.dto.ProgressStartDTO -import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO - -interface IProgressListener { - fun notifyStart(dto: ProgressStartDTO) - fun notifyProgress(dto: ProgressUpdateDTO) - fun notifyDone(dto: ProgressDoneDTO) -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAsyncWorker.kt deleted file mode 100644 index 53fbebe..0000000 --- a/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractAsyncWorker.kt +++ /dev/null @@ -1,10 +0,0 @@ -package eu.depau.etchdroid.worker.abstractimpl - -import eu.depau.etchdroid.worker.IAsyncWorker - -abstract class AbstractAsyncWorker : IAsyncWorker, AbstractProgressSender() { - override fun run() { - while (runStep()) { - } - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractProgressSender.kt deleted file mode 100644 index a96c6ec..0000000 --- a/app/src/main/java/eu/depau/etchdroid/worker/abstractimpl/AbstractProgressSender.kt +++ /dev/null @@ -1,26 +0,0 @@ -package eu.depau.etchdroid.worker.abstractimpl - -import eu.depau.etchdroid.worker.IProgressListener -import eu.depau.etchdroid.worker.IProgressSender -import eu.depau.etchdroid.worker.dto.ProgressDoneDTO -import eu.depau.etchdroid.worker.dto.ProgressStartDTO -import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO - -abstract class AbstractProgressSender : IProgressSender { - private val listeners = ArrayList() - - override fun attachProgressListener(listener: IProgressListener) = - listeners.add(listener) - - override fun detachProgressListener(listener: IProgressListener) = - listeners.remove(listener) - - protected fun notifyStart(dto: ProgressStartDTO) = - listeners.forEach { it.notifyStart(dto) } - - protected fun notifyProgress(dto: ProgressUpdateDTO) = - listeners.forEach { it.notifyProgress(dto) } - - protected fun notifyDone(dto: ProgressDoneDTO) = - listeners.forEach { it.notifyDone(dto) } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/impl/BroadcastProgressForwarder.kt b/app/src/main/java/eu/depau/etchdroid/worker/impl/BroadcastProgressForwarder.kt deleted file mode 100644 index f5d25f9..0000000 --- a/app/src/main/java/eu/depau/etchdroid/worker/impl/BroadcastProgressForwarder.kt +++ /dev/null @@ -1,29 +0,0 @@ -package eu.depau.etchdroid.worker.impl - -import android.content.Context -import eu.depau.etchdroid.worker.IProgressListener -import eu.depau.etchdroid.worker.dto.ProgressDoneDTO -import eu.depau.etchdroid.worker.dto.ProgressStartDTO -import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO - -class BroadcastProgressForwarder( - val jobId: Long, - val context: Context - - ): IProgressListener { - override fun notifyStart(dto: ProgressStartDTO) { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. - } - - override fun notifyProgress(dto: ProgressUpdateDTO) { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. - } - - override fun notifyDone(dto: ProgressDoneDTO) { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. - } - - fun stopForwarding() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt b/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt deleted file mode 100644 index 5cfcae1..0000000 --- a/app/src/main/java/eu/depau/etchdroid/worker/impl/Dmg2OutputStreamConvertAsyncService.kt +++ /dev/null @@ -1,13 +0,0 @@ -package eu.depau.etchdroid.worker.impl - -import eu.depau.etchdroid.worker.abstractimpl.AbstractAutoProgressAsyncWorker -import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO - -class Dmg2OutputStreamConvertAsyncService(private val totalToDo: Long): AbstractAutoProgressAsyncWorker(totalToDo) { - override val progressUpdateDTO: ProgressUpdateDTO - get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. - - override fun runStep(): Boolean { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt b/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt new file mode 100644 index 0000000..7473e5e --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt @@ -0,0 +1,24 @@ +package eu.depau.etchdroid.workers + +import android.content.Context +import android.net.Uri +import eu.depau.etchdroid.utils.imagetypes.DMGImage +import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO +import java.io.OutputStream + + +class Dmg2OutputStreamConvertAsyncService private constructor( + private val i2oStreamWorker: Input2OutputStreamCopyAsyncWorker +) : IMergedAsyncWorkerProgressSender by i2oStreamWorker { + + constructor(context: Context, + sourceDmgUri: Uri, + dest: OutputStream, + chunkSize: Int, + progressUpdateDTO: ProgressUpdateDTO) : this( + DMGImage.getRawImageInputStream(context, sourceDmgUri).let { + Input2OutputStreamCopyAsyncWorker(it, dest, chunkSize, progressUpdateDTO, it.size) + } + ) + +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/IMergedAsyncWorkerProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/workers/IMergedAsyncWorkerProgressSender.kt new file mode 100644 index 0000000..e908709 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/workers/IMergedAsyncWorkerProgressSender.kt @@ -0,0 +1,7 @@ +package eu.depau.etchdroid.workers + +import eu.depau.etchdroid.utils.worker.IAsyncWorker +import eu.depau.etchdroid.utils.worker.IProgressSender + + +internal interface IMergedAsyncWorkerProgressSender: IAsyncWorker, IProgressSender \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt similarity index 69% rename from app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt rename to app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt index 7aef9d6..e8b10ec 100644 --- a/app/src/main/java/eu/depau/etchdroid/worker/impl/Input2OutputStreamCopyAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt @@ -1,7 +1,7 @@ -package eu.depau.etchdroid.worker.impl +package eu.depau.etchdroid.workers -import eu.depau.etchdroid.worker.abstractimpl.AbstractAutoProgressAsyncWorker -import eu.depau.etchdroid.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker import java.io.InputStream import java.io.OutputStream @@ -12,7 +12,7 @@ open class Input2OutputStreamCopyAsyncWorker( chunkSize: Int, override val progressUpdateDTO: ProgressUpdateDTO, size: Long -) : AbstractAutoProgressAsyncWorker(size) { +) : IMergedAsyncWorkerProgressSender, AbstractAutoProgressAsyncWorker(size) { private val buffer = ByteArray(chunkSize) diff --git a/app/src/main/java/eu/depau/etchdroid/workers/ProgressBroadcastForwarder.kt b/app/src/main/java/eu/depau/etchdroid/workers/ProgressBroadcastForwarder.kt new file mode 100644 index 0000000..31e2bb5 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/workers/ProgressBroadcastForwarder.kt @@ -0,0 +1,111 @@ +package eu.depau.etchdroid.workers + +import android.content.Context +import android.util.Log +import eu.depau.etchdroid.db.EtchDroidDatabase +import eu.depau.etchdroid.utils.worker.IProgressForwarder +import eu.depau.etchdroid.utils.worker.IProgressListener +import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO + + +const val TAG = ".w.ProgBcastFwd" + +// TODO: implement class stubs + +/** + * This class is subscribed to IAsyncWorker+IProgressSender events by the worker service. + * It is aware of the current JobProcedure (in fact, it retrieves it by ID from the database). + * + * It tracks + */ +class ProgressBroadcastForwarder(private val context: Context) : IProgressListener, IProgressForwarder { + + var jobId: Long = -1 + + private val db = EtchDroidDatabase.getDatabase(context) + private val jobEntity = db.jobRepository().getById(jobId) + + private val totalProgressWeights = jobEntity.jobProcedure.map { it.progressWeight }.sum() + + private var currentActionIdx: Int? = null + private var prevActionsProgressWeight: Double? = null + + private fun assertProcedureStarted() { + if (currentActionIdx == null || prevActionsProgressWeight == null) { + throw IllegalStateException("Call to a .notify*() method without a call to .notifyProcedureStart()") + } + } + + /** + * Called by the worker service to notify the forwarder that the currently referenced procedure + * is starting. + */ + override fun notifyProcedureStart(startActionIndex: Int) { + currentActionIdx = startActionIndex + prevActionsProgressWeight = jobEntity.jobProcedure + .subList(0, currentActionIdx!!) + .map { it.progressWeight } + .sum() + } + + + /** + * Called by the worker service to notify the forwarder that the currently referenced procedure + * has finished successfully. + */ + override fun notifyProcedureDone() { + assertProcedureStarted() + // TODO: stub + Log.d(TAG, "notifyProcedureDone job $jobId ACTION $currentActionIdx") + } + + /** + * Called by the worker service to notify the forwarder that the currently referenced procedure + * has failed with the provided exception. + */ + override fun notifyProcedureError(error: Exception) { + assertProcedureStarted() + // TODO: stub + Log.d(TAG, "notifyProcedureError job $jobId ACTION $currentActionIdx", error) + } + + /** + * Called by the current worker to update the progress listener on its status relative to + * the current JobAction that describes its task. + * + * @param dto a ProgressUpdateDTO describing the current status of the worker + */ + override fun notifyActionProgress(dto: ProgressUpdateDTO) { + assertProcedureStarted() + // TODO: stub + Log.d(TAG, "notifyActionProgress job $jobId ACTION $currentActionIdx dto $dto") + } + + /** + * Called by the worker service to update the forwarder on the current ACTION index. + * + * @param actionIndex the current ACTION index within the JobProcedure + */ + override fun notifyActionStart(actionIndex: Int) { + assertProcedureStarted() + currentActionIdx = actionIndex + prevActionsProgressWeight = prevActionsProgressWeight!!.plus(jobEntity.jobProcedure[actionIndex].progressWeight) + + // TODO: stub + Log.d(TAG, "notifyActionStart job $jobId ACTION $currentActionIdx") + } + + /** + * Called by the worker service to notify the forwarder that the current ACTION has finished + * running. Whether it has finished successfully or not is unspecified. + * + * If it failed, a call to notifyProcedureError will follow with an Exception reference. + */ + override fun notifyActionDone() { + assertProcedureStarted() + // TODO: stub + Log.d(TAG, "notifyActionDone job $jobId ACTION $currentActionIdx") + } + + +} \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 152305a..fd40472 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -153,5 +153,10 @@ An application to write OS images to USB drives, on Android, no root required. Buy me a coffee + Used to show the progress of the current job + Job progress + Job outcome + Used to show a completed job outcome + Starting job... diff --git a/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt b/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt new file mode 100644 index 0000000..a2338af --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt @@ -0,0 +1,113 @@ +package eu.depau.etchdroid.services + +import android.app.NotificationManager +import android.content.Context +import android.content.Intent +import eu.depau.etchdroid.AppBuildConfig +import eu.depau.etchdroid.db.EtchDroidDatabase +import eu.depau.etchdroid.db.entity.Job +import eu.depau.etchdroid.db.repository.JobRepository +import eu.depau.etchdroid.services.dto.JobServiceIntentDTO +import eu.depau.etchdroid.testutils.job.MockJobAction +import eu.depau.etchdroid.testutils.worker.MockJobWorker +import eu.depau.etchdroid.utils.job.impl.JobProcedure +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito +import org.mockito.Mockito.* +import org.mockito.junit.MockitoJUnitRunner +import java.util.* +import kotlin.math.abs + +@RunWith(MockitoJUnitRunner::class) +internal class JobServiceTest { + private var service: JobService? = null + private var appContext: Context? = null + private var mockContext: Context? = null + private var jobRepo: JobRepository? = null + private var random = Random() + + @Before + fun setUp() { + appContext = mock(Context::class.java) + mockContext = mock(Context::class.java) + + jobRepo = mock(JobRepository::class.java) + + val db = mock(EtchDroidDatabase::class.java) + Mockito + .`when`(db.jobRepository()) + .thenReturn(jobRepo!!) + + EtchDroidDatabase::class.java + .getDeclaredMethod("access\$setINSTANCE\$cp", EtchDroidDatabase::class.java) + .apply { isAccessible = true } + .invoke(null, db) + AppBuildConfig.TEST_BUILD = true + + service = spy(JobService::class.java) + Mockito + .doReturn(mock(NotificationManager::class.java)) + .`when`(service!!).getSystemService(Context.NOTIFICATION_SERVICE) + Mockito + .doReturn("Mock string") + .`when`(service!!).getString(anyInt()) + Mockito + .doNothing() + .`when`(service!!).startForeground(anyInt(), any()) + Mockito + .doNothing() + .`when`(service!!).stopForeground(anyBoolean()) + + } + + @Test + fun testBasicFlow() { + val jobProcedure = JobProcedure(-1).apply { + add(MockJobAction(1, 1.0)) + add(MockJobAction(2, 1.0)) + } + val job = Job( + jobId = abs(random.nextInt().toLong()), + jobProcedure = jobProcedure + ) + val jobId = job.jobId + + Mockito + .`when`(jobRepo!!.getById(jobId)) + .thenReturn(job) + + val serviceIntent = mock(Intent::class.java) as Intent + + Mockito + .doReturn(JobServiceIntentDTO(jobId)) + .`when`(serviceIntent).getParcelableExtra(JobServiceIntentDTO.EXTRA) + + service!!::class.java + .getDeclaredMethod("onHandleIntent", Intent::class.java) + .apply { isAccessible = true } + .invoke(service, serviceIntent) + + + val mockWorkers = jobProcedure + .map { it.getWorker() as MockJobWorker } + .toTypedArray() + + val inOrder = Mockito.inOrder(*mockWorkers, service) + + inOrder + .verify(service!!, times(1)) + .startForeground(anyInt(), any()) + + for (mockWorker in mockWorkers) { + inOrder + .verify(mockWorker, times(mockWorker.steps)) + .runStep() + } + + inOrder + .verify(service!!, times(1)) + .stopForeground(anyBoolean()) + } +} \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt new file mode 100644 index 0000000..7b455cc --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt @@ -0,0 +1,60 @@ +package eu.depau.etchdroid.testutils.job + +import android.os.Parcel +import eu.depau.etchdroid.testutils.worker.MockJobWorker +import eu.depau.etchdroid.utils.StringResBuilder +import eu.depau.etchdroid.utils.job.IJobAction +import eu.depau.etchdroid.utils.worker.IAsyncWorker +import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.utils.worker.enums.RateUnit +import eu.depau.kotlet.android.parcelable.KotletParcelable +import eu.depau.kotlet.android.parcelable.parcelableCreator +import org.mockito.Mockito + +class MockJobAction( + override val nameResId: Int, + override val progressWeight: Double +) : IJobAction, KotletParcelable { + + constructor(parcel: Parcel) : this( + parcel.readInt(), + parcel.readDouble() + ) + + private val lazyWorker by lazy { + Mockito.spy( + MockJobWorker( + // TODO: fix update dto so it doesn't have excess fields + ProgressUpdateDTO( + -1, 0, 0.0, + 0.0, 0, 0.0, + RateUnit.FURLONGS_PER_FORTNIGHT + ) + ) + ) + } + + override fun getWorker(): IAsyncWorker = lazyWorker + + /** + * Check action preconditions and return a list of StringResBuilders, which will then be + * built and rendered in the UI. + * + * @return a list of failed preconditions descriptions + */ + override fun checkPreconditions(): List { + TODO("not implemented") + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeInt(nameResId) + writeDouble(progressWeight) + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator(::MockJobAction) + } +} \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt new file mode 100644 index 0000000..92830d3 --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt @@ -0,0 +1,22 @@ +package eu.depau.etchdroid.testutils.worker + +import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker +import eu.depau.etchdroid.utils.worker.impl.UPDATE_INTERVAL + +open class MockJobWorker(override val progressUpdateDTO: ProgressUpdateDTO) : AbstractAutoProgressAsyncWorker(10) { + var counter = 0 + val steps = 10 + val sleepTime = (UPDATE_INTERVAL * 2.2 / steps).toLong() + + /** + * Make the worker do one step. Returns whether there are more steps to do + * + * @return whether more work needs to be done + */ + override fun runStep(): Boolean { + counter++ + Thread.sleep(sleepTime) + return counter < steps + } +} \ No newline at end of file From 060bc5dc12ebf2e128be51dc5b19b232996c5cc2 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 19:55:33 +0200 Subject: [PATCH 27/85] Clean up progress DTOs --- .../services/{ => job}/JobService.kt | 4 +- .../job}/ProgressBroadcastForwarder.kt | 42 +++++++++---------- .../{ => job}/dto/JobServiceIntentDTO.kt | 2 +- .../IJobProgressListener.kt} | 19 +++++---- .../etchdroid/utils/worker/IProgressSender.kt | 4 +- ...Listener.kt => IWorkerProgressListener.kt} | 4 +- .../utils/worker/dto/ProgressDoneDTO.kt | 31 -------------- .../utils/worker/dto/ProgressStartDTO.kt | 40 ------------------ .../utils/worker/dto/ProgressUpdateDTO.kt | 24 +++-------- .../etchdroid/utils/worker/enums/ErrorType.kt | 11 ----- .../etchdroid/utils/worker/enums/JobType.kt | 9 ---- .../etchdroid/utils/worker/enums/StepType.kt | 8 ---- .../utils/worker/impl/AbstractAsyncWorker.kt | 3 +- .../impl/AbstractAutoProgressAsyncWorker.kt | 22 ++++++---- .../worker/impl/AbstractProgressSender.kt | 19 +++------ .../Dmg2OutputStreamConvertAsyncService.kt | 15 ++++--- .../Input2OutputStreamCopyAsyncWorker.kt | 5 +-- .../etchdroid/services/JobServiceTest.kt | 3 +- .../etchdroid/testutils/job/MockJobAction.kt | 18 +++----- .../testutils/worker/MockJobWorker.kt | 8 ++-- 20 files changed, 84 insertions(+), 207 deletions(-) rename app/src/main/java/eu/depau/etchdroid/services/{ => job}/JobService.kt (94%) rename app/src/main/java/eu/depau/etchdroid/{workers => services/job}/ProgressBroadcastForwarder.kt (70%) rename app/src/main/java/eu/depau/etchdroid/services/{ => job}/dto/JobServiceIntentDTO.kt (93%) rename app/src/main/java/eu/depau/etchdroid/utils/{worker/IProgressForwarder.kt => job/IJobProgressListener.kt} (69%) rename app/src/main/java/eu/depau/etchdroid/utils/worker/{IProgressListener.kt => IWorkerProgressListener.kt} (80%) delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressDoneDTO.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressStartDTO.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/enums/ErrorType.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/enums/JobType.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/enums/StepType.kt diff --git a/app/src/main/java/eu/depau/etchdroid/services/JobService.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt similarity index 94% rename from app/src/main/java/eu/depau/etchdroid/services/JobService.kt rename to app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt index de93888..e7babe2 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/JobService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt @@ -1,10 +1,10 @@ -package eu.depau.etchdroid.services +package eu.depau.etchdroid.services.job import android.app.IntentService import android.content.Intent import eu.depau.etchdroid.db.EtchDroidDatabase import eu.depau.etchdroid.notification.impl.JobServiceNotificationHandler -import eu.depau.etchdroid.services.dto.JobServiceIntentDTO +import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO open class JobService(name: String) : IntentService(name) { constructor() : this("TestJobService") diff --git a/app/src/main/java/eu/depau/etchdroid/workers/ProgressBroadcastForwarder.kt b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt similarity index 70% rename from app/src/main/java/eu/depau/etchdroid/workers/ProgressBroadcastForwarder.kt rename to app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt index 31e2bb5..9f69658 100644 --- a/app/src/main/java/eu/depau/etchdroid/workers/ProgressBroadcastForwarder.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt @@ -1,15 +1,12 @@ -package eu.depau.etchdroid.workers +package eu.depau.etchdroid.services.job import android.content.Context import android.util.Log import eu.depau.etchdroid.db.EtchDroidDatabase -import eu.depau.etchdroid.utils.worker.IProgressForwarder -import eu.depau.etchdroid.utils.worker.IProgressListener +import eu.depau.etchdroid.utils.job.IJobProgressListener +import eu.depau.etchdroid.utils.worker.IWorkerProgressListener import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO - -const val TAG = ".w.ProgBcastFwd" - // TODO: implement class stubs /** @@ -18,7 +15,7 @@ const val TAG = ".w.ProgBcastFwd" * * It tracks */ -class ProgressBroadcastForwarder(private val context: Context) : IProgressListener, IProgressForwarder { +class ProgressBroadcastForwarder(private val context: Context) : IJobProgressListener, IWorkerProgressListener { var jobId: Long = -1 @@ -32,15 +29,16 @@ class ProgressBroadcastForwarder(private val context: Context) : IProgressListen private fun assertProcedureStarted() { if (currentActionIdx == null || prevActionsProgressWeight == null) { - throw IllegalStateException("Call to a .notify*() method without a call to .notifyProcedureStart()") + throw IllegalStateException("Call to a .on*() method without a call to .onProcedureStart()") } } + /** * Called by the worker service to notify the forwarder that the currently referenced procedure * is starting. */ - override fun notifyProcedureStart(startActionIndex: Int) { + override fun onProcedureStart(startActionIndex: Int) { currentActionIdx = startActionIndex prevActionsProgressWeight = jobEntity.jobProcedure .subList(0, currentActionIdx!!) @@ -53,20 +51,20 @@ class ProgressBroadcastForwarder(private val context: Context) : IProgressListen * Called by the worker service to notify the forwarder that the currently referenced procedure * has finished successfully. */ - override fun notifyProcedureDone() { + override fun onProcedureDone() { assertProcedureStarted() // TODO: stub - Log.d(TAG, "notifyProcedureDone job $jobId ACTION $currentActionIdx") + Log.d(TAG, "onProcedureDone job $jobId ACTION $currentActionIdx") } /** * Called by the worker service to notify the forwarder that the currently referenced procedure * has failed with the provided exception. */ - override fun notifyProcedureError(error: Exception) { + override fun onProcedureError(error: Exception) { assertProcedureStarted() // TODO: stub - Log.d(TAG, "notifyProcedureError job $jobId ACTION $currentActionIdx", error) + Log.d(TAG, "onProcedureError job $jobId ACTION $currentActionIdx", error) } /** @@ -75,10 +73,10 @@ class ProgressBroadcastForwarder(private val context: Context) : IProgressListen * * @param dto a ProgressUpdateDTO describing the current status of the worker */ - override fun notifyActionProgress(dto: ProgressUpdateDTO) { + override fun onWorkerProgress(dto: ProgressUpdateDTO) { assertProcedureStarted() // TODO: stub - Log.d(TAG, "notifyActionProgress job $jobId ACTION $currentActionIdx dto $dto") + Log.d(TAG, "onWorkerProgress job $jobId ACTION $currentActionIdx dto $dto") } /** @@ -86,26 +84,28 @@ class ProgressBroadcastForwarder(private val context: Context) : IProgressListen * * @param actionIndex the current ACTION index within the JobProcedure */ - override fun notifyActionStart(actionIndex: Int) { + override fun onActionStart(actionIndex: Int) { assertProcedureStarted() currentActionIdx = actionIndex prevActionsProgressWeight = prevActionsProgressWeight!!.plus(jobEntity.jobProcedure[actionIndex].progressWeight) // TODO: stub - Log.d(TAG, "notifyActionStart job $jobId ACTION $currentActionIdx") + Log.d(TAG, "onActionStart job $jobId ACTION $currentActionIdx") } /** * Called by the worker service to notify the forwarder that the current ACTION has finished * running. Whether it has finished successfully or not is unspecified. * - * If it failed, a call to notifyProcedureError will follow with an Exception reference. + * If it failed, a call to onProcedureError will follow with an Exception reference. */ - override fun notifyActionDone() { + override fun onActionDone() { assertProcedureStarted() // TODO: stub - Log.d(TAG, "notifyActionDone job $jobId ACTION $currentActionIdx") + Log.d(TAG, "onActionDone job $jobId ACTION $currentActionIdx") } - + companion object { + const val TAG = ".w.ProgBcastFwd" + } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/dto/JobServiceIntentDTO.kt b/app/src/main/java/eu/depau/etchdroid/services/job/dto/JobServiceIntentDTO.kt similarity index 93% rename from app/src/main/java/eu/depau/etchdroid/services/dto/JobServiceIntentDTO.kt rename to app/src/main/java/eu/depau/etchdroid/services/job/dto/JobServiceIntentDTO.kt index 5eea75e..04a7fbe 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/dto/JobServiceIntentDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/dto/JobServiceIntentDTO.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.services.dto +package eu.depau.etchdroid.services.job.dto import android.os.Parcel import eu.depau.kotlet.android.parcelable.KotletParcelable diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressForwarder.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressListener.kt similarity index 69% rename from app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressForwarder.kt rename to app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressListener.kt index 534ad6c..690bcf5 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressForwarder.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressListener.kt @@ -1,20 +1,23 @@ -package eu.depau.etchdroid.utils.worker +package eu.depau.etchdroid.utils.job -interface IProgressForwarder { +/** + * Base interface for a class that listens to progress events from a JobService + */ +interface IJobProgressListener { /** * Called by the worker service to update the forwarder on the current ACTION index. * * @param actionIndex the current ACTION index within the JobProcedure */ - fun notifyActionStart(actionIndex: Int) + fun onActionStart(actionIndex: Int) /** * Called by the worker service to notify the forwarder that the current ACTION has finished * running. Whether it has finished successfully or not is unspecified. * - * If it failed, a call to notifyProcedureError will follow with an Exception reference. + * If it failed, a call to onProcedureError will follow with an Exception reference. */ - fun notifyActionDone() + fun onActionDone() /** * Called by the worker service to notify the forwarder that the currently referenced procedure @@ -23,17 +26,17 @@ interface IProgressForwarder { * @param startActionIndex the ACTION index the procedure is starting with (which is > 0 if it's * being bootstrapped from a checkpoint) */ - fun notifyProcedureStart(startActionIndex: Int = 0) + fun onProcedureStart(startActionIndex: Int = 0) /** * Called by the worker service to notify the forwarder that the currently referenced procedure * has finished successfully. */ - fun notifyProcedureDone() + fun onProcedureDone() /** * Called by the worker service to notify the forwarder that the currently referenced procedure * has failed with the provided exception. */ - fun notifyProcedureError(error: java.lang.Exception) + fun onProcedureError(error: java.lang.Exception) } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt index 736c53f..cd7dbb9 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt @@ -1,6 +1,6 @@ package eu.depau.etchdroid.utils.worker interface IProgressSender { - fun attachProgressListener(listener: IProgressListener): Boolean - fun detachProgressListener(listener: IProgressListener): Boolean + fun attachProgressListener(listener: IWorkerProgressListener): Boolean + fun detachProgressListener(listener: IWorkerProgressListener): Boolean } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressListener.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressListener.kt similarity index 80% rename from app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressListener.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressListener.kt index 0f25595..f578f74 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressListener.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressListener.kt @@ -2,12 +2,12 @@ package eu.depau.etchdroid.utils.worker import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO -interface IProgressListener { +interface IWorkerProgressListener { /** * Called by the current worker to update the progress listener on its status relative to * the current JobAction that describes its task. * * @param dto a ProgressUpdateDTO describing the current status of the worker */ - fun notifyActionProgress(dto: ProgressUpdateDTO) + fun onWorkerProgress(dto: ProgressUpdateDTO) } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressDoneDTO.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressDoneDTO.kt deleted file mode 100644 index 0b1a46a..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressDoneDTO.kt +++ /dev/null @@ -1,31 +0,0 @@ -package eu.depau.etchdroid.utils.worker.dto - -import android.os.Parcel -import android.os.Parcelable -import eu.depau.etchdroid.utils.worker.enums.ErrorType -import eu.depau.kotlet.android.parcelable.* - -data class ProgressDoneDTO( - val jobId: Long, - val error: ErrorType?, - val errorData: Parcelable? -) : KotletParcelable { - constructor(parcel: Parcel) : this( - jobId = parcel.readLong(), - error = parcel.readNullable { parcel.readEnum() }, - errorData = parcel.readNullable { parcel.readParcelable(Parcelable::class.java.classLoader) as Parcelable? } - ) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.apply { - writeLong(jobId) - writeNullable(error) { writeEnum(it) } - writeNullable(errorData) { writeParcelable(errorData, flags) } - } - } - - companion object { - @JvmField - val CREATOR = parcelableCreator(::ProgressDoneDTO) - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressStartDTO.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressStartDTO.kt deleted file mode 100644 index 0ce983c..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressStartDTO.kt +++ /dev/null @@ -1,40 +0,0 @@ -package eu.depau.etchdroid.utils.worker.dto - -import android.os.Parcel -import eu.depau.etchdroid.utils.worker.enums.JobType -import eu.depau.kotlet.android.parcelable.KotletParcelable -import eu.depau.kotlet.android.parcelable.parcelableCreator -import eu.depau.kotlet.android.parcelable.readEnum -import eu.depau.kotlet.android.parcelable.writeEnum - -data class ProgressStartDTO( - val jobId: Long, - val jobType: JobType, - val inputName: String, - val outputName: String, - val stepsNamesResIDs: List -) : KotletParcelable { - @Suppress("UNCHECKED_CAST") - constructor(parcel: Parcel) : this( - jobId = parcel.readLong(), - jobType = parcel.readEnum()!!, - inputName = parcel.readString()!!, - outputName = parcel.readString()!!, - stepsNamesResIDs = (parcel.readSerializable() as Array).asList() - ) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.apply { - writeLong(jobId) - writeEnum(jobType) - writeString(inputName) - writeString(outputName) - writeSerializable(stepsNamesResIDs.toTypedArray()) - } - } - - companion object { - @JvmField - val CREATOR = parcelableCreator(::ProgressStartDTO) - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt index 429cbb1..b7f1142 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt @@ -5,32 +5,20 @@ import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.kotlet.android.parcelable.* data class ProgressUpdateDTO( - val jobId: Long, - val currentStep: Int, - val jobProgress: Double, - val stepProgress: Double?, - val timeRemaining: Long?, - val currentRate: Double?, + val progress: Double?, + val rate: Double?, val rateUnit: RateUnit? ) : KotletParcelable { constructor(parcel: Parcel) : this( - jobId = parcel.readLong(), - currentStep = parcel.readInt(), - jobProgress = parcel.readDouble(), - stepProgress = parcel.readNullable { parcel.readDouble() }, - timeRemaining = parcel.readNullable { parcel.readLong() }, - currentRate = parcel.readNullable { parcel.readDouble() }, + progress = parcel.readNullable { parcel.readDouble() }, + rate = parcel.readNullable { parcel.readDouble() }, rateUnit = parcel.readNullable { parcel.readEnum() } ) override fun writeToParcel(parcel: Parcel, flags: Int) { parcel.apply { - writeLong(jobId) - writeInt(currentStep) - writeDouble(jobProgress) - writeNullable(stepProgress) { writeDouble(it) } - writeNullable(timeRemaining) { writeLong(it) } - writeNullable(currentRate) { writeDouble(it) } + writeNullable(progress) { writeDouble(it) } + writeNullable(rate) { writeDouble(it) } writeNullable(rateUnit) { writeEnum(rateUnit) } } } diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/ErrorType.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/ErrorType.kt deleted file mode 100644 index 3871bee..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/ErrorType.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.depau.etchdroid.utils.worker.enums - -enum class ErrorType { - UNPLUGGED, - INPUT_FORMAT_ERROR, - ENOSPC_ON_USB, - ENOSPC_ON_DEVICE, - PERMISSION_DENIED_ANDROID, - PERMISSION_DENIED_FS, - PERMISSION_DENIED_USB -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/JobType.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/JobType.kt deleted file mode 100644 index 7ce6b3b..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/JobType.kt +++ /dev/null @@ -1,9 +0,0 @@ -package eu.depau.etchdroid.utils.worker.enums - -enum class JobType { - FLASH_RAW_IMAGE, - FLASH_DMG, - FLASH_ELTORITO, - DUMP_RAW_IMAGE, - CREATE_WINDOWS_INSTALLER -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/StepType.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/StepType.kt deleted file mode 100644 index d658c10..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/StepType.kt +++ /dev/null @@ -1,8 +0,0 @@ -package eu.depau.etchdroid.utils.worker.enums - -enum class StepType { - STREAM_COPY, - FORMAT_DRIVE, - COPY_FILES, - INSTALL_BOOTLOADER -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt index 026618c..a0423fc 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt @@ -2,5 +2,4 @@ package eu.depau.etchdroid.utils.worker.impl import eu.depau.etchdroid.utils.worker.IAsyncWorker -abstract class AbstractAsyncWorker : IAsyncWorker, AbstractProgressSender() { -} \ No newline at end of file +abstract class AbstractAsyncWorker : IAsyncWorker, AbstractProgressSender() \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt index 1b19429..a69865a 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt @@ -1,11 +1,13 @@ package eu.depau.etchdroid.utils.worker.impl import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.utils.worker.enums.RateUnit -const val UPDATE_INTERVAL = 500 -abstract class AbstractAutoProgressAsyncWorker(private val totalToDo: Long) : AbstractAsyncWorker() { - abstract val progressUpdateDTO: ProgressUpdateDTO +abstract class AbstractAutoProgressAsyncWorker( + private val totalToDo: Long, + private val rateUnit: RateUnit +) : AbstractAsyncWorker() { private var doneAccumulator = 0L private var doneSinceLastUpdate = 0L @@ -23,13 +25,11 @@ abstract class AbstractAutoProgressAsyncWorker(private val totalToDo: Long) : Ab if (currentTime > lastUpdateTime + UPDATE_INTERVAL) { val progress = doneAccumulator.toDouble() / totalToDo val speedUnitPerMillis = doneSinceLastUpdate.toDouble() / (currentTime - lastUpdateTime) - val timeRemainingMillis: Long = ((totalToDo - doneAccumulator) / speedUnitPerMillis).toLong() - val dto = progressUpdateDTO.copy( - jobProgress = progress, - stepProgress = progress, - timeRemaining = timeRemainingMillis, - currentRate = speedUnitPerMillis * 1000 + val dto = ProgressUpdateDTO( + progress = progress, + rate = speedUnitPerMillis * 1000, + rateUnit = rateUnit ) notifyProgress(dto) @@ -38,4 +38,8 @@ abstract class AbstractAutoProgressAsyncWorker(private val totalToDo: Long) : Ab lastUpdateTime = currentTime } } + + companion object { + const val UPDATE_INTERVAL = 500 + } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt index 9b4bc5e..f012aea 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt @@ -1,28 +1,19 @@ package eu.depau.etchdroid.utils.worker.impl -import eu.depau.etchdroid.utils.worker.IProgressListener import eu.depau.etchdroid.utils.worker.IProgressSender -import eu.depau.etchdroid.utils.worker.dto.ProgressDoneDTO -import eu.depau.etchdroid.utils.worker.dto.ProgressStartDTO +import eu.depau.etchdroid.utils.worker.IWorkerProgressListener import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO abstract class AbstractProgressSender : IProgressSender { - private val listeners = ArrayList() + private val listeners = ArrayList() - override fun attachProgressListener(listener: IProgressListener) = + override fun attachProgressListener(listener: IWorkerProgressListener) = listeners.add(listener) - override fun detachProgressListener(listener: IProgressListener) = + override fun detachProgressListener(listener: IWorkerProgressListener) = listeners.remove(listener) - // TODO: fix -// protected fun notifyStart(dto: ProgressStartDTO) = -// listeners.forEach { it.notifyActionStart() } - protected fun notifyProgress(dto: ProgressUpdateDTO) = - listeners.forEach { it.notifyActionProgress(dto) } - -// protected fun notifyDone(dto: ProgressDoneDTO) = -// listeners.forEach { it.notifyActionDone() } + listeners.forEach { it.onWorkerProgress(dto) } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt b/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt index 7473e5e..db9df80 100644 --- a/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt +++ b/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt @@ -3,7 +3,6 @@ package eu.depau.etchdroid.workers import android.content.Context import android.net.Uri import eu.depau.etchdroid.utils.imagetypes.DMGImage -import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO import java.io.OutputStream @@ -11,14 +10,14 @@ class Dmg2OutputStreamConvertAsyncService private constructor( private val i2oStreamWorker: Input2OutputStreamCopyAsyncWorker ) : IMergedAsyncWorkerProgressSender by i2oStreamWorker { - constructor(context: Context, - sourceDmgUri: Uri, - dest: OutputStream, - chunkSize: Int, - progressUpdateDTO: ProgressUpdateDTO) : this( + constructor( + context: Context, + sourceDmgUri: Uri, + dest: OutputStream, + chunkSize: Int + ) : this( DMGImage.getRawImageInputStream(context, sourceDmgUri).let { - Input2OutputStreamCopyAsyncWorker(it, dest, chunkSize, progressUpdateDTO, it.size) + Input2OutputStreamCopyAsyncWorker(it, dest, chunkSize, it.size) } ) - } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt index e8b10ec..9feef19 100644 --- a/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt @@ -1,6 +1,6 @@ package eu.depau.etchdroid.workers -import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker import java.io.InputStream import java.io.OutputStream @@ -10,9 +10,8 @@ open class Input2OutputStreamCopyAsyncWorker( private val source: InputStream, private val dest: OutputStream, chunkSize: Int, - override val progressUpdateDTO: ProgressUpdateDTO, size: Long -) : IMergedAsyncWorkerProgressSender, AbstractAutoProgressAsyncWorker(size) { +) : IMergedAsyncWorkerProgressSender, AbstractAutoProgressAsyncWorker(size, RateUnit.BYTES_PER_SECOND) { private val buffer = ByteArray(chunkSize) diff --git a/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt b/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt index a2338af..0daa5b8 100644 --- a/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt @@ -7,7 +7,8 @@ import eu.depau.etchdroid.AppBuildConfig import eu.depau.etchdroid.db.EtchDroidDatabase import eu.depau.etchdroid.db.entity.Job import eu.depau.etchdroid.db.repository.JobRepository -import eu.depau.etchdroid.services.dto.JobServiceIntentDTO +import eu.depau.etchdroid.services.job.JobService +import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO import eu.depau.etchdroid.testutils.job.MockJobAction import eu.depau.etchdroid.testutils.worker.MockJobWorker import eu.depau.etchdroid.utils.job.impl.JobProcedure diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt index 7b455cc..7b4a1a5 100644 --- a/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt +++ b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt @@ -5,8 +5,6 @@ import eu.depau.etchdroid.testutils.worker.MockJobWorker import eu.depau.etchdroid.utils.StringResBuilder import eu.depau.etchdroid.utils.job.IJobAction import eu.depau.etchdroid.utils.worker.IAsyncWorker -import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO -import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.kotlet.android.parcelable.KotletParcelable import eu.depau.kotlet.android.parcelable.parcelableCreator import org.mockito.Mockito @@ -22,19 +20,13 @@ class MockJobAction( ) private val lazyWorker by lazy { - Mockito.spy( - MockJobWorker( - // TODO: fix update dto so it doesn't have excess fields - ProgressUpdateDTO( - -1, 0, 0.0, - 0.0, 0, 0.0, - RateUnit.FURLONGS_PER_FORTNIGHT - ) - ) - ) + Mockito.spy(MockJobWorker()) } - override fun getWorker(): IAsyncWorker = lazyWorker + override fun getWorker(): IAsyncWorker { + println("Retrieved worker for Action with nameResId $nameResId") + return lazyWorker + } /** * Check action preconditions and return a list of StringResBuilders, which will then be diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt index 92830d3..24969e6 100644 --- a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt +++ b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt @@ -1,13 +1,12 @@ package eu.depau.etchdroid.testutils.worker -import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO +import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker -import eu.depau.etchdroid.utils.worker.impl.UPDATE_INTERVAL -open class MockJobWorker(override val progressUpdateDTO: ProgressUpdateDTO) : AbstractAutoProgressAsyncWorker(10) { +open class MockJobWorker : AbstractAutoProgressAsyncWorker(10, RateUnit.FURLONGS_PER_FORTNIGHT) { var counter = 0 val steps = 10 - val sleepTime = (UPDATE_INTERVAL * 2.2 / steps).toLong() + private val sleepTime = (UPDATE_INTERVAL * 2.2 / steps).toLong() /** * Make the worker do one step. Returns whether there are more steps to do @@ -16,6 +15,7 @@ open class MockJobWorker(override val progressUpdateDTO: ProgressUpdateDTO) : Ab */ override fun runStep(): Boolean { counter++ + println("Worker counts $counter/$steps") Thread.sleep(sleepTime) return counter < steps } From 71978e6fc6923df56ce450fc3afef60c2afcb853 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 20:07:41 +0200 Subject: [PATCH 28/85] Add comments to JobServiceTest --- .../etchdroid/services/JobServiceTest.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt b/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt index 0daa5b8..49a5a6e 100644 --- a/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt @@ -24,35 +24,37 @@ import kotlin.math.abs @RunWith(MockitoJUnitRunner::class) internal class JobServiceTest { private var service: JobService? = null - private var appContext: Context? = null private var mockContext: Context? = null private var jobRepo: JobRepository? = null private var random = Random() @Before fun setUp() { - appContext = mock(Context::class.java) - mockContext = mock(Context::class.java) + // Used by JobServiceNotificationHandler to avoid building real notifications when testing + AppBuildConfig.TEST_BUILD = true + mockContext = mock(Context::class.java) jobRepo = mock(JobRepository::class.java) + // Inject mock JobRepository into database mock instance val db = mock(EtchDroidDatabase::class.java) Mockito .`when`(db.jobRepository()) .thenReturn(jobRepo!!) + // Duct tape-inject database instance into database companion object EtchDroidDatabase::class.java .getDeclaredMethod("access\$setINSTANCE\$cp", EtchDroidDatabase::class.java) .apply { isAccessible = true } .invoke(null, db) - AppBuildConfig.TEST_BUILD = true + // Create a clean JobService and mock its Android framework methods service = spy(JobService::class.java) Mockito .doReturn(mock(NotificationManager::class.java)) .`when`(service!!).getSystemService(Context.NOTIFICATION_SERVICE) Mockito - .doReturn("Mock string") + .doReturn("penis") .`when`(service!!).getString(anyInt()) Mockito .doNothing() @@ -65,6 +67,7 @@ internal class JobServiceTest { @Test fun testBasicFlow() { + // Create mock job val jobProcedure = JobProcedure(-1).apply { add(MockJobAction(1, 1.0)) add(MockJobAction(2, 1.0)) @@ -75,22 +78,24 @@ internal class JobServiceTest { ) val jobId = job.jobId + // Add job to mock Repository Mockito .`when`(jobRepo!!.getById(jobId)) .thenReturn(job) + // Create mock Intent to pass to the service val serviceIntent = mock(Intent::class.java) as Intent - Mockito .doReturn(JobServiceIntentDTO(jobId)) .`when`(serviceIntent).getParcelableExtra(JobServiceIntentDTO.EXTRA) + // Pass it to onHandleIntent (with reflection cause it's protected) service!!::class.java .getDeclaredMethod("onHandleIntent", Intent::class.java) .apply { isAccessible = true } .invoke(service, serviceIntent) - + // Check whether everything was called, in order val mockWorkers = jobProcedure .map { it.getWorker() as MockJobWorker } .toTypedArray() From 9e76d5ff22e79062f18f858c5a7e963534c2153c Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 20:08:15 +0200 Subject: [PATCH 29/85] Add more IDEA stuff to .gitignore so it doesn't bug me --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index daaeaef..adc4fda 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,8 @@ hs_err_pid* # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -.idea +.idea/ +.idea.*/ # Gradle and Maven with auto-import # When using Gradle or Maven with auto-import, you should exclude module files, From fdb88db3ae705acb9b3f6d423a65cedbc68238f6 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 22:24:24 +0200 Subject: [PATCH 30/85] Cleanup and add stub ProgressBroadcastForwarder --- .../services/job/JobIntentHandler.kt | 77 +++++++++++++++++++ .../etchdroid/services/job/JobService.kt | 55 ++----------- .../job/ProgressBroadcastForwarder.kt | 39 +++++----- .../utils/job/IJobProgressListener.kt | 4 +- .../etchdroid/utils/job/IJobProgressSender.kt | 6 ++ .../job/impl/AbstractJobProgressSender.kt | 29 +++++++ .../utils/ktexts/ServiceForeground.kt | 13 ++++ .../etchdroid/utils/worker/IAsyncWorker.kt | 2 +- .../etchdroid/utils/worker/IProgressSender.kt | 6 -- .../utils/worker/IWorkerProgressSender.kt | 6 ++ .../utils/worker/impl/AbstractAsyncWorker.kt | 2 +- .../impl/AbstractAutoProgressAsyncWorker.kt | 2 +- ...der.kt => AbstractWorkerProgressSender.kt} | 10 +-- .../IMergedAsyncWorkerProgressSender.kt | 4 +- ...ServiceTest.kt => JobIntentHandlerTest.kt} | 58 +++++++------- .../etchdroid/testutils/job/MockJobAction.kt | 12 ++- .../testutils/worker/MockJobWorker.kt | 7 +- 17 files changed, 209 insertions(+), 123 deletions(-) create mode 100644 app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressSender.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/job/impl/AbstractJobProgressSender.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/ServiceForeground.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressSender.kt rename app/src/main/java/eu/depau/etchdroid/utils/worker/impl/{AbstractProgressSender.kt => AbstractWorkerProgressSender.kt} (50%) rename app/src/test/java/eu/depau/etchdroid/services/{JobServiceTest.kt => JobIntentHandlerTest.kt} (73%) diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt new file mode 100644 index 0000000..ae66d12 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt @@ -0,0 +1,77 @@ +package eu.depau.etchdroid.services.job + +import eu.depau.etchdroid.db.EtchDroidDatabase +import eu.depau.etchdroid.db.entity.Job +import eu.depau.etchdroid.notification.impl.JobServiceNotificationHandler +import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO +import eu.depau.etchdroid.utils.job.IJobAction +import eu.depau.etchdroid.utils.job.IJobProcedure +import eu.depau.etchdroid.utils.job.impl.AbstractJobProgressSender +import eu.depau.etchdroid.utils.ktexts.runForeground +import eu.depau.etchdroid.utils.worker.IAsyncWorker + +class JobIntentHandler( + val context: JobService, + private val jobDTO: JobServiceIntentDTO +) : AbstractJobProgressSender() { + + private val jobId = jobDTO.jobId + private val broadcastForwarder = ProgressBroadcastForwarder(jobId, context) + private val svcNotificationHandler = JobServiceNotificationHandler(context) + private val notification = svcNotificationHandler.build() + private lateinit var job: Job + + init { + assert(jobId >= 0) { "Invalid jobId (jobId < 0)" } + } + + fun handle() = context.runForeground(jobId.toInt(), notification, true) { + val db = EtchDroidDatabase.getDatabase(context) + job = db.jobRepository().getById(jobId) + assert(!job.completed) { "Job $jobId already completed" } + + job.attachAndRun { procedure -> + procedure.forEachAction { index, action, worker -> + while (worker.runStep()) { + } + } + } + } + + + private inline fun Job.attachAndRun(body: (procedure: IJobProcedure) -> T): T { + attachJobProgressListener(broadcastForwarder) + try { + notifyJobProcedureStart(this.checkpointActionIndex ?: 0) + val result = body(this.jobProcedure) + notifyJobProcedureDone() + return result + } catch (t: Throwable) { + notifyJobProcedureError(t) + throw t + } finally { + detachJobProgressListener(broadcastForwarder) + } + } + + private inline fun IJobProcedure.forEachAction( + body: (index: Int, action: IJobAction, worker: IAsyncWorker) -> Unit + ) { + val startIndex = job.checkpointActionIndex ?: 0 + + (startIndex until size).forEach { index -> + + val action = this[index] + val worker = action.getWorker() + worker.attachWorkerProgressListener(broadcastForwarder) + + try { + broadcastForwarder.onActionStart(index) + body(index, action, worker) + broadcastForwarder.onActionDone() + } finally { + worker.detachWorkerProgressListener(broadcastForwarder) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt index e7babe2..98cc76d 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt @@ -2,58 +2,15 @@ package eu.depau.etchdroid.services.job import android.app.IntentService import android.content.Intent -import eu.depau.etchdroid.db.EtchDroidDatabase -import eu.depau.etchdroid.notification.impl.JobServiceNotificationHandler import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO +/** + * Job service. Creates an instance of and runs another class to prevent Android + * from reusing data in another thread + */ open class JobService(name: String) : IntentService(name) { - constructor() : this("TestJobService") - - private fun startProcedure(jobId: Long) { - - } - - private fun startAction(jobId: Long, actionIndex: Int) { - - } - override fun onHandleIntent(intent: Intent?) { - intent!! // Assert intent != null - val jobDTO = intent.getParcelableExtra(JobServiceIntentDTO.EXTRA) - val jobId = jobDTO.jobId - - assert(jobId >= 0) { "Invalid jobId (jobId < 0)" } - - val svcNotificationHandler = JobServiceNotificationHandler(this) - val notification = svcNotificationHandler.build() - startForeground(jobId.toInt(), notification) - - // TODO: Implement notification broadcast receiver and bind it here - // TODO: add and notify BroadcastProgressForwarder - - try { - val db = EtchDroidDatabase.getDatabase(this) - val job = db.jobRepository().getById(jobId) - assert(!job.completed) { "Job $jobId already completed" } - - val procedure = job.jobProcedure - // TODO: notify BroadcastProgressForwarder - startProcedure(jobId) - - for (i in 0 until procedure.size) { - val action = procedure[i] - startAction(jobId, i) - // TODO: notify BroadcastProgressForwarder - - val worker = action.getWorker() - while (worker.runStep()) { - } - - // TODO: notify BroadcastProgressForwarder - } - - } finally { - stopForeground(true) - } + val jobDTO = intent!!.getParcelableExtra(JobServiceIntentDTO.EXTRA) + JobIntentHandler(this, jobDTO).handle() } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt index 9f69658..0e08ceb 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt @@ -1,7 +1,6 @@ package eu.depau.etchdroid.services.job import android.content.Context -import android.util.Log import eu.depau.etchdroid.db.EtchDroidDatabase import eu.depau.etchdroid.utils.job.IJobProgressListener import eu.depau.etchdroid.utils.worker.IWorkerProgressListener @@ -10,14 +9,14 @@ import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO // TODO: implement class stubs /** - * This class is subscribed to IAsyncWorker+IProgressSender events by the worker service. + * This class is subscribed to IAsyncWorker+IWorkerProgressSender events by the worker service. * It is aware of the current JobProcedure (in fact, it retrieves it by ID from the database). * * It tracks */ -class ProgressBroadcastForwarder(private val context: Context) : IJobProgressListener, IWorkerProgressListener { - - var jobId: Long = -1 +class ProgressBroadcastForwarder( + private val jobId: Long, private val context: Context +) : IJobProgressListener, IWorkerProgressListener { private val db = EtchDroidDatabase.getDatabase(context) private val jobEntity = db.jobRepository().getById(jobId) @@ -44,6 +43,9 @@ class ProgressBroadcastForwarder(private val context: Context) : IJobProgressLis .subList(0, currentActionIdx!!) .map { it.progressWeight } .sum() + + println("-> onProcedureStart job $jobId, startAt $startActionIndex, " + + "currentAction $currentActionIdx, prevProgress: $prevActionsProgressWeight") } @@ -54,19 +56,22 @@ class ProgressBroadcastForwarder(private val context: Context) : IJobProgressLis override fun onProcedureDone() { assertProcedureStarted() // TODO: stub - Log.d(TAG, "onProcedureDone job $jobId ACTION $currentActionIdx") + println("-> onProcedureDone job $jobId action $currentActionIdx") } + /** * Called by the worker service to notify the forwarder that the currently referenced procedure * has failed with the provided exception. */ - override fun onProcedureError(error: Exception) { + override fun onProcedureError(error: Throwable) { assertProcedureStarted() // TODO: stub - Log.d(TAG, "onProcedureError job $jobId ACTION $currentActionIdx", error) + println("-> onProcedureError job $jobId action $currentActionIdx") + error.printStackTrace() } + /** * Called by the current worker to update the progress listener on its status relative to * the current JobAction that describes its task. @@ -76,13 +81,14 @@ class ProgressBroadcastForwarder(private val context: Context) : IJobProgressLis override fun onWorkerProgress(dto: ProgressUpdateDTO) { assertProcedureStarted() // TODO: stub - Log.d(TAG, "onWorkerProgress job $jobId ACTION $currentActionIdx dto $dto") + println(" -> onWorkerProgress job $jobId action $currentActionIdx dto $dto") } + /** - * Called by the worker service to update the forwarder on the current ACTION index. + * Called by the worker service to update the forwarder on the current action index. * - * @param actionIndex the current ACTION index within the JobProcedure + * @param actionIndex the current action index within the JobProcedure */ override fun onActionStart(actionIndex: Int) { assertProcedureStarted() @@ -90,11 +96,12 @@ class ProgressBroadcastForwarder(private val context: Context) : IJobProgressLis prevActionsProgressWeight = prevActionsProgressWeight!!.plus(jobEntity.jobProcedure[actionIndex].progressWeight) // TODO: stub - Log.d(TAG, "onActionStart job $jobId ACTION $currentActionIdx") + println(" -> onActionStart job $jobId action $currentActionIdx") } + /** - * Called by the worker service to notify the forwarder that the current ACTION has finished + * Called by the worker service to notify the forwarder that the current action has finished * running. Whether it has finished successfully or not is unspecified. * * If it failed, a call to onProcedureError will follow with an Exception reference. @@ -102,10 +109,6 @@ class ProgressBroadcastForwarder(private val context: Context) : IJobProgressLis override fun onActionDone() { assertProcedureStarted() // TODO: stub - Log.d(TAG, "onActionDone job $jobId ACTION $currentActionIdx") - } - - companion object { - const val TAG = ".w.ProgBcastFwd" + println(" -> onActionDone job $jobId action $currentActionIdx") } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressListener.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressListener.kt index 690bcf5..d474502 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressListener.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressListener.kt @@ -31,12 +31,12 @@ interface IJobProgressListener { /** * Called by the worker service to notify the forwarder that the currently referenced procedure * has finished successfully. - */ + */ fun onProcedureDone() /** * Called by the worker service to notify the forwarder that the currently referenced procedure * has failed with the provided exception. */ - fun onProcedureError(error: java.lang.Exception) + fun onProcedureError(error: Throwable) } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressSender.kt new file mode 100644 index 0000000..0b2172b --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressSender.kt @@ -0,0 +1,6 @@ +package eu.depau.etchdroid.utils.job + +interface IJobProgressSender { + fun attachJobProgressListener(listener: IJobProgressListener): Boolean + fun detachJobProgressListener(listener: IJobProgressListener): Boolean +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/impl/AbstractJobProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/impl/AbstractJobProgressSender.kt new file mode 100644 index 0000000..54dbedb --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/impl/AbstractJobProgressSender.kt @@ -0,0 +1,29 @@ +package eu.depau.etchdroid.utils.job.impl + +import eu.depau.etchdroid.utils.job.IJobProgressListener +import eu.depau.etchdroid.utils.job.IJobProgressSender + +abstract class AbstractJobProgressSender : IJobProgressSender { + private val listeners = ArrayList() + + override fun attachJobProgressListener(listener: IJobProgressListener): Boolean = + listeners.add(listener) + + override fun detachJobProgressListener(listener: IJobProgressListener): Boolean = + listeners.remove(listener) + + protected fun notifyJobActionStart(actionIndex: Int) = + listeners.forEach { it.onActionStart(actionIndex) } + + protected fun notifyJobActionDone() = + listeners.forEach { it.onActionDone() } + + protected fun notifyJobProcedureStart(startActionIndex: Int = 0) = + listeners.forEach { it.onProcedureStart(startActionIndex) } + + protected fun notifyJobProcedureDone() = + listeners.forEach { it.onProcedureDone() } + + protected fun notifyJobProcedureError(error: Throwable) = + listeners.forEach { it.onProcedureError(error) } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ServiceForeground.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ServiceForeground.kt new file mode 100644 index 0000000..159534a --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ServiceForeground.kt @@ -0,0 +1,13 @@ +package eu.depau.etchdroid.utils.ktexts + +import android.app.Notification +import android.app.Service + +fun Service.runForeground(id: Int, notification: Notification, removeNotification: Boolean, body: () -> T): T { + this.startForeground(id, notification) + try { + return body() + } finally { + stopForeground(removeNotification) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt index 6d49c4f..47c78a0 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt @@ -1,6 +1,6 @@ package eu.depau.etchdroid.utils.worker -interface IAsyncWorker: IProgressSender { +interface IAsyncWorker: IWorkerProgressSender { /** * Make the worker run do one step. Returns whether there are more steps to do * diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt deleted file mode 100644 index cd7dbb9..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/IProgressSender.kt +++ /dev/null @@ -1,6 +0,0 @@ -package eu.depau.etchdroid.utils.worker - -interface IProgressSender { - fun attachProgressListener(listener: IWorkerProgressListener): Boolean - fun detachProgressListener(listener: IWorkerProgressListener): Boolean -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressSender.kt new file mode 100644 index 0000000..857e523 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressSender.kt @@ -0,0 +1,6 @@ +package eu.depau.etchdroid.utils.worker + +interface IWorkerProgressSender { + fun attachWorkerProgressListener(listener: IWorkerProgressListener): Boolean + fun detachWorkerProgressListener(listener: IWorkerProgressListener): Boolean +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt index a0423fc..735b5d8 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt @@ -2,4 +2,4 @@ package eu.depau.etchdroid.utils.worker.impl import eu.depau.etchdroid.utils.worker.IAsyncWorker -abstract class AbstractAsyncWorker : IAsyncWorker, AbstractProgressSender() \ No newline at end of file +abstract class AbstractAsyncWorker : IAsyncWorker, AbstractWorkerProgressSender() \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt index a69865a..3a478af 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt @@ -32,7 +32,7 @@ abstract class AbstractAutoProgressAsyncWorker( rateUnit = rateUnit ) - notifyProgress(dto) + notifyWorkerProgress(dto) doneSinceLastUpdate = 0 lastUpdateTime = currentTime diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractWorkerProgressSender.kt similarity index 50% rename from app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt rename to app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractWorkerProgressSender.kt index f012aea..c1b1055 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractProgressSender.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractWorkerProgressSender.kt @@ -1,19 +1,19 @@ package eu.depau.etchdroid.utils.worker.impl -import eu.depau.etchdroid.utils.worker.IProgressSender import eu.depau.etchdroid.utils.worker.IWorkerProgressListener +import eu.depau.etchdroid.utils.worker.IWorkerProgressSender import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO -abstract class AbstractProgressSender : IProgressSender { +abstract class AbstractWorkerProgressSender : IWorkerProgressSender { private val listeners = ArrayList() - override fun attachProgressListener(listener: IWorkerProgressListener) = + override fun attachWorkerProgressListener(listener: IWorkerProgressListener) = listeners.add(listener) - override fun detachProgressListener(listener: IWorkerProgressListener) = + override fun detachWorkerProgressListener(listener: IWorkerProgressListener) = listeners.remove(listener) - protected fun notifyProgress(dto: ProgressUpdateDTO) = + protected fun notifyWorkerProgress(dto: ProgressUpdateDTO) = listeners.forEach { it.onWorkerProgress(dto) } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/IMergedAsyncWorkerProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/workers/IMergedAsyncWorkerProgressSender.kt index e908709..f20fb6a 100644 --- a/app/src/main/java/eu/depau/etchdroid/workers/IMergedAsyncWorkerProgressSender.kt +++ b/app/src/main/java/eu/depau/etchdroid/workers/IMergedAsyncWorkerProgressSender.kt @@ -1,7 +1,7 @@ package eu.depau.etchdroid.workers import eu.depau.etchdroid.utils.worker.IAsyncWorker -import eu.depau.etchdroid.utils.worker.IProgressSender +import eu.depau.etchdroid.utils.worker.IWorkerProgressSender -internal interface IMergedAsyncWorkerProgressSender: IAsyncWorker, IProgressSender \ No newline at end of file +internal interface IMergedAsyncWorkerProgressSender: IAsyncWorker, IWorkerProgressSender \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt b/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt similarity index 73% rename from app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt rename to app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt index 49a5a6e..d17a015 100644 --- a/app/src/test/java/eu/depau/etchdroid/services/JobServiceTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt @@ -7,6 +7,7 @@ import eu.depau.etchdroid.AppBuildConfig import eu.depau.etchdroid.db.EtchDroidDatabase import eu.depau.etchdroid.db.entity.Job import eu.depau.etchdroid.db.repository.JobRepository +import eu.depau.etchdroid.services.job.JobIntentHandler import eu.depau.etchdroid.services.job.JobService import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO import eu.depau.etchdroid.testutils.job.MockJobAction @@ -22,9 +23,8 @@ import java.util.* import kotlin.math.abs @RunWith(MockitoJUnitRunner::class) -internal class JobServiceTest { - private var service: JobService? = null - private var mockContext: Context? = null +internal class JobIntentHandlerTest { + private var mockService: JobService? = null private var jobRepo: JobRepository? = null private var random = Random() @@ -33,7 +33,21 @@ internal class JobServiceTest { // Used by JobServiceNotificationHandler to avoid building real notifications when testing AppBuildConfig.TEST_BUILD = true - mockContext = mock(Context::class.java) + // Mock eu.depau.etchdroid.services.job.JobService + mockService = mock(JobService::class.java) + Mockito + .doReturn(mock(NotificationManager::class.java)) + .`when`(mockService!!).getSystemService(Context.NOTIFICATION_SERVICE) + Mockito + .doReturn("penis") + .`when`(mockService!!).getString(anyInt()) + Mockito + .doNothing() + .`when`(mockService!!).startForeground(anyInt(), any()) + Mockito + .doNothing() + .`when`(mockService!!).stopForeground(anyBoolean()) + jobRepo = mock(JobRepository::class.java) // Inject mock JobRepository into database mock instance @@ -47,30 +61,14 @@ internal class JobServiceTest { .getDeclaredMethod("access\$setINSTANCE\$cp", EtchDroidDatabase::class.java) .apply { isAccessible = true } .invoke(null, db) - - // Create a clean JobService and mock its Android framework methods - service = spy(JobService::class.java) - Mockito - .doReturn(mock(NotificationManager::class.java)) - .`when`(service!!).getSystemService(Context.NOTIFICATION_SERVICE) - Mockito - .doReturn("penis") - .`when`(service!!).getString(anyInt()) - Mockito - .doNothing() - .`when`(service!!).startForeground(anyInt(), any()) - Mockito - .doNothing() - .`when`(service!!).stopForeground(anyBoolean()) - } @Test fun testBasicFlow() { // Create mock job val jobProcedure = JobProcedure(-1).apply { - add(MockJobAction(1, 1.0)) - add(MockJobAction(2, 1.0)) + add(MockJobAction(1, 1.0, 0, 10)) + add(MockJobAction(2, 1.0, 0, 10)) } val job = Job( jobId = abs(random.nextInt().toLong()), @@ -83,27 +81,25 @@ internal class JobServiceTest { .`when`(jobRepo!!.getById(jobId)) .thenReturn(job) - // Create mock Intent to pass to the service + // Create mock Intent to pass to the intentHandler val serviceIntent = mock(Intent::class.java) as Intent Mockito .doReturn(JobServiceIntentDTO(jobId)) .`when`(serviceIntent).getParcelableExtra(JobServiceIntentDTO.EXTRA) - // Pass it to onHandleIntent (with reflection cause it's protected) - service!!::class.java - .getDeclaredMethod("onHandleIntent", Intent::class.java) - .apply { isAccessible = true } - .invoke(service, serviceIntent) + // Pass it to the intent handler + val intentHandler = JobIntentHandler(mockService!!, JobServiceIntentDTO(jobId)) + intentHandler.handle() // Check whether everything was called, in order val mockWorkers = jobProcedure .map { it.getWorker() as MockJobWorker } .toTypedArray() - val inOrder = Mockito.inOrder(*mockWorkers, service) + val inOrder = Mockito.inOrder(mockService, *mockWorkers) inOrder - .verify(service!!, times(1)) + .verify(mockService!!, times(1)) .startForeground(anyInt(), any()) for (mockWorker in mockWorkers) { @@ -113,7 +109,7 @@ internal class JobServiceTest { } inOrder - .verify(service!!, times(1)) + .verify(mockService!!, times(1)) .stopForeground(anyBoolean()) } } \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt index 7b4a1a5..b7b6e30 100644 --- a/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt +++ b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt @@ -11,16 +11,20 @@ import org.mockito.Mockito class MockJobAction( override val nameResId: Int, - override val progressWeight: Double + override val progressWeight: Double, + private val startAt: Int, + private val steps: Int ) : IJobAction, KotletParcelable { constructor(parcel: Parcel) : this( parcel.readInt(), - parcel.readDouble() + parcel.readDouble(), + parcel.readInt(), + parcel.readInt() ) private val lazyWorker by lazy { - Mockito.spy(MockJobWorker()) + Mockito.spy(MockJobWorker(startAt, steps)) } override fun getWorker(): IAsyncWorker { @@ -42,6 +46,8 @@ class MockJobAction( parcel.apply { writeInt(nameResId) writeDouble(progressWeight) + writeInt(startAt) + writeInt(steps) } } diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt index 24969e6..3080b4a 100644 --- a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt +++ b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt @@ -3,9 +3,8 @@ package eu.depau.etchdroid.testutils.worker import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker -open class MockJobWorker : AbstractAutoProgressAsyncWorker(10, RateUnit.FURLONGS_PER_FORTNIGHT) { - var counter = 0 - val steps = 10 +open class MockJobWorker(startAt: Int, val steps: Int) : AbstractAutoProgressAsyncWorker(10, RateUnit.FURLONGS_PER_FORTNIGHT) { + var counter = startAt private val sleepTime = (UPDATE_INTERVAL * 2.2 / steps).toLong() /** @@ -15,7 +14,7 @@ open class MockJobWorker : AbstractAutoProgressAsyncWorker(10, RateUnit.FURLONGS */ override fun runStep(): Boolean { counter++ - println("Worker counts $counter/$steps") + println(" -> Worker counts $counter/$steps") Thread.sleep(sleepTime) return counter < steps } From 8e302791bd3815650461876096b9ce745af27700 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 22:35:16 +0200 Subject: [PATCH 31/85] Make Job.checkpointActionIndex not nullable --- app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt b/app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt index 893c830..5cad1ef 100644 --- a/app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt +++ b/app/src/main/java/eu/depau/etchdroid/db/entity/Job.kt @@ -8,7 +8,7 @@ import eu.depau.etchdroid.utils.job.IJobProcedure data class Job( @PrimaryKey(autoGenerate = true) val jobId: Long = 0, var jobProcedure: IJobProcedure, - var checkpointActionIndex: Int? = null, + var checkpointActionIndex: Int = 0, var checkpointData: String? = null, var completed: Boolean = false ) \ No newline at end of file From 9ad8058023cb1379fb47ae0eeba87a2baa1757a3 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 22:35:44 +0200 Subject: [PATCH 32/85] Add test for jobs starting from a checkpoint --- .../services/JobIntentHandlerTest.kt | 37 ++++++++++++++----- .../testutils/worker/MockJobWorker.kt | 2 +- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt b/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt index d17a015..bb904c3 100644 --- a/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt @@ -2,7 +2,6 @@ package eu.depau.etchdroid.services import android.app.NotificationManager import android.content.Context -import android.content.Intent import eu.depau.etchdroid.AppBuildConfig import eu.depau.etchdroid.db.EtchDroidDatabase import eu.depau.etchdroid.db.entity.Job @@ -67,13 +66,36 @@ internal class JobIntentHandlerTest { fun testBasicFlow() { // Create mock job val jobProcedure = JobProcedure(-1).apply { + add(MockJobAction(0, 1.0, 0, 10)) add(MockJobAction(1, 1.0, 0, 10)) - add(MockJobAction(2, 1.0, 0, 10)) } val job = Job( jobId = abs(random.nextInt().toLong()), jobProcedure = jobProcedure ) + testFlow(job) + } + + + @Test + fun testCheckpointFlow() { + // Create mock job + val jobProcedure = JobProcedure(-1).apply { + add(MockJobAction(0, 1.0, 0, 10)) + add(MockJobAction(1, 1.0, 0, 10)) + add(MockJobAction(2, 1.0, 7, 10)) + add(MockJobAction(3, 1.0, 0, 10)) + } + val job = Job( + jobId = abs(random.nextInt().toLong()), + jobProcedure = jobProcedure, + checkpointActionIndex = 2 + ) + testFlow(job) + } + + private fun testFlow(job: Job) { + val jobId = job.jobId // Add job to mock Repository @@ -81,18 +103,13 @@ internal class JobIntentHandlerTest { .`when`(jobRepo!!.getById(jobId)) .thenReturn(job) - // Create mock Intent to pass to the intentHandler - val serviceIntent = mock(Intent::class.java) as Intent - Mockito - .doReturn(JobServiceIntentDTO(jobId)) - .`when`(serviceIntent).getParcelableExtra(JobServiceIntentDTO.EXTRA) - // Pass it to the intent handler val intentHandler = JobIntentHandler(mockService!!, JobServiceIntentDTO(jobId)) intentHandler.handle() // Check whether everything was called, in order - val mockWorkers = jobProcedure + val mockWorkers = job.jobProcedure + .subList(job.checkpointActionIndex, job.jobProcedure.size) .map { it.getWorker() as MockJobWorker } .toTypedArray() @@ -104,7 +121,7 @@ internal class JobIntentHandlerTest { for (mockWorker in mockWorkers) { inOrder - .verify(mockWorker, times(mockWorker.steps)) + .verify(mockWorker, times(mockWorker.steps - mockWorker.startAt)) .runStep() } diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt index 3080b4a..cadb1c7 100644 --- a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt +++ b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt @@ -3,7 +3,7 @@ package eu.depau.etchdroid.testutils.worker import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker -open class MockJobWorker(startAt: Int, val steps: Int) : AbstractAutoProgressAsyncWorker(10, RateUnit.FURLONGS_PER_FORTNIGHT) { +open class MockJobWorker(val startAt: Int, val steps: Int) : AbstractAutoProgressAsyncWorker(10, RateUnit.FURLONGS_PER_FORTNIGHT) { var counter = startAt private val sleepTime = (UPDATE_INTERVAL * 2.2 / steps).toLong() From 46d0b6729bb17a5fd4830056043c338e39423091 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 22:55:32 +0200 Subject: [PATCH 33/85] Make AbstractAutoProgressAsyncWorker count progress from checkpoint --- .../services/job/ProgressBroadcastForwarder.kt | 2 +- .../worker/impl/AbstractAutoProgressAsyncWorker.kt | 12 +++++------- .../workers/Input2OutputStreamCopyAsyncWorker.kt | 6 +++++- .../depau/etchdroid/services/JobIntentHandlerTest.kt | 8 ++++---- .../etchdroid/testutils/worker/MockJobWorker.kt | 7 +++++-- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt index 0e08ceb..8545b97 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt @@ -81,7 +81,7 @@ class ProgressBroadcastForwarder( override fun onWorkerProgress(dto: ProgressUpdateDTO) { assertProcedureStarted() // TODO: stub - println(" -> onWorkerProgress job $jobId action $currentActionIdx dto $dto") + println(" -> onWorkerProgress job $jobId action $currentActionIdx dto $dto") } diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt index 3a478af..b548f6d 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt @@ -5,22 +5,20 @@ import eu.depau.etchdroid.utils.worker.enums.RateUnit abstract class AbstractAutoProgressAsyncWorker( + private val startDone: Long, private val totalToDo: Long, private val rateUnit: RateUnit ) : AbstractAsyncWorker() { - private var doneAccumulator = 0L + private var doneAccumulator = startDone private var doneSinceLastUpdate = 0L private var lastUpdateTime = 0L - fun progressUpdate(lastDone: Long) { + fun progressUpdate(stepDone: Long) { val currentTime = System.currentTimeMillis() - if (lastUpdateTime == 0L) - lastUpdateTime = currentTime - - doneSinceLastUpdate += lastDone - doneAccumulator += lastDone + doneSinceLastUpdate += stepDone + doneAccumulator += stepDone if (currentTime > lastUpdateTime + UPDATE_INTERVAL) { val progress = doneAccumulator.toDouble() / totalToDo diff --git a/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt index 9feef19..4793995 100644 --- a/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt @@ -11,7 +11,11 @@ open class Input2OutputStreamCopyAsyncWorker( private val dest: OutputStream, chunkSize: Int, size: Long -) : IMergedAsyncWorkerProgressSender, AbstractAutoProgressAsyncWorker(size, RateUnit.BYTES_PER_SECOND) { +) : + IMergedAsyncWorkerProgressSender, + AbstractAutoProgressAsyncWorker( + 0L /*TODO remove stub*/, size, RateUnit.BYTES_PER_SECOND + ) { private val buffer = ByteArray(chunkSize) diff --git a/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt b/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt index bb904c3..5880e76 100644 --- a/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt @@ -81,10 +81,10 @@ internal class JobIntentHandlerTest { fun testCheckpointFlow() { // Create mock job val jobProcedure = JobProcedure(-1).apply { - add(MockJobAction(0, 1.0, 0, 10)) - add(MockJobAction(1, 1.0, 0, 10)) - add(MockJobAction(2, 1.0, 7, 10)) - add(MockJobAction(3, 1.0, 0, 10)) + add(MockJobAction(0, 1.0, 0, 15)) + add(MockJobAction(1, 1.0, 0, 15)) + add(MockJobAction(2, 1.0, 7, 15)) + add(MockJobAction(3, 1.0, 0, 15)) } val job = Job( jobId = abs(random.nextInt().toLong()), diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt index cadb1c7..a5ab1c5 100644 --- a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt +++ b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt @@ -3,7 +3,9 @@ package eu.depau.etchdroid.testutils.worker import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker -open class MockJobWorker(val startAt: Int, val steps: Int) : AbstractAutoProgressAsyncWorker(10, RateUnit.FURLONGS_PER_FORTNIGHT) { +open class MockJobWorker(val startAt: Int, val steps: Int) : AbstractAutoProgressAsyncWorker( + startAt.toLong(), steps.toLong(), RateUnit.FURLONGS_PER_FORTNIGHT) { + var counter = startAt private val sleepTime = (UPDATE_INTERVAL * 2.2 / steps).toLong() @@ -14,7 +16,8 @@ open class MockJobWorker(val startAt: Int, val steps: Int) : AbstractAutoProgres */ override fun runStep(): Boolean { counter++ - println(" -> Worker counts $counter/$steps") + println(" -- Worker counts $counter/$steps") + progressUpdate(1) Thread.sleep(sleepTime) return counter < steps } From a0321e3cf0363d1e3ca1014d2fcbedeaecd80ac0 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 11 Aug 2019 23:04:43 +0200 Subject: [PATCH 34/85] Provide default values for fields in JobProgressUpdateBroadcastDTO --- .../broadcasts/dto/JobProgressUpdateBroadcastDTO.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt index 9a6cd14..99c58c0 100644 --- a/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt @@ -10,10 +10,10 @@ data class JobProgressUpdateBroadcastDTO( val indefinite: Boolean, val showProgressBar: Boolean, val completed: Boolean, - val step: Int?, - val percentage: Double?, - val currentMessage: String?, - val error: Exception? + val step: Int? = null, + val percentage: Double? = null, + val currentMessage: String? = null, + val error: Exception? = null ) : Serializable { fun writeToIntent(intent: Intent) { intent.putExtra(BroadcastExtras.UPDATE_DTO, this) From f179465d92d5bd9a3ac67a25c3094571d2450e2a Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 14 Aug 2019 14:34:24 +0200 Subject: [PATCH 35/85] Update gradle --- .gitignore | 3 +++ build.gradle | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index adc4fda..05fb84d 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,6 @@ fastlane/screenshots fastlane/test_output fastlane/readme.md + +# Project exclude paths +/dmg2img/.cxx/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0b95843..da47923 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.6.0-alpha05' + classpath 'com.android.tools.build:gradle:3.6.0-alpha06' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // For libaums From 75d6584374aa99ed2bc9f8eca932e5cb5ee718ea Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 14 Aug 2019 15:21:17 +0200 Subject: [PATCH 36/85] Implement broadcasts and print them in tests (no real check for now) --- app/build.gradle | 3 - .../java/eu/depau/etchdroid/AppBuildConfig.kt | 3 + .../etchdroid/broadcasts/BroadcastExtras.kt | 5 - .../broadcasts/JobProgressUpdateBroadcast.kt | 2 +- .../dto/JobProgressUpdateBroadcastDTO.kt | 18 ++- .../etchdroid/db/repository/JobRepository.kt | 8 +- .../services/job/JobIntentHandler.kt | 11 +- .../job/ProgressBroadcastForwarder.kt | 124 +++++++++++++++--- .../utils/worker/dto/ProgressUpdateDTO.kt | 10 +- app/src/main/res/values/strings.xml | 4 + app/src/test/java/android/util/Log.java | 14 ++ .../broadcasts/JobProgressUpdateBroadcast.kt | 41 ++++++ .../services/JobIntentHandlerTest.kt | 12 ++ .../testutils/worker/MockJobWorker.kt | 3 +- 14 files changed, 213 insertions(+), 45 deletions(-) delete mode 100644 app/src/main/java/eu/depau/etchdroid/broadcasts/BroadcastExtras.kt create mode 100644 app/src/test/java/android/util/Log.java create mode 100644 app/src/test/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt diff --git a/app/build.gradle b/app/build.gradle index c05447d..2e9c9a7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,9 +27,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - testOptions { - unitTests.includeAndroidResources = true - } } dependencies { diff --git a/app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt b/app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt index 5c40345..3d41836 100644 --- a/app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt +++ b/app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt @@ -3,4 +3,7 @@ package eu.depau.etchdroid object AppBuildConfig { @JvmField var TEST_BUILD = false + + @JvmField + var USE_LOCAL_BROADCASTS = true } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/broadcasts/BroadcastExtras.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/BroadcastExtras.kt deleted file mode 100644 index d69517d..0000000 --- a/app/src/main/java/eu/depau/etchdroid/broadcasts/BroadcastExtras.kt +++ /dev/null @@ -1,5 +0,0 @@ -package eu.depau.etchdroid.broadcasts - -object BroadcastExtras { - const val UPDATE_DTO = "eu.depau.etchdroid.broadcast.extras.UPDATE_DTO" -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt index ef566be..8d5c837 100644 --- a/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt +++ b/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt @@ -7,7 +7,7 @@ object JobProgressUpdateBroadcast { const val ACTION = "eu.depau.etchdroid.broadcast.JOB_PROGRESS_UPDATE" fun getIntent(dto: JobProgressUpdateBroadcastDTO) = Intent().apply { - action = this@JobProgressUpdateBroadcast.ACTION + action = ACTION dto.writeToIntent(this) } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt index 99c58c0..75f65aa 100644 --- a/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt @@ -1,26 +1,30 @@ package eu.depau.etchdroid.broadcasts.dto import android.content.Intent -import eu.depau.etchdroid.broadcasts.BroadcastExtras +import eu.depau.etchdroid.utils.worker.enums.RateUnit import java.io.Serializable data class JobProgressUpdateBroadcastDTO( val jobId: Long, - val indefinite: Boolean, - val showProgressBar: Boolean, - val completed: Boolean, + val indefinite: Boolean = false, + val showProgressBar: Boolean = true, + val completed: Boolean = false, val step: Int? = null, val percentage: Double? = null, + val rate: Double? = null, + val rateUnit: RateUnit? = null, val currentMessage: String? = null, - val error: Exception? = null + val error: Throwable? = null ) : Serializable { fun writeToIntent(intent: Intent) { - intent.putExtra(BroadcastExtras.UPDATE_DTO, this) + intent.putExtra(EXTRA, this) } companion object { + const val EXTRA = "eu.depau.etchdroid.broadcast.extras.UPDATE_DTO" + fun readFromIntent(intent: Intent) = - intent.getSerializableExtra(BroadcastExtras.UPDATE_DTO)!! as JobProgressUpdateBroadcastDTO + intent.getSerializableExtra(EXTRA)!! as JobProgressUpdateBroadcastDTO } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/db/repository/JobRepository.kt b/app/src/main/java/eu/depau/etchdroid/db/repository/JobRepository.kt index 51efb8d..9b91c29 100644 --- a/app/src/main/java/eu/depau/etchdroid/db/repository/JobRepository.kt +++ b/app/src/main/java/eu/depau/etchdroid/db/repository/JobRepository.kt @@ -1,9 +1,6 @@ package eu.depau.etchdroid.db.repository -import androidx.room.Dao -import androidx.room.Delete -import androidx.room.Insert -import androidx.room.Query +import androidx.room.* import eu.depau.etchdroid.db.entity.Job @Dao @@ -20,6 +17,9 @@ interface JobRepository { @Insert fun insertAll(vararg jobs: Job) + @Update + fun update(job: Job) + @Delete fun delete(job: Job) } diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt index ae66d12..d9174e7 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt @@ -16,10 +16,10 @@ class JobIntentHandler( ) : AbstractJobProgressSender() { private val jobId = jobDTO.jobId - private val broadcastForwarder = ProgressBroadcastForwarder(jobId, context) private val svcNotificationHandler = JobServiceNotificationHandler(context) private val notification = svcNotificationHandler.build() private lateinit var job: Job + private val broadcastForwarder = ProgressBroadcastForwarder(jobId, context) init { assert(jobId >= 0) { "Invalid jobId (jobId < 0)" } @@ -27,8 +27,10 @@ class JobIntentHandler( fun handle() = context.runForeground(jobId.toInt(), notification, true) { val db = EtchDroidDatabase.getDatabase(context) - job = db.jobRepository().getById(jobId) - assert(!job.completed) { "Job $jobId already completed" } + + job = db.jobRepository().getById(jobId).also { + assert(!it.completed) { "Job $jobId already completed" } + } job.attachAndRun { procedure -> procedure.forEachAction { index, action, worker -> @@ -36,6 +38,9 @@ class JobIntentHandler( } } } + + job.completed = true + db.jobRepository().update(job) } diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt index 8545b97..b2071a7 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt @@ -1,31 +1,37 @@ package eu.depau.etchdroid.services.job import android.content.Context +import android.util.Log +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import eu.depau.etchdroid.AppBuildConfig +import eu.depau.etchdroid.R +import eu.depau.etchdroid.broadcasts.JobProgressUpdateBroadcast +import eu.depau.etchdroid.broadcasts.dto.JobProgressUpdateBroadcastDTO import eu.depau.etchdroid.db.EtchDroidDatabase import eu.depau.etchdroid.utils.job.IJobProgressListener import eu.depau.etchdroid.utils.worker.IWorkerProgressListener import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO -// TODO: implement class stubs - /** * This class is subscribed to IAsyncWorker+IWorkerProgressSender events by the worker service. - * It is aware of the current JobProcedure (in fact, it retrieves it by ID from the database). + * It is aware of the current JobProcedure. * - * It tracks + * It receives the job progress and forwards it to the rest of the app. */ class ProgressBroadcastForwarder( private val jobId: Long, private val context: Context ) : IJobProgressListener, IWorkerProgressListener { private val db = EtchDroidDatabase.getDatabase(context) - private val jobEntity = db.jobRepository().getById(jobId) + private val job = db.jobRepository().getById(jobId) + private val procedure = job.jobProcedure - private val totalProgressWeights = jobEntity.jobProcedure.map { it.progressWeight }.sum() + private val totalProgressWeights = job.jobProcedure.map { it.progressWeight }.sum() private var currentActionIdx: Int? = null private var prevActionsProgressWeight: Double? = null + private fun assertProcedureStarted() { if (currentActionIdx == null || prevActionsProgressWeight == null) { throw IllegalStateException("Call to a .on*() method without a call to .onProcedureStart()") @@ -33,19 +39,45 @@ class ProgressBroadcastForwarder( } + private fun sendBroadcast(dto: JobProgressUpdateBroadcastDTO) { + val intent = JobProgressUpdateBroadcast.getIntent(dto) + + when { + AppBuildConfig.USE_LOCAL_BROADCASTS -> + LocalBroadcastManager + .getInstance(context.applicationContext) + .sendBroadcast(intent) + else -> + context + .sendBroadcast(intent.apply { `package` = context.packageName }) + } + } + + /** * Called by the worker service to notify the forwarder that the currently referenced procedure * is starting. */ override fun onProcedureStart(startActionIndex: Int) { currentActionIdx = startActionIndex - prevActionsProgressWeight = jobEntity.jobProcedure + prevActionsProgressWeight = job.jobProcedure .subList(0, currentActionIdx!!) .map { it.progressWeight } .sum() - println("-> onProcedureStart job $jobId, startAt $startActionIndex, " + + val isCheckpoint = currentActionIdx!! > 0 + val messageResId = if (isCheckpoint) R.string.resuming_job else R.string.starting_job + + Log.d(TAG, "-> onProcedureStart job $jobId, startAt $startActionIndex, " + "currentAction $currentActionIdx, prevProgress: $prevActionsProgressWeight") +//context.getString(R.string.starting_job) + val dto = JobProgressUpdateBroadcastDTO( + jobId = jobId, + indefinite = true, + step = currentActionIdx!!, + currentMessage = context.getString(messageResId) + ) + sendBroadcast(dto) } @@ -55,8 +87,20 @@ class ProgressBroadcastForwarder( */ override fun onProcedureDone() { assertProcedureStarted() - // TODO: stub - println("-> onProcedureDone job $jobId action $currentActionIdx") + + Log.d(TAG, "-> onProcedureDone job $jobId action $currentActionIdx") + + // Ensure no more updates are sent after the procedure is done + currentActionIdx = null + + val dto = JobProgressUpdateBroadcastDTO( + jobId = jobId, + showProgressBar = false, + percentage = 100.0, + completed = true, + currentMessage = context.getString(R.string.done) + ) + sendBroadcast(dto) } @@ -67,8 +111,19 @@ class ProgressBroadcastForwarder( override fun onProcedureError(error: Throwable) { assertProcedureStarted() // TODO: stub - println("-> onProcedureError job $jobId action $currentActionIdx") - error.printStackTrace() + Log.d(TAG, "-> onProcedureError job $jobId action $currentActionIdx") + + // Ensure no more updates are sent after the procedure failed + currentActionIdx = null + + val dto = JobProgressUpdateBroadcastDTO( + jobId = jobId, + showProgressBar = false, + completed = true, + currentMessage = context.getString(R.string.job_failed), + error = error + ) + sendBroadcast(dto) } @@ -80,8 +135,25 @@ class ProgressBroadcastForwarder( */ override fun onWorkerProgress(dto: ProgressUpdateDTO) { assertProcedureStarted() - // TODO: stub - println(" -> onWorkerProgress job $jobId action $currentActionIdx dto $dto") + + val currentActionWeight = procedure[currentActionIdx!!].progressWeight + val indefinite = dto.progress == null + val progress: Double? = + if (!indefinite) + prevActionsProgressWeight!! + dto.progress!!.toDouble() * currentActionWeight + else + null + + Log.d(TAG, " -> onWorkerProgress job $jobId action $currentActionIdx dto $dto") + + val broadcastDTO = JobProgressUpdateBroadcastDTO( + jobId = jobId, + showProgressBar = true, + indefinite = indefinite, + percentage = if (!indefinite) progress!!.toDouble() / totalProgressWeights * 100 else null, + step = currentActionIdx!! + ) + sendBroadcast(broadcastDTO) } @@ -93,10 +165,17 @@ class ProgressBroadcastForwarder( override fun onActionStart(actionIndex: Int) { assertProcedureStarted() currentActionIdx = actionIndex - prevActionsProgressWeight = prevActionsProgressWeight!!.plus(jobEntity.jobProcedure[actionIndex].progressWeight) - // TODO: stub - println(" -> onActionStart job $jobId action $currentActionIdx") + Log.d(TAG, " -> onActionStart job $jobId action $currentActionIdx") + + val dto = JobProgressUpdateBroadcastDTO( + jobId = jobId, + showProgressBar = true, + indefinite = false, + percentage = prevActionsProgressWeight!!.toDouble() / totalProgressWeights * 100, + step = currentActionIdx!! + ) + sendBroadcast(dto) } @@ -108,7 +187,14 @@ class ProgressBroadcastForwarder( */ override fun onActionDone() { assertProcedureStarted() - // TODO: stub - println(" -> onActionDone job $jobId action $currentActionIdx") + prevActionsProgressWeight = prevActionsProgressWeight!!.plus(job.jobProcedure[currentActionIdx!!].progressWeight) + + Log.d(TAG, " -> onActionDone job $jobId action $currentActionIdx") + + // We don't really need to broadcast this event + } + + companion object { + const val TAG = ".s.j.PrgBcastFw" } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt index b7f1142..e4265c4 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt @@ -1,18 +1,23 @@ package eu.depau.etchdroid.utils.worker.dto import android.os.Parcel +import eu.depau.etchdroid.utils.StringResBuilder import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.kotlet.android.parcelable.* data class ProgressUpdateDTO( val progress: Double?, val rate: Double?, - val rateUnit: RateUnit? + val rateUnit: RateUnit?, + val message: StringResBuilder? = null ) : KotletParcelable { constructor(parcel: Parcel) : this( progress = parcel.readNullable { parcel.readDouble() }, rate = parcel.readNullable { parcel.readDouble() }, - rateUnit = parcel.readNullable { parcel.readEnum() } + rateUnit = parcel.readNullable { parcel.readEnum() }, + message = parcel.readNullable { + (parcel.readParcelable(StringResBuilder::class.java.classLoader) as StringResBuilder?)!! + } ) override fun writeToParcel(parcel: Parcel, flags: Int) { @@ -20,6 +25,7 @@ data class ProgressUpdateDTO( writeNullable(progress) { writeDouble(it) } writeNullable(rate) { writeDouble(it) } writeNullable(rateUnit) { writeEnum(rateUnit) } + writeNullable(message) { writeParcelable(message, flags) } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd40472..f34312a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -158,5 +158,9 @@ Job outcome Used to show a completed job outcome Starting job... + Starting job... + Resuming from checkpoint... + Done. + Job failed. diff --git a/app/src/test/java/android/util/Log.java b/app/src/test/java/android/util/Log.java new file mode 100644 index 0000000..c0b1011 --- /dev/null +++ b/app/src/test/java/android/util/Log.java @@ -0,0 +1,14 @@ +package android.util; + +public class Log { + public static int d(java.lang.String tag, java.lang.String message) { + System.out.println(String.format("[DEBUG] %s: %s", tag, message)); + return 0; + } + + public static int d(java.lang.String tag, java.lang.String message, java.lang.Throwable throwable) { + d(tag, message); + throwable.printStackTrace(); + return 0; + } +} diff --git a/app/src/test/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt b/app/src/test/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt new file mode 100644 index 0000000..4d43dd4 --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt @@ -0,0 +1,41 @@ +package eu.depau.etchdroid.broadcasts + +import android.content.Intent +import eu.depau.etchdroid.broadcasts.dto.JobProgressUpdateBroadcastDTO +import org.mockito.Mockito +import org.mockito.Mockito.any +import org.mockito.Mockito.mock +import java.io.Serializable + +/** + * Mock reimplementation that shadows the original in order to return mock intents + */ +object JobProgressUpdateBroadcast { + const val ACTION = "eu.depau.etchdroid.broadcast.JOB_PROGRESS_UPDATE" + + fun getIntent(dto: JobProgressUpdateBroadcastDTO) = mock(Intent::class.java).apply { + action = ACTION + + // Simulate intent put/get extra logic + val extras = mutableMapOf() + + Mockito + .`when`(this.putExtra(any(), any(Serializable::class.java))) + .thenAnswer { + val extra = it.arguments[0] as String + val serializable = it.arguments[1] as Serializable + extras[extra] = serializable + this + } + + Mockito + .`when`(this.getSerializableExtra(any())) + .thenAnswer { + val extra = it.arguments[0] as String + extras[extra] + } + + + dto.writeToIntent(this) + } +} \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt b/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt index 5880e76..e8e364d 100644 --- a/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt @@ -2,7 +2,9 @@ package eu.depau.etchdroid.services import android.app.NotificationManager import android.content.Context +import android.content.Intent import eu.depau.etchdroid.AppBuildConfig +import eu.depau.etchdroid.broadcasts.dto.JobProgressUpdateBroadcastDTO import eu.depau.etchdroid.db.EtchDroidDatabase import eu.depau.etchdroid.db.entity.Job import eu.depau.etchdroid.db.repository.JobRepository @@ -31,6 +33,8 @@ internal class JobIntentHandlerTest { fun setUp() { // Used by JobServiceNotificationHandler to avoid building real notifications when testing AppBuildConfig.TEST_BUILD = true + // Make sure the app uses Context to send broadcasts, so it's mocked + AppBuildConfig.USE_LOCAL_BROADCASTS = false // Mock eu.depau.etchdroid.services.job.JobService mockService = mock(JobService::class.java) @@ -103,6 +107,14 @@ internal class JobIntentHandlerTest { .`when`(jobRepo!!.getById(jobId)) .thenReturn(job) + Mockito + .`when`(mockService!!.sendBroadcast(any())) + .thenAnswer { + val intent = it.arguments[0] as Intent + println("))) BROADCAST ((( ${intent.getSerializableExtra(JobProgressUpdateBroadcastDTO.EXTRA)}") + Unit + } + // Pass it to the intent handler val intentHandler = JobIntentHandler(mockService!!, JobServiceIntentDTO(jobId)) intentHandler.handle() diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt index a5ab1c5..52d27af 100644 --- a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt +++ b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockJobWorker.kt @@ -1,5 +1,6 @@ package eu.depau.etchdroid.testutils.worker +import android.util.Log import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker @@ -16,7 +17,7 @@ open class MockJobWorker(val startAt: Int, val steps: Int) : AbstractAutoProgres */ override fun runStep(): Boolean { counter++ - println(" -- Worker counts $counter/$steps") + Log.d(".t.MockJobWorkr", " -- Worker counts $counter/$steps") progressUpdate(1) Thread.sleep(sleepTime) return counter < steps From 91f5d030a8f365a507bf2a5e589eb6f630c6cf50 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 15 Aug 2019 00:31:26 +0200 Subject: [PATCH 37/85] Make BlockDeviceOutputStream seekable (for checkpoints) --- .../blockdevice/BlockDeviceOutputStream.kt | 38 ++++++++++++++++++- .../depau/etchdroid/utils/streams/Seekable.kt | 5 +++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/streams/Seekable.kt diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt index 6f9e2cd..2858cdb 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt @@ -1,6 +1,7 @@ package eu.depau.etchdroid.utils.blockdevice import com.github.mjdev.libaums.driver.BlockDeviceDriver +import eu.depau.etchdroid.utils.streams.Seekable import java.io.IOException import java.io.OutputStream import java.nio.ByteBuffer @@ -8,7 +9,7 @@ import java.nio.ByteBuffer class BlockDeviceOutputStream( private val blockDev: BlockDeviceDriver, private val bufferBlocks: Int = 2048 -) : OutputStream() { +) : OutputStream(), Seekable { private val byteBuffer = ByteBuffer.allocate(blockDev.blockSize * bufferBlocks) @@ -16,6 +17,9 @@ class BlockDeviceOutputStream( private val currentByteOffset: Long get() = currentBlockOffset * blockDev.blockSize + byteBuffer.position() + private val sizeBytes: Long + get() = blockDev.size.toLong() * blockDev.blockSize + private val bytesUntilEOF: Long get() = blockDev.size.toLong() * blockDev.blockSize - currentByteOffset @@ -92,4 +96,36 @@ class BlockDeviceOutputStream( currentBlockOffset += fullBlocks } + + override fun seek(offset: Long): Long { + // Flush all the unwritten changes to disk + flush() + + val actualSkipDistance = when { + currentByteOffset + offset > sizeBytes -> sizeBytes - currentByteOffset + currentByteOffset + offset < 0 -> -currentByteOffset + else -> offset + } + + val newByteOffset = currentByteOffset + actualSkipDistance + val newBlockOffset = newByteOffset / blockDev.blockSize + + // Jump to the closest block + currentBlockOffset = newBlockOffset + byteBuffer.clear() + + // Read the part between the start of the new block and the seeked position + val blockByteOffset = (newByteOffset - currentBlockOffset * blockDev.blockSize).toInt() + if (blockByteOffset > 0) { + byteBuffer.apply { + position(0) + limit(blockByteOffset) + blockDev.read(currentBlockOffset, this) + clear() + position(blockByteOffset) + } + } + + return actualSkipDistance + } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/streams/Seekable.kt b/app/src/main/java/eu/depau/etchdroid/utils/streams/Seekable.kt new file mode 100644 index 0000000..1d0e7c6 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/streams/Seekable.kt @@ -0,0 +1,5 @@ +package eu.depau.etchdroid.utils.streams + +interface Seekable { + fun seek(offset: Long): Long +} \ No newline at end of file From bfb66b8a8f24b423c007831127d9b1db551ec0c0 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 15 Aug 2019 01:12:05 +0200 Subject: [PATCH 38/85] Add seekable FileOutputStream implementation --- .../utils/streams/SeekableFileOutputStream.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/streams/SeekableFileOutputStream.kt diff --git a/app/src/main/java/eu/depau/etchdroid/utils/streams/SeekableFileOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/streams/SeekableFileOutputStream.kt new file mode 100644 index 0000000..e3d81d5 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/streams/SeekableFileOutputStream.kt @@ -0,0 +1,19 @@ +package eu.depau.etchdroid.utils.streams + +import java.io.File +import java.io.FileDescriptor +import java.io.FileOutputStream + +open class SeekableFileOutputStream : FileOutputStream, Seekable { + constructor(name: String) : super(name) + constructor(name: String, append: Boolean) : super(name, append) + constructor(file: File) : super(file) + constructor(file: File, append: Boolean) : super(file, append) + constructor(fdObj: FileDescriptor) : super(fdObj) + + override fun seek(offset: Long): Long { + val prevPos = channel.position() + channel.position(prevPos + offset) + return channel.position() - prevPos + } +} \ No newline at end of file From 61fb5e0513722de48f1e1e985926573f49935920 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 18 Aug 2019 04:57:20 +0200 Subject: [PATCH 39/85] Update Kotlet --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 2e9c9a7..fc96a92 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,7 +40,7 @@ dependencies { implementation 'androidx.core:core:1.2.0-alpha03' implementation 'androidx.fragment:fragment:1.2.0-alpha02' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' - implementation 'com.github.Depau:kotlet-android:v0.2.4' + implementation 'com.github.Depau:kotlet-android:v0.2.5' implementation 'com.google.code.gson:gson:2.8.5' api 'com.google.guava:guava:27.0.1-android' api 'com.github.codekidX:storage-chooser:2.0.4.2' From f7a96969e3bb6ec59c837169f61c49e354d34b6f Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 18 Aug 2019 04:58:10 +0200 Subject: [PATCH 40/85] Add new JobActions to open and close streams --- .../depau/etchdroid/job/AbstractJobAction.kt | 34 ++++++++ .../actions/Input2OutputStreamCopyAction.kt | 49 +++++++++++ .../job/actions/StreamCloseAction.kt | 48 +++++++++++ .../etchdroid/job/actions/StreamOpenAction.kt | 86 +++++++++++++++++++ .../eu/depau/etchdroid/job/enums/JobType.kt | 9 ++ .../depau/etchdroid/job/enums/TargetType.kt | 7 ++ .../depau/etchdroid/utils/job/IJobAction.kt | 29 ++++++- .../etchdroid/utils/job/IJobProcedure.kt | 5 +- .../utils/job/IJobProcedureBuilder.kt | 3 +- .../utils/job/enums/SharedDataType.kt | 8 ++ .../etchdroid/utils/job/impl/JobProcedure.kt | 11 ++- ... => Dmg2OutputStreamConvertAsyncWorker.kt} | 4 +- .../Input2OutputStreamCopyAsyncWorker.kt | 12 ++- .../etchdroid/workers/StreamCloseWorker.kt | 26 ++++++ .../etchdroid/workers/StreamOpenWorker.kt | 81 +++++++++++++++++ .../workers/enums/StreamDirection.kt | 5 ++ 16 files changed, 405 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/eu/depau/etchdroid/job/AbstractJobAction.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/job/actions/Input2OutputStreamCopyAction.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/job/actions/StreamCloseAction.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/job/actions/StreamOpenAction.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/job/enums/JobType.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/job/enums/TargetType.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/utils/job/enums/SharedDataType.kt rename app/src/main/java/eu/depau/etchdroid/workers/{Dmg2OutputStreamConvertAsyncService.kt => Dmg2OutputStreamConvertAsyncWorker.kt} (79%) create mode 100644 app/src/main/java/eu/depau/etchdroid/workers/StreamCloseWorker.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/workers/enums/StreamDirection.kt diff --git a/app/src/main/java/eu/depau/etchdroid/job/AbstractJobAction.kt b/app/src/main/java/eu/depau/etchdroid/job/AbstractJobAction.kt new file mode 100644 index 0000000..afad7b1 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/AbstractJobAction.kt @@ -0,0 +1,34 @@ +package eu.depau.etchdroid.job + +import android.os.Parcel +import eu.depau.etchdroid.utils.StringResBuilder +import eu.depau.etchdroid.utils.job.IJobAction +import eu.depau.kotlet.android.parcelable.* +import java.io.Serializable + +abstract class AbstractJobAction( + override val name: StringResBuilder, + override val progressWeight: Double, + override var checkpoint: Serializable? = null, + override val showInGUI: Boolean = true, + override val runAlways: Boolean = true +) : IJobAction, KotletParcelable { + + constructor(parcel: Parcel) : this( + name = parcel.readTypedObjectCompat(StringResBuilder.CREATOR)!!, + progressWeight = parcel.readDouble(), + checkpoint = parcel.readNullable { parcel.readSerializable() }, + showInGUI = parcel.readBool(), + runAlways = parcel.readBool() + ) + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeTypedObjectCompat(name, flags) + writeDouble(progressWeight) + writeNullable(checkpoint) { writeSerializable(it) } + writeBool(showInGUI) + writeBool(runAlways) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/job/actions/Input2OutputStreamCopyAction.kt b/app/src/main/java/eu/depau/etchdroid/job/actions/Input2OutputStreamCopyAction.kt new file mode 100644 index 0000000..3492391 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/actions/Input2OutputStreamCopyAction.kt @@ -0,0 +1,49 @@ +package eu.depau.etchdroid.job.actions + +import android.os.Parcel +import eu.depau.etchdroid.job.AbstractJobAction +import eu.depau.etchdroid.utils.StringResBuilder +import eu.depau.etchdroid.utils.job.enums.SharedDataType +import eu.depau.etchdroid.utils.worker.IAsyncWorker +import eu.depau.etchdroid.workers.Input2OutputStreamCopyAsyncWorker +import eu.depau.kotlet.android.parcelable.parcelableCreator +import java.io.InputStream +import java.io.OutputStream +import java.io.Serializable + +class Input2OutputStreamCopyAction : AbstractJobAction { + constructor( + name: StringResBuilder, + progressWeight: Double, + checkpoint: Serializable?, + showInGUI: Boolean = true, + runAlways: Boolean = false + ) : super(name, progressWeight, checkpoint, showInGUI, runAlways) + + constructor(parcel: Parcel) : super(parcel) + + companion object { + @JvmField + val CREATOR = parcelableCreator { Input2OutputStreamCopyAction::class.java } + } + + override fun getWorker(sharedData: MutableMap): IAsyncWorker { + val inputStream = sharedData[SharedDataType.INPUT_STREAM] as InputStream + val outputStream = sharedData[SharedDataType.OUTPUT_STREAM] as OutputStream + val size = sharedData[SharedDataType.SIZE] as Long + + // TODO use checkpoint data + + return Input2OutputStreamCopyAsyncWorker( + source = inputStream, + dest = outputStream, + seek = 0L /*stub*/, + size = size + ) + } + + override fun checkPreconditions(): List { + TODO("not implemented") + } + +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/job/actions/StreamCloseAction.kt b/app/src/main/java/eu/depau/etchdroid/job/actions/StreamCloseAction.kt new file mode 100644 index 0000000..d172cd2 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/actions/StreamCloseAction.kt @@ -0,0 +1,48 @@ +package eu.depau.etchdroid.job.actions + +import android.os.Parcel +import eu.depau.etchdroid.job.AbstractJobAction +import eu.depau.etchdroid.utils.StringResBuilder +import eu.depau.etchdroid.utils.job.enums.SharedDataType +import eu.depau.etchdroid.utils.worker.IAsyncWorker +import eu.depau.etchdroid.workers.StreamCloseWorker +import eu.depau.kotlet.android.parcelable.parcelableCreator +import eu.depau.kotlet.android.parcelable.readEnum +import eu.depau.kotlet.android.parcelable.writeEnum +import java.io.Serializable + +class StreamCloseAction : AbstractJobAction { + private val destKey: SharedDataType + + override fun getWorker(sharedData: MutableMap): IAsyncWorker = + StreamCloseWorker(sharedData, destKey) + + override fun checkPreconditions(): List { + TODO("not implemented") + } + + constructor( + name: StringResBuilder, + progressWeight: Double, + checkpoint: Serializable?, + destKey: SharedDataType, + showInGUI: Boolean = true, + runAlways: Boolean = false + ) : super(name, progressWeight, checkpoint, showInGUI, runAlways) { + this.destKey = destKey + } + + constructor(parcel: Parcel) : super(parcel) { + this.destKey = parcel.readEnum()!! + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + super.writeToParcel(parcel, flags) + parcel.writeEnum(destKey) + } + + companion object { + @JvmField + val CREATOR = parcelableCreator { StreamCloseAction::class.java } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/job/actions/StreamOpenAction.kt b/app/src/main/java/eu/depau/etchdroid/job/actions/StreamOpenAction.kt new file mode 100644 index 0000000..8668fb0 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/actions/StreamOpenAction.kt @@ -0,0 +1,86 @@ +package eu.depau.etchdroid.job.actions + +import android.hardware.usb.UsbDevice +import android.net.Uri +import android.os.Parcel +import android.os.Parcelable +import eu.depau.etchdroid.job.AbstractJobAction +import eu.depau.etchdroid.job.enums.TargetType +import eu.depau.etchdroid.job.enums.TargetType.* +import eu.depau.etchdroid.utils.StringResBuilder +import eu.depau.etchdroid.utils.job.enums.SharedDataType +import eu.depau.etchdroid.utils.worker.IAsyncWorker +import eu.depau.etchdroid.workers.StreamOpenWorker +import eu.depau.etchdroid.workers.enums.StreamDirection +import eu.depau.kotlet.android.parcelable.* +import java.io.Serializable + +class StreamOpenAction : AbstractJobAction { + private val targetDescriptor: Any + private val targetType: TargetType + private val destKey: SharedDataType + private val streamDirection: StreamDirection + + constructor( + name: StringResBuilder, + progressWeight: Double, + checkpoint: Serializable?, + destKey: SharedDataType, + streamDirection: StreamDirection, + targetDescriptor: Any, + targetType: TargetType, + showInGUI: Boolean = false, + runAlways: Boolean = true + ) : super(name, progressWeight, checkpoint, showInGUI, runAlways) { + this.destKey = destKey + this.streamDirection = streamDirection + this.targetDescriptor = targetDescriptor + this.targetType = targetType + } + + override fun getWorker(sharedData: MutableMap): IAsyncWorker { + return when (targetType) { + ANDROID_URI -> StreamOpenWorker(sharedData, destKey, streamDirection, targetType, targetDescriptor as Uri) + AUMS_BLOCKDEV -> StreamOpenWorker(sharedData, destKey, streamDirection, targetType, targetDescriptor as UsbDevice) + FS_FILE -> StreamOpenWorker(sharedData, destKey, streamDirection, targetType, targetDescriptor as String) + } + } + + override fun checkPreconditions(): List { + TODO("not implemented") + } + + + // Parcelable implementation + + constructor(parcel: Parcel) : super(parcel) { + parcel.apply { + destKey = readEnum()!! + streamDirection = readEnum()!! + targetType = readEnum()!! + targetDescriptor = when (targetType) { + ANDROID_URI -> readTypedObjectCompat(Uri.CREATOR) + AUMS_BLOCKDEV -> readTypedObjectCompat(UsbDevice.CREATOR) + FS_FILE -> readString() + }!! + } + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + super.writeToParcel(parcel, flags) + parcel.apply { + writeEnum(destKey) + writeEnum(streamDirection) + writeEnum(targetType) + when (targetType) { + ANDROID_URI, AUMS_BLOCKDEV -> writeTypedObjectCompat(targetDescriptor as Parcelable, flags) + FS_FILE -> writeString(targetDescriptor as String) + } + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator { Input2OutputStreamCopyAction::class.java } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/job/enums/JobType.kt b/app/src/main/java/eu/depau/etchdroid/job/enums/JobType.kt new file mode 100644 index 0000000..8df344a --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/enums/JobType.kt @@ -0,0 +1,9 @@ +package eu.depau.etchdroid.job.enums + +enum class JobType { + INOUT_STREAM_COPY, + DMG_EXTRACT_TO_OUTPUTSTREAM, + WINDOWS_INSTALLER, // TODO: implement + MACOS_INSTALLER, // TODO: implement + UNETBOOTIN // TODO: implement +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/job/enums/TargetType.kt b/app/src/main/java/eu/depau/etchdroid/job/enums/TargetType.kt new file mode 100644 index 0000000..dc6fc2a --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/enums/TargetType.kt @@ -0,0 +1,7 @@ +package eu.depau.etchdroid.job.enums + +enum class TargetType { + ANDROID_URI, + AUMS_BLOCKDEV, + FS_FILE +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt index 2e6276e..5bd4624 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt @@ -2,19 +2,44 @@ package eu.depau.etchdroid.utils.job import android.os.Parcelable import eu.depau.etchdroid.utils.StringResBuilder +import eu.depau.etchdroid.utils.job.enums.SharedDataType import eu.depau.etchdroid.utils.worker.IAsyncWorker import java.io.Serializable interface IJobAction : Parcelable, Serializable { - val nameResId: Int + /** + * Name of the action instance + */ + val name: StringResBuilder + + /** + * Weight of this action's progress on the total progress + */ val progressWeight: Double + /** + * Checkpoint data + */ + val checkpoint: Serializable? + + /** + * Whether the GUI should mention it + */ + val showInGUI: Boolean + + /** + * Whether this action always needs to be run, regardless of whether there was a checkpoint or + * not, or whether the previous workers have failed or not + */ + val runAlways: Boolean + /** * Build a worker instance that performs the action encoded in this object * + * @param sharedData a mutable map that workers can use to share data among each other * @return a worker instance that performs the encoded action */ - fun getWorker(): IAsyncWorker + fun getWorker(sharedData: MutableMap): IAsyncWorker /** * Check action preconditions and return a list of StringResBuilders, which will then be diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt index 7fed8c8..3aa00b0 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt @@ -1,8 +1,9 @@ package eu.depau.etchdroid.utils.job import android.os.Parcelable +import eu.depau.etchdroid.utils.StringResBuilder import java.io.Serializable -interface IJobProcedure: List, Parcelable, Serializable { - val nameResId: Int +interface IJobProcedure : List, Parcelable, Serializable { + val name: StringResBuilder } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt index 392754a..8d5a817 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt @@ -1,7 +1,8 @@ package eu.depau.etchdroid.utils.job +import android.content.Context import android.os.Parcelable interface IJobProcedureBuilder : Parcelable { - fun build(): IJobProcedure + fun build(context: Context): IJobProcedure } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/enums/SharedDataType.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/enums/SharedDataType.kt new file mode 100644 index 0000000..2300053 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/enums/SharedDataType.kt @@ -0,0 +1,8 @@ +package eu.depau.etchdroid.utils.job.enums + +enum class SharedDataType { + CONTEXT, + INPUT_STREAM, + OUTPUT_STREAM, + SIZE +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt index b13dbdf..c597a67 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt @@ -1,20 +1,25 @@ package eu.depau.etchdroid.utils.job.impl import android.os.Parcel +import eu.depau.etchdroid.utils.StringResBuilder import eu.depau.etchdroid.utils.job.IJobAction import eu.depau.etchdroid.utils.job.IJobProcedure import eu.depau.kotlet.android.parcelable.KotletParcelable import eu.depau.kotlet.android.parcelable.parcelableCreator import java.io.Serializable -open class JobProcedure(override val nameResId: Int) : ArrayList(), IJobProcedure, KotletParcelable, Serializable { - constructor(parcel: Parcel) : this(parcel.readInt()) { +class JobProcedure(override val name: StringResBuilder) : + ArrayList(), IJobProcedure, KotletParcelable, Serializable { + + constructor(parcel: Parcel) : this( + (parcel.readParcelable(StringResBuilder::class.java.classLoader) as StringResBuilder?)!! + ) { parcel.readList(this as List, IJobAction::class.java.classLoader) } override fun writeToParcel(parcel: Parcel, flags: Int) { parcel.apply { - writeInt(nameResId) + writeParcelable(name, flags) writeList(this@JobProcedure as List) } } diff --git a/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt b/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncWorker.kt similarity index 79% rename from app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt rename to app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncWorker.kt index db9df80..a1c6e50 100644 --- a/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncService.kt +++ b/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncWorker.kt @@ -6,7 +6,7 @@ import eu.depau.etchdroid.utils.imagetypes.DMGImage import java.io.OutputStream -class Dmg2OutputStreamConvertAsyncService private constructor( +class Dmg2OutputStreamConvertAsyncWorker private constructor( private val i2oStreamWorker: Input2OutputStreamCopyAsyncWorker ) : IMergedAsyncWorkerProgressSender by i2oStreamWorker { @@ -17,7 +17,7 @@ class Dmg2OutputStreamConvertAsyncService private constructor( chunkSize: Int ) : this( DMGImage.getRawImageInputStream(context, sourceDmgUri).let { - Input2OutputStreamCopyAsyncWorker(it, dest, chunkSize, it.size) + Input2OutputStreamCopyAsyncWorker(it, dest, 0, chunkSize, it.size) } ) } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt index 4793995..15d5054 100644 --- a/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt @@ -9,17 +9,25 @@ import java.io.OutputStream open class Input2OutputStreamCopyAsyncWorker( private val source: InputStream, private val dest: OutputStream, - chunkSize: Int, + private val seek: Long, + chunkSize: Int = 512 * 32 * 64, // 1 MB size: Long ) : IMergedAsyncWorkerProgressSender, AbstractAutoProgressAsyncWorker( - 0L /*TODO remove stub*/, size, RateUnit.BYTES_PER_SECOND + seek, size, RateUnit.BYTES_PER_SECOND ) { + private var seeked = false + private val buffer = ByteArray(chunkSize) override fun runStep(): Boolean { + if (!seeked && seek > 0) { + TODO("seek output") + //source.skip(seek) + } + val readBytes = source.read(buffer) if (readBytes < 0) diff --git a/app/src/main/java/eu/depau/etchdroid/workers/StreamCloseWorker.kt b/app/src/main/java/eu/depau/etchdroid/workers/StreamCloseWorker.kt new file mode 100644 index 0000000..832b0f7 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/workers/StreamCloseWorker.kt @@ -0,0 +1,26 @@ +package eu.depau.etchdroid.workers + +import eu.depau.etchdroid.utils.job.enums.SharedDataType +import eu.depau.etchdroid.utils.worker.enums.RateUnit +import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker +import java.io.InputStream +import java.io.OutputStream + +class StreamCloseWorker( + private val sharedData: MutableMap, + private val destKey: SharedDataType +// Progress is actually never sent so I'm using bogus values here because it still needs to +// implement IWorkerProgressSender +) : AbstractAutoProgressAsyncWorker(0, 0, RateUnit.BYTES_PER_SECOND) { + + override fun runStep(): Boolean { + when (val stream = sharedData[destKey]) { + is InputStream -> stream.close() + is OutputStream -> stream.close() + } + sharedData.remove(destKey) + + return false + } + +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt b/app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt new file mode 100644 index 0000000..8d408b9 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt @@ -0,0 +1,81 @@ +package eu.depau.etchdroid.workers + +import android.content.Context +import android.hardware.usb.UsbDevice +import android.net.Uri +import com.github.mjdev.libaums.UsbMassStorageDevice +import eu.depau.etchdroid.job.enums.TargetType +import eu.depau.etchdroid.job.enums.TargetType.* +import eu.depau.etchdroid.utils.blockdevice.BlockDeviceInputStream +import eu.depau.etchdroid.utils.blockdevice.BlockDeviceOutputStream +import eu.depau.etchdroid.utils.job.enums.SharedDataType +import eu.depau.etchdroid.utils.streams.SeekableFileOutputStream +import eu.depau.etchdroid.utils.worker.enums.RateUnit +import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker +import eu.depau.etchdroid.workers.enums.StreamDirection +import eu.depau.etchdroid.workers.enums.StreamDirection.INPUT +import eu.depau.etchdroid.workers.enums.StreamDirection.OUTPUT +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream + +class StreamOpenWorker( + private val sharedData: MutableMap, + private val destKey: SharedDataType, + private val streamDirection: StreamDirection, + private val targetType: TargetType, + private val targetDescriptor: Any +// Progress is actually never sent so I'm using bogus values here because it still needs to +// implement IWorkerProgressSender +) : AbstractAutoProgressAsyncWorker(0, 0, RateUnit.BYTES_PER_SECOND) { + + private fun getFilesystemStream(): Any { + val file = File(targetDescriptor as String) + + return when (streamDirection) { + INPUT -> FileInputStream(file) + OUTPUT -> FileOutputStream(file) + } + } + + private fun getAndroidUriStream(): Any { + val context = sharedData[SharedDataType.CONTEXT] as Context + val uri = targetDescriptor as Uri + + return if (streamDirection == INPUT) { + context.contentResolver.openInputStream(uri)!! + } else { + val fileDescriptor = context.contentResolver + .openFileDescriptor(uri, "r")!!.fileDescriptor + SeekableFileOutputStream(fileDescriptor) + } + } + + private fun getAUMSDevice(usbDevice: UsbDevice): UsbMassStorageDevice { + val context = sharedData[SharedDataType.CONTEXT] as Context + val massStorageDevices = UsbMassStorageDevice.getMassStorageDevices(context) + + return massStorageDevices.find { it.usbDevice == usbDevice }!! + } + + private fun getAUMSBlockDevStream(): Any { + val usbDev = (targetDescriptor as UsbDevice) + val aumsDev = getAUMSDevice(usbDev).apply { init() } + val blockDev = aumsDev.blockDevice + + return when (streamDirection) { + INPUT -> BlockDeviceInputStream(blockDev) + OUTPUT -> BlockDeviceOutputStream(blockDev) + } + } + + override fun runStep(): Boolean { + val stream = when (targetType) { + ANDROID_URI -> getAndroidUriStream() + AUMS_BLOCKDEV -> getAUMSBlockDevStream() + FS_FILE -> getFilesystemStream() + } + sharedData[destKey] = stream + return false + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/enums/StreamDirection.kt b/app/src/main/java/eu/depau/etchdroid/workers/enums/StreamDirection.kt new file mode 100644 index 0000000..70a617a --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/workers/enums/StreamDirection.kt @@ -0,0 +1,5 @@ +package eu.depau.etchdroid.workers.enums + +enum class StreamDirection { + INPUT, OUTPUT +} \ No newline at end of file From 6bcbd611fb26088167ef2bca1f7d634ee1a4962f Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 18 Aug 2019 04:59:05 +0200 Subject: [PATCH 41/85] Implement basic Input 2 Output Stream flow with tests --- .../etchdroid/job/JobProcedureBuilder.kt | 113 ++++++++++++ .../job/procedures/inoutstreamcopy.kt | 91 ++++++++++ .../etchdroid/job/procedures/stuffnamers.kt | 49 ++++++ .../IServiceNotificationBuilder.kt | 5 +- ...er.kt => JobServiceNotificationBuilder.kt} | 24 +-- .../etchdroid/services/UsbWriteService.kt | 2 +- .../services/job/JobIntentHandler.kt | 82 --------- .../etchdroid/services/job/JobService.kt | 13 +- .../services/job/JobServiceIntentHandler.kt | 164 ++++++++++++++++++ ...JobServiceNotificationBroadcastReceiver.kt | 81 +++++++++ .../job/exception/JobActionFailedException.kt | 9 + .../depau/etchdroid/utils/StringResBuilder.kt | 21 ++- .../utils/ktexts/ServiceForeground.kt | 13 -- .../impl/AbstractAutoProgressAsyncWorker.kt | 4 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values/strings.xml | 15 +- app/src/test/java/android/util/Log.java | 10 +- .../eu/depau/etchdroid/ExampleUnitTest.kt | 16 -- ...Test.kt => JobServiceIntentHandlerTest.kt} | 83 +++++++-- .../exception/TestJobFailException.kt | 3 + .../testutils/job/MockFailingJobAction.kt | 19 ++ .../etchdroid/testutils/job/MockJobAction.kt | 30 +++- .../testutils/worker/MockFailingJobWorker.kt | 19 ++ 27 files changed, 705 insertions(+), 171 deletions(-) create mode 100644 app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt rename app/src/main/java/eu/depau/etchdroid/notification/impl/{JobServiceNotificationHandler.kt => JobServiceNotificationBuilder.kt} (84%) delete mode 100644 app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/services/job/JobServiceIntentHandler.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/services/job/JobServiceNotificationBroadcastReceiver.kt create mode 100644 app/src/main/java/eu/depau/etchdroid/services/job/exception/JobActionFailedException.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/ktexts/ServiceForeground.kt delete mode 100644 app/src/test/java/eu/depau/etchdroid/ExampleUnitTest.kt rename app/src/test/java/eu/depau/etchdroid/services/{JobIntentHandlerTest.kt => JobServiceIntentHandlerTest.kt} (57%) create mode 100644 app/src/test/java/eu/depau/etchdroid/testutils/exception/TestJobFailException.kt create mode 100644 app/src/test/java/eu/depau/etchdroid/testutils/job/MockFailingJobAction.kt create mode 100644 app/src/test/java/eu/depau/etchdroid/testutils/worker/MockFailingJobWorker.kt diff --git a/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt b/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt new file mode 100644 index 0000000..f420e41 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt @@ -0,0 +1,113 @@ +package eu.depau.etchdroid.job + +import android.content.Context +import android.hardware.usb.UsbDevice +import android.net.Uri +import android.os.Parcel +import eu.depau.etchdroid.job.enums.JobType +import eu.depau.etchdroid.job.enums.TargetType +import eu.depau.etchdroid.job.enums.TargetType.* +import eu.depau.etchdroid.utils.job.IJobProcedure +import eu.depau.etchdroid.utils.job.IJobProcedureBuilder +import eu.depau.kotlet.android.parcelable.* + +class JobProcedureBuilder() : IJobProcedureBuilder, KotletParcelable { + lateinit var jobType: JobType + + internal var inputType: TargetType? = null + internal var input: Any? = null + + internal var outputType: TargetType? = null + internal var output: Any? = null + + + override fun build(context: Context): IJobProcedure { + assert(::jobType.isInitialized) { "Job type not set, aborting" } + + TODO("not impl") + } + + + fun setInput(uri: Uri) { + inputType = ANDROID_URI + input = uri + } + + fun setInput(usbDev: UsbDevice) { + inputType = AUMS_BLOCKDEV + input = usbDev + } + + fun setInput(path: String) { + inputType = FS_FILE + input = path + } + + fun setOutput(uri: Uri) { + outputType = ANDROID_URI + output = uri + } + + fun setOutput(usbDev: UsbDevice) { + outputType = AUMS_BLOCKDEV + output = usbDev + } + + fun setOutput(path: String) { + outputType = FS_FILE + output = path + } + + constructor(parcel: Parcel) : this() { + parcel.apply { + jobType = readEnum()!! + inputType = readNullable { readEnum() } + outputType = readNullable { readEnum() } + + input = inputType?.let { + when (it) { + ANDROID_URI -> readTypedObjectCompat(Uri.CREATOR) + AUMS_BLOCKDEV -> readTypedObjectCompat(UsbDevice.CREATOR) + FS_FILE -> readString() + }!! + } + + output = outputType?.let { + when (it) { + ANDROID_URI -> readTypedObjectCompat(Uri.CREATOR) + AUMS_BLOCKDEV -> readTypedObjectCompat(UsbDevice.CREATOR) + FS_FILE -> readString() + }!! + } + } + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.apply { + writeEnum(jobType) + writeNullable(inputType) { writeEnum(it) } + writeNullable(outputType) { writeEnum(it) } + + inputType?.let { + when (it) { + ANDROID_URI -> writeTypedObjectCompat(input as Uri, flags) + AUMS_BLOCKDEV -> writeTypedObjectCompat(input as UsbDevice, flags) + FS_FILE -> writeString(input as String) + } + } + + outputType?.let { + when (it) { + ANDROID_URI -> writeTypedObjectCompat(output as Uri, flags) + AUMS_BLOCKDEV -> writeTypedObjectCompat(output as UsbDevice, flags) + FS_FILE -> writeString(output as String) + } + } + } + } + + companion object { + @JvmField + val CREATOR = parcelableCreator { JobProcedureBuilder::class.java } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt b/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt new file mode 100644 index 0000000..474a045 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt @@ -0,0 +1,91 @@ +package eu.depau.etchdroid.job.procedures + +import android.content.Context +import eu.depau.etchdroid.R +import eu.depau.etchdroid.job.JobProcedureBuilder +import eu.depau.etchdroid.job.actions.Input2OutputStreamCopyAction +import eu.depau.etchdroid.job.actions.StreamCloseAction +import eu.depau.etchdroid.job.actions.StreamOpenAction +import eu.depau.etchdroid.utils.StringResBuilder +import eu.depau.etchdroid.utils.job.IJobProcedure +import eu.depau.etchdroid.utils.job.enums.SharedDataType +import eu.depau.etchdroid.utils.job.impl.JobProcedure +import eu.depau.etchdroid.workers.enums.StreamDirection + +/** + * Procedure for a simple dd-like copy + */ + +fun JobProcedureBuilder.buildInOutStreamCopyProcedure(context: Context): IJobProcedure { + val inputName = autoName(inputType!!, input!!, context) + val outputName = autoName(outputType!!, output!!, context) + val procedureName = StringResBuilder(R.string.write_x_to_y, inputName, outputName) + val procedure = JobProcedure(procedureName) + + procedure.apply { + // Open streams + add( + StreamOpenAction( + name = StringResBuilder(R.string.empty_string, "Open InputStream for '$inputName'"), + progressWeight = 0.0, + checkpoint = null, + destKey = SharedDataType.INPUT_STREAM, + streamDirection = StreamDirection.INPUT, + targetDescriptor = input!!, + targetType = inputType!!, + showInGUI = false, + runAlways = true + ) + ) + + add( + StreamOpenAction( + name = StringResBuilder(R.string.empty_string, "Open OutputStream for '$outputName'"), + progressWeight = 0.0, + checkpoint = null, + destKey = SharedDataType.OUTPUT_STREAM, + streamDirection = StreamDirection.OUTPUT, + targetDescriptor = output!!, + targetType = outputType!!, + showInGUI = false, + runAlways = true + ) + ) + + // Pipe data from input to output + add( + Input2OutputStreamCopyAction( + name = StringResBuilder(R.string.i2o_action_name, inputName, outputName), + progressWeight = 100.0, + checkpoint = null /* TODO: implement */, + showInGUI = true, + runAlways = false + ) + ) + + // Close streams + add( + StreamCloseAction( + name = StringResBuilder(R.string.empty_string, "Close InputStream for '$inputName'"), + progressWeight = 0.0, + checkpoint = null, + destKey = SharedDataType.INPUT_STREAM, + showInGUI = false, + runAlways = true + ) + ) + add( + StreamCloseAction( + name = StringResBuilder(R.string.empty_string, "Close OutputStream for '$outputName'"), + progressWeight = 0.0, + checkpoint = null, + destKey = SharedDataType.OUTPUT_STREAM, + showInGUI = false, + runAlways = true + ) + ) + } + + + TODO() +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt b/app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt new file mode 100644 index 0000000..26778c6 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt @@ -0,0 +1,49 @@ +package eu.depau.etchdroid.job.procedures + +import android.content.Context +import android.hardware.usb.UsbDevice +import android.net.Uri +import android.provider.OpenableColumns +import eu.depau.etchdroid.R +import eu.depau.etchdroid.job.enums.TargetType +import eu.depau.etchdroid.job.enums.TargetType.* +import eu.depau.etchdroid.utils.ktexts.name + +/** + * Utilities to give human-readable names to random stuff + */ + +fun autoName(targetType: TargetType, targetDescriptor: Any, context: Context): String { + return when (targetType) { + ANDROID_URI -> (targetDescriptor as Uri).getFileName(context) + AUMS_BLOCKDEV -> (targetDescriptor as UsbDevice).name + FS_FILE -> getPathFileName(targetDescriptor as String, context) + } +} + + +fun getPathFileName(path: String, context: Context): String { + val cut = path.lastIndexOf('/') + if (cut != -1) { + return path.substring(cut + 1) + } + + return context.getString(R.string.file_unknown) +} + + +fun Uri.getFileName(context: Context): String { + val TAG = "UriGetFileNameExt" + var result: String + + if (this.scheme == "content") { + val cursor = context.contentResolver.query(this, null, null, null, null) + cursor.use { + if (it != null && it.moveToFirst()) { + return it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME)) + } + } + } + + return getPathFileName(this.encodedPath ?: this.path ?: this.toString(), context) +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt b/app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt index 58da0ff..d817293 100644 --- a/app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt +++ b/app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt @@ -1,7 +1,8 @@ package eu.depau.etchdroid.notification -import android.app.Notification +import androidx.core.app.NotificationCompat interface IServiceNotificationBuilder { - fun build(): Notification + fun getBuilder(): NotificationCompat.Builder + fun getBuilderDone(): NotificationCompat.Builder } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationHandler.kt b/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationBuilder.kt similarity index 84% rename from app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationHandler.kt rename to app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationBuilder.kt index 6ab05e4..aacbb18 100644 --- a/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationHandler.kt +++ b/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationBuilder.kt @@ -1,18 +1,16 @@ package eu.depau.etchdroid.notification.impl -import android.app.Notification import android.app.NotificationManager import android.content.Context import android.content.Context.NOTIFICATION_SERVICE import android.os.Build import androidx.core.app.NotificationCompat -import eu.depau.etchdroid.AppBuildConfig import eu.depau.etchdroid.R import eu.depau.etchdroid.notification.IServiceNotificationBuilder import eu.depau.kotlet.android.extensions.notification.NotificationImportanceCompat import eu.depau.kotlet.android.extensions.notification.registerNotificationChannel -class JobServiceNotificationHandler(val context: Context) : IServiceNotificationBuilder { +class JobServiceNotificationBuilder(val context: Context) : IServiceNotificationBuilder { private val notificationManager = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager private val notificationChannelProgress = notificationManager .registerNotificationChannel( @@ -30,10 +28,7 @@ class JobServiceNotificationHandler(val context: Context) : IServiceNotification NotificationImportanceCompat.IMPORTANCE_DEFAULT ) - private fun getNotificationBuilder(channel: String): NotificationCompat.Builder? { - if (AppBuildConfig.TEST_BUILD) { - return null - } + private fun getNotificationBuilder(channel: String): NotificationCompat.Builder { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationCompat.Builder(context, channel) } else { @@ -51,14 +46,19 @@ class JobServiceNotificationHandler(val context: Context) : IServiceNotification } } - override fun build(): Notification { + override fun getBuilder(): NotificationCompat.Builder { val builder = getNotificationBuilder(notificationChannelProgress) - ?: // Test build, return fake notification - return Notification() - return builder.apply { + setSmallIcon(R.drawable.ic_usb_white_24dp) setContentTitle(context.getString(R.string.notif_starting_job)) setProgress(100, 0, true) - }.build() + } + } + + override fun getBuilderDone(): NotificationCompat.Builder { + val builder = getNotificationBuilder(notificationChannelResult) + return builder.apply { + setSmallIcon(R.drawable.ic_usb_white_24dp) + } } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt index 39689e4..ba1e245 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt @@ -101,7 +101,7 @@ abstract class UsbWriteService(name: String) : IntentService(name) { intent.putExtra("error", exception.message) val pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) - b.setContentTitle(getString(R.string.write_failed_tap_for_info)) + b.setContentTitle(getString(R.string.failed_tap_for_info)) .setContentText(getString(R.string.error_notif_content_text, usbDevice)) .setContentIntent(pendingIntent) .setAutoCancel(true) diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt deleted file mode 100644 index d9174e7..0000000 --- a/app/src/main/java/eu/depau/etchdroid/services/job/JobIntentHandler.kt +++ /dev/null @@ -1,82 +0,0 @@ -package eu.depau.etchdroid.services.job - -import eu.depau.etchdroid.db.EtchDroidDatabase -import eu.depau.etchdroid.db.entity.Job -import eu.depau.etchdroid.notification.impl.JobServiceNotificationHandler -import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO -import eu.depau.etchdroid.utils.job.IJobAction -import eu.depau.etchdroid.utils.job.IJobProcedure -import eu.depau.etchdroid.utils.job.impl.AbstractJobProgressSender -import eu.depau.etchdroid.utils.ktexts.runForeground -import eu.depau.etchdroid.utils.worker.IAsyncWorker - -class JobIntentHandler( - val context: JobService, - private val jobDTO: JobServiceIntentDTO -) : AbstractJobProgressSender() { - - private val jobId = jobDTO.jobId - private val svcNotificationHandler = JobServiceNotificationHandler(context) - private val notification = svcNotificationHandler.build() - private lateinit var job: Job - private val broadcastForwarder = ProgressBroadcastForwarder(jobId, context) - - init { - assert(jobId >= 0) { "Invalid jobId (jobId < 0)" } - } - - fun handle() = context.runForeground(jobId.toInt(), notification, true) { - val db = EtchDroidDatabase.getDatabase(context) - - job = db.jobRepository().getById(jobId).also { - assert(!it.completed) { "Job $jobId already completed" } - } - - job.attachAndRun { procedure -> - procedure.forEachAction { index, action, worker -> - while (worker.runStep()) { - } - } - } - - job.completed = true - db.jobRepository().update(job) - } - - - private inline fun Job.attachAndRun(body: (procedure: IJobProcedure) -> T): T { - attachJobProgressListener(broadcastForwarder) - try { - notifyJobProcedureStart(this.checkpointActionIndex ?: 0) - val result = body(this.jobProcedure) - notifyJobProcedureDone() - return result - } catch (t: Throwable) { - notifyJobProcedureError(t) - throw t - } finally { - detachJobProgressListener(broadcastForwarder) - } - } - - private inline fun IJobProcedure.forEachAction( - body: (index: Int, action: IJobAction, worker: IAsyncWorker) -> Unit - ) { - val startIndex = job.checkpointActionIndex ?: 0 - - (startIndex until size).forEach { index -> - - val action = this[index] - val worker = action.getWorker() - worker.attachWorkerProgressListener(broadcastForwarder) - - try { - broadcastForwarder.onActionStart(index) - body(index, action, worker) - broadcastForwarder.onActionDone() - } finally { - worker.detachWorkerProgressListener(broadcastForwarder) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt index 98cc76d..edbb863 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt @@ -10,7 +10,16 @@ import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO */ open class JobService(name: String) : IntentService(name) { override fun onHandleIntent(intent: Intent?) { - val jobDTO = intent!!.getParcelableExtra(JobServiceIntentDTO.EXTRA) - JobIntentHandler(this, jobDTO).handle() + intent ?: return + + if (intent.action != ACTION) + return + + val jobDTO = intent.getParcelableExtra(JobServiceIntentDTO.EXTRA) + JobServiceIntentHandler(this, jobDTO).handle() + } + + companion object { + const val ACTION = "eu.depau.etchdroid.services.JOB_SERVICE_START" } } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/JobServiceIntentHandler.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobServiceIntentHandler.kt new file mode 100644 index 0000000..0c866ad --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/services/job/JobServiceIntentHandler.kt @@ -0,0 +1,164 @@ +package eu.depau.etchdroid.services.job + +import android.app.Notification +import android.app.Service +import android.content.IntentFilter +import android.util.Log +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import eu.depau.etchdroid.AppBuildConfig +import eu.depau.etchdroid.broadcasts.JobProgressUpdateBroadcast +import eu.depau.etchdroid.db.EtchDroidDatabase +import eu.depau.etchdroid.db.entity.Job +import eu.depau.etchdroid.notification.impl.JobServiceNotificationBuilder +import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO +import eu.depau.etchdroid.services.job.exception.JobActionFailedException +import eu.depau.etchdroid.utils.job.IJobAction +import eu.depau.etchdroid.utils.job.IJobProcedure +import eu.depau.etchdroid.utils.job.enums.SharedDataType +import eu.depau.etchdroid.utils.job.impl.AbstractJobProgressSender +import eu.depau.etchdroid.utils.worker.IAsyncWorker + +class JobServiceIntentHandler( + val context: JobService, + private val jobDTO: JobServiceIntentDTO +) : AbstractJobProgressSender() { + private val jobId = jobDTO.jobId + private val svcNotificationBuilder = JobServiceNotificationBuilder(context) + private lateinit var job: Job + private val broadcastForwarder = ProgressBroadcastForwarder(jobId, context) + private val sharedWorkerData = mutableMapOf() + + // Only build notification if we're not in test mode + private val notification = if (!AppBuildConfig.TEST_BUILD) + svcNotificationBuilder.getBuilder().build() + else + Notification() + + init { + assert(jobId >= 0) { "Invalid jobId (jobId < 0)" } + } + + fun handle() = context.runForeground(jobId.toInt(), notification, true) { + val db = EtchDroidDatabase.getDatabase(context) + + job = db.jobRepository().getById(jobId).also { + assert(!it.completed) { "Job $jobId already completed" } + } + + // Add service context to shared worker data + sharedWorkerData[SharedDataType.CONTEXT] = context + + try { + withNotificationBroadcastReceiver { + job.attachAndRun { procedure -> + procedure.forEachAction(sharedWorkerData) { _, _, worker -> + while (worker.runStep()) { + } + } + } + + job.completed = true + db.jobRepository().update(job) + } + } catch (e: Throwable) { + Log.e(TAG, "JobProcedure failed", e) + } + } + + + private inline fun Job.attachAndRun(body: (procedure: IJobProcedure) -> T): T { + attachJobProgressListener(broadcastForwarder) + try { + notifyJobProcedureStart(this.checkpointActionIndex ?: 0) + val result = body(this.jobProcedure) + notifyJobProcedureDone() + return result + } catch (t: Throwable) { + notifyJobProcedureError(t) + throw t + } finally { + detachJobProgressListener(broadcastForwarder) + } + } + + private inline fun IJobProcedure.forEachAction( + sharedWorkerData: MutableMap, + body: (index: Int, action: IJobAction, worker: IAsyncWorker) -> Unit + ) { + val startIndex = job.checkpointActionIndex + + var errorIndex: Int? = null + var errorAction: IJobAction? = null + var error: Throwable? = null + + this + .filterIndexed { index, action -> + index >= startIndex || action.runAlways + } + .forEachIndexed { index, action -> + // Only run "runAlways" actions if there's an error + if (error != null && !action.runAlways) { + return@forEachIndexed + } + + val worker = action.getWorker(sharedWorkerData) + worker.attachWorkerProgressListener(broadcastForwarder) + + try { + broadcastForwarder.onActionStart(index) + body(index, action, worker) + broadcastForwarder.onActionDone() + } catch (e: Throwable) { + errorIndex = index + errorAction = action + error = e + } finally { + worker.detachWorkerProgressListener(broadcastForwarder) + } + } + + if (error != null) { + throw JobActionFailedException(errorAction!!, errorIndex!!, error!!) + } + } + + private fun Service.runForeground(id: Int, notification: Notification, removeNotification: Boolean, body: () -> T): T { + this.startForeground(id, notification) + try { + return body() + } finally { + stopForeground(removeNotification) + } + } + + private inline fun withNotificationBroadcastReceiver(body: () -> Unit) { + if (AppBuildConfig.TEST_BUILD) { + return body() + } + + val intentFilter = IntentFilter(JobProgressUpdateBroadcast.ACTION) + val broadcastReceiver = JobServiceNotificationBroadcastReceiver(jobId.toInt(), job, svcNotificationBuilder) + + if (AppBuildConfig.USE_LOCAL_BROADCASTS) { + LocalBroadcastManager + .getInstance(context) + .registerReceiver(broadcastReceiver, intentFilter) + } else { + context.registerReceiver(broadcastReceiver, intentFilter) + } + + try { + body() + } finally { + if (AppBuildConfig.USE_LOCAL_BROADCASTS) { + LocalBroadcastManager.getInstance(context).unregisterReceiver(broadcastReceiver) + } else { + context.unregisterReceiver(broadcastReceiver) + } + } + } + + companion object { + const val TAG = ".s.j.JobInHandl" + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/JobServiceNotificationBroadcastReceiver.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobServiceNotificationBroadcastReceiver.kt new file mode 100644 index 0000000..8128e91 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/services/job/JobServiceNotificationBroadcastReceiver.kt @@ -0,0 +1,81 @@ +package eu.depau.etchdroid.services.job + +import android.app.IntentService +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import eu.depau.etchdroid.R +import eu.depau.etchdroid.broadcasts.JobProgressUpdateBroadcast +import eu.depau.etchdroid.broadcasts.dto.JobProgressUpdateBroadcastDTO +import eu.depau.etchdroid.db.entity.Job +import eu.depau.etchdroid.notification.IServiceNotificationBuilder +import eu.depau.etchdroid.ui.activities.ErrorActivity +import java.io.Serializable +import kotlin.math.roundToInt + + +class JobServiceNotificationBroadcastReceiver( + private val foregroundId: Int, + private val job: Job, + private val notificationBuilder: IServiceNotificationBuilder +) : BroadcastReceiver() { + + override fun onReceive(context: Context, intent: Intent) { + if (intent.action != JobProgressUpdateBroadcast.ACTION) + return + + val dto = intent.getSerializableExtra(JobProgressUpdateBroadcastDTO.EXTRA) + as JobProgressUpdateBroadcastDTO + + val notification = if (dto.completed) { + notificationBuilder.getBuilderDone().apply { + if (dto.error == null) { + val activityIntent = Intent(context, ErrorActivity::class.java).apply { + flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK + putExtra("error", dto.error as Serializable) + } + val pendingIntent = PendingIntent.getActivity( + context, 0, activityIntent, PendingIntent.FLAG_UPDATE_CURRENT) + setSubText(job.jobProcedure.name.build(context)) + setContentTitle(context.getString(R.string.failed_tap_for_info)) + setContentIntent(pendingIntent) + setAutoCancel(true) + } else { + // TODO: add success activity intent + setContentTitle(context.getString(R.string.done)) + setContentText(job.jobProcedure.name.build(context)) + } + }.build() + } else { + notificationBuilder.getBuilder().apply { + val subTextContent = mutableListOf() + setContentTitle(job.jobProcedure.name.build(context)) + if (dto.showProgressBar) { + if (dto.indefinite || dto.percentage == null) { + setProgress(100, 0, true) + } else { + setProgress(100, dto.percentage.roundToInt(), false) + subTextContent.add("${dto.percentage.roundToInt()}%") + } + } + if (dto.step != null) { + subTextContent.add(context.getString(R.string.step_x_of_y, dto.step + 1, job.jobProcedure.size + 1)) + } + if (dto.currentMessage != null) { + setContentText(dto.currentMessage) + } + setSubText(subTextContent.joinToString(" • ")) + + // TODO: add rate + }.build() + } + + + val notificationManager = context + .getSystemService(IntentService.NOTIFICATION_SERVICE) as NotificationManager + + notificationManager.notify(foregroundId, notification) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/exception/JobActionFailedException.kt b/app/src/main/java/eu/depau/etchdroid/services/job/exception/JobActionFailedException.kt new file mode 100644 index 0000000..89d8605 --- /dev/null +++ b/app/src/main/java/eu/depau/etchdroid/services/job/exception/JobActionFailedException.kt @@ -0,0 +1,9 @@ +package eu.depau.etchdroid.services.job.exception + +import eu.depau.etchdroid.utils.job.IJobAction + +class JobActionFailedException(action: IJobAction, index: Int, cause: Throwable) : + Exception( + "JobAction $action (step $index) failed", + cause + ) \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt b/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt index 943d31c..f4f1f03 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt @@ -1,5 +1,6 @@ package eu.depau.etchdroid.utils +import android.annotation.SuppressLint import android.content.Context import android.os.Parcel import eu.depau.kotlet.android.parcelable.KotletParcelable @@ -7,15 +8,27 @@ import eu.depau.kotlet.android.parcelable.parcelableCreator import java.io.Serializable class StringResBuilder(private val resId: Int, private vararg val formatArgs: Any) : Serializable, KotletParcelable { + @SuppressLint("ParcelClassLoader") constructor(parcel: Parcel) : this( parcel.readInt(), parcel.readArray(null) as Array ) - fun build(context: Context): String = if (formatArgs.isNotEmpty()) { - context.getString(resId, formatArgs) - } else { - context.getString(resId) + constructor(resId: Int) : this(resId, emptyArray()) + + fun build(context: Context): String { + if (formatArgs.isEmpty()) + return context.getString(resId) + + // Unwrap inner StringResBuilders + val formatArgsUnwrapped = formatArgs.map { + if (it is StringResBuilder) + it.build(context) + else + it + }.toTypedArray() + + return context.getString(resId, formatArgsUnwrapped) } override fun writeToParcel(parcel: Parcel, flags: Int) { diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ServiceForeground.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ServiceForeground.kt deleted file mode 100644 index 159534a..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ServiceForeground.kt +++ /dev/null @@ -1,13 +0,0 @@ -package eu.depau.etchdroid.utils.ktexts - -import android.app.Notification -import android.app.Service - -fun Service.runForeground(id: Int, notification: Notification, removeNotification: Boolean, body: () -> T): T { - this.startForeground(id, notification) - try { - return body() - } finally { - stopForeground(removeNotification) - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt index b548f6d..211112f 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt @@ -5,12 +5,12 @@ import eu.depau.etchdroid.utils.worker.enums.RateUnit abstract class AbstractAutoProgressAsyncWorker( - private val startDone: Long, + private val alreadyDone: Long, private val totalToDo: Long, private val rateUnit: RateUnit ) : AbstractAsyncWorker() { - private var doneAccumulator = startDone + private var doneAccumulator = alreadyDone private var doneSinceLastUpdate = 0L private var lastUpdateTime = 0L diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f115f9c..35b7653 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -91,7 +91,7 @@ DMG Dateiwähler Zeigt das Ergebnis einer fertigen Schreiboperation an USB Schreibergebnis Benachrichtigungen - Schreiben fehlgeschlagen • Tippen für Info + Schreiben fehlgeschlagen • Tippen für Info Schreiben abgeschlossen %1$s wurde möglicherweise beim Schreiben ausgesteckt. %1$s wurde erfolgreich auf %2$s geschrieben diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 994e1b9..f48b4dd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -61,7 +61,7 @@ Selector de archivos DMG Se utiliza para visualizar el resultado de una operación de escritura finalizada Notificaciones de resultados de escritura USB - Escritura fallida • Toque para obtener información + Escritura fallida • Toque para obtener información Escritura finalizada Es posible que se haya desconectado %1$s mientras escribía. %1$s escrito con éxito a %2$s diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 191b644..51e65a4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -91,7 +91,7 @@ Sélecteur de fichier DMG Utilisé pour afficher le résultat d\'une opération d\'écriture aboutie Notifications pour les résultats d\'écriture sur l\'USB - Écriture échouée • Sélectionnez pour plus d\'infos + Écriture échouée • Sélectionnez pour plus d\'infos Écriture terminée %1$s a peut être été débranché pendant l\'écriture. %1$s a été écrit sur %2$s avec succès diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bf7ab08..8341f91 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -91,7 +91,7 @@ Selettore file DMG Utilizzato per mostrare il risultato di un\'operazione di scrittura terminata Risultati scrittura USB - Scrittura fallita • Tocca per i dettagli + Scrittura fallita • Tocca per i dettagli Scrittura terminata %1$s potrebbe essere stato rimosso durante la scrittura. %1$s scritto con successo su %2$s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4aacb5e..7c9ed4e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -90,7 +90,7 @@ DMG dosya seçici Bitmiş bir yazma işleminin sonucunu göstermek için kullanılır. USB yazma sonucu bildirimleri - Yazma başarısız • Bilgi için dokunun. + Yazma başarısız • Bilgi için dokunun. Yazma tamamlandı. %1$s yazma sırasında çıkarılmış olabilir. %1$s başarıyla %2$s üzerine yazıldı. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f34312a..9cef0c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,7 +90,7 @@ DMG file selector Used to display the result of a finished write operation USB write result notifications - Write failed • Tap for info + Failed • Tap for info Write finished %1$s may have been unplugged while writing. %1$s successfully written to %2$s @@ -114,7 +114,7 @@ - + AOSP https://developer.android.com AndroidX Jetpack @@ -127,7 +127,7 @@ - + JetBrains https://kotlinlang.org/ Kotlin Standard Library @@ -140,7 +140,7 @@ - + Google https://material.io/develop/ Material Components @@ -160,7 +160,12 @@ Starting job... Starting job... Resuming from checkpoint... - Done. + Done! Job failed. + %s + (unknown) + Write %1$s to %2$s + "Copy data from "%1$s" to "%2$s" + Step %1$d of %2$d diff --git a/app/src/test/java/android/util/Log.java b/app/src/test/java/android/util/Log.java index c0b1011..a9c2a4a 100644 --- a/app/src/test/java/android/util/Log.java +++ b/app/src/test/java/android/util/Log.java @@ -1,12 +1,18 @@ package android.util; public class Log { - public static int d(java.lang.String tag, java.lang.String message) { + public static int e(String tag, String message, Throwable error) { + System.err.println(String.format("[ERROR] %s: %s", tag, message)); + error.printStackTrace(System.err); + return 0; + } + + public static int d(String tag, String message) { System.out.println(String.format("[DEBUG] %s: %s", tag, message)); return 0; } - public static int d(java.lang.String tag, java.lang.String message, java.lang.Throwable throwable) { + public static int d(String tag, String message, Throwable throwable) { d(tag, message); throwable.printStackTrace(); return 0; diff --git a/app/src/test/java/eu/depau/etchdroid/ExampleUnitTest.kt b/app/src/test/java/eu/depau/etchdroid/ExampleUnitTest.kt deleted file mode 100644 index 246d1cb..0000000 --- a/app/src/test/java/eu/depau/etchdroid/ExampleUnitTest.kt +++ /dev/null @@ -1,16 +0,0 @@ -package eu.depau.etchdroid - -import org.junit.Assert.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt b/app/src/test/java/eu/depau/etchdroid/services/JobServiceIntentHandlerTest.kt similarity index 57% rename from app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt rename to app/src/test/java/eu/depau/etchdroid/services/JobServiceIntentHandlerTest.kt index e8e364d..ab306ba 100644 --- a/app/src/test/java/eu/depau/etchdroid/services/JobIntentHandlerTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/services/JobServiceIntentHandlerTest.kt @@ -8,11 +8,14 @@ import eu.depau.etchdroid.broadcasts.dto.JobProgressUpdateBroadcastDTO import eu.depau.etchdroid.db.EtchDroidDatabase import eu.depau.etchdroid.db.entity.Job import eu.depau.etchdroid.db.repository.JobRepository -import eu.depau.etchdroid.services.job.JobIntentHandler import eu.depau.etchdroid.services.job.JobService +import eu.depau.etchdroid.services.job.JobServiceIntentHandler import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO +import eu.depau.etchdroid.testutils.job.MockFailingJobAction import eu.depau.etchdroid.testutils.job.MockJobAction +import eu.depau.etchdroid.testutils.worker.MockFailingJobWorker import eu.depau.etchdroid.testutils.worker.MockJobWorker +import eu.depau.etchdroid.utils.StringResBuilder import eu.depau.etchdroid.utils.job.impl.JobProcedure import org.junit.Before import org.junit.Test @@ -24,7 +27,7 @@ import java.util.* import kotlin.math.abs @RunWith(MockitoJUnitRunner::class) -internal class JobIntentHandlerTest { +internal class JobServiceIntentHandlerTest { private var mockService: JobService? = null private var jobRepo: JobRepository? = null private var random = Random() @@ -69,9 +72,9 @@ internal class JobIntentHandlerTest { @Test fun testBasicFlow() { // Create mock job - val jobProcedure = JobProcedure(-1).apply { - add(MockJobAction(0, 1.0, 0, 10)) - add(MockJobAction(1, 1.0, 0, 10)) + val jobProcedure = JobProcedure(StringResBuilder(-1)).apply { + add(MockJobAction(StringResBuilder(0), 1.0, 0, 10, true, false)) + add(MockJobAction(StringResBuilder(1), 1.0, 0, 10, true, false)) } val job = Job( jobId = abs(random.nextInt().toLong()), @@ -84,11 +87,11 @@ internal class JobIntentHandlerTest { @Test fun testCheckpointFlow() { // Create mock job - val jobProcedure = JobProcedure(-1).apply { - add(MockJobAction(0, 1.0, 0, 15)) - add(MockJobAction(1, 1.0, 0, 15)) - add(MockJobAction(2, 1.0, 7, 15)) - add(MockJobAction(3, 1.0, 0, 15)) + val jobProcedure = JobProcedure(StringResBuilder(-1)).apply { + add(MockJobAction(StringResBuilder(0), 1.0, 0, 15, true, false)) + add(MockJobAction(StringResBuilder(1), 1.0, 0, 15, true, false)) + add(MockJobAction(StringResBuilder(2), 1.0, 7, 15, true, false)) + add(MockJobAction(StringResBuilder(3), 1.0, 0, 15, true, false)) } val job = Job( jobId = abs(random.nextInt().toLong()), @@ -98,6 +101,40 @@ internal class JobIntentHandlerTest { testFlow(job) } + @Test + fun testCheckpointAlwaysRunFlow() { + // Create mock job + val jobProcedure = JobProcedure(StringResBuilder(-1)).apply { + add(MockJobAction(StringResBuilder(0), 1.0, 0, 15, true, true)) + add(MockJobAction(StringResBuilder(1), 1.0, 0, 15, true, false)) + add(MockJobAction(StringResBuilder(2), 1.0, 7, 15, true, false)) + add(MockJobAction(StringResBuilder(3), 1.0, 0, 15, true, false)) + } + val job = Job( + jobId = abs(random.nextInt().toLong()), + jobProcedure = jobProcedure, + checkpointActionIndex = 2 + ) + testFlow(job) + } + + + @Test + fun testErrorAlwaysRunFlow() { + // Create mock job + val jobProcedure = JobProcedure(StringResBuilder(-1)).apply { + add(MockJobAction(StringResBuilder(0), 1.0, 0, 15, true, false)) + add(MockFailingJobAction(StringResBuilder(1), 1.0, 0, 15, true, false)) + add(MockJobAction(StringResBuilder(2), 1.0, 7, 15, true, false)) + add(MockJobAction(StringResBuilder(3), 1.0, 0, 15, true, true)) + } + val job = Job( + jobId = abs(random.nextInt().toLong()), + jobProcedure = jobProcedure + ) + testFlow(job) + } + private fun testFlow(job: Job) { val jobId = job.jobId @@ -116,13 +153,18 @@ internal class JobIntentHandlerTest { } // Pass it to the intent handler - val intentHandler = JobIntentHandler(mockService!!, JobServiceIntentDTO(jobId)) + val intentHandler = JobServiceIntentHandler(mockService!!, JobServiceIntentDTO(jobId)) intentHandler.handle() + val failingWorkerIndex = job.jobProcedure.indexOfFirst { it is MockFailingJobAction } + // Check whether everything was called, in order val mockWorkers = job.jobProcedure - .subList(job.checkpointActionIndex, job.jobProcedure.size) - .map { it.getWorker() as MockJobWorker } + .filterIndexed { index, action -> + index >= job.checkpointActionIndex && index <= failingWorkerIndex + || action.runAlways + } + .map { it.getWorker(mutableMapOf()) } .toTypedArray() val inOrder = Mockito.inOrder(mockService, *mockWorkers) @@ -132,9 +174,18 @@ internal class JobIntentHandlerTest { .startForeground(anyInt(), any()) for (mockWorker in mockWorkers) { - inOrder - .verify(mockWorker, times(mockWorker.steps - mockWorker.startAt)) - .runStep() + when (mockWorker) { + is MockJobWorker -> + inOrder + .verify(mockWorker, times(mockWorker.steps - mockWorker.startAt)) + .runStep() + is MockFailingJobWorker -> { + println(mockWorker) + inOrder + .verify(mockWorker, times(1)) + .runStep() + } + } } inOrder diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/exception/TestJobFailException.kt b/app/src/test/java/eu/depau/etchdroid/testutils/exception/TestJobFailException.kt new file mode 100644 index 0000000..cb1a1e6 --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/testutils/exception/TestJobFailException.kt @@ -0,0 +1,3 @@ +package eu.depau.etchdroid.testutils.exception + +class TestJobFailException(message: String? = null) : Exception(message) \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/job/MockFailingJobAction.kt b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockFailingJobAction.kt new file mode 100644 index 0000000..842d982 --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockFailingJobAction.kt @@ -0,0 +1,19 @@ +package eu.depau.etchdroid.testutils.job + +import eu.depau.etchdroid.testutils.worker.MockFailingJobWorker +import eu.depau.etchdroid.utils.StringResBuilder +import org.mockito.Mockito + +class MockFailingJobAction( + name: StringResBuilder, + progressWeight: Double, + startAt: Int, + steps: Int, + showInGUI: Boolean, + runAlways: Boolean +) : MockJobAction(name, progressWeight, startAt, steps, showInGUI, runAlways) { + + override val lazyWorker by lazy { + Mockito.spy(MockFailingJobWorker()) + } +} \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt index b7b6e30..3dd2f8b 100644 --- a/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt +++ b/app/src/test/java/eu/depau/etchdroid/testutils/job/MockJobAction.kt @@ -4,31 +4,41 @@ import android.os.Parcel import eu.depau.etchdroid.testutils.worker.MockJobWorker import eu.depau.etchdroid.utils.StringResBuilder import eu.depau.etchdroid.utils.job.IJobAction +import eu.depau.etchdroid.utils.job.enums.SharedDataType import eu.depau.etchdroid.utils.worker.IAsyncWorker import eu.depau.kotlet.android.parcelable.KotletParcelable import eu.depau.kotlet.android.parcelable.parcelableCreator +import eu.depau.kotlet.android.parcelable.readBool +import eu.depau.kotlet.android.parcelable.writeBool import org.mockito.Mockito +import java.io.Serializable -class MockJobAction( - override val nameResId: Int, +open class MockJobAction( + override val name: StringResBuilder, override val progressWeight: Double, private val startAt: Int, - private val steps: Int + private val steps: Int, + override val showInGUI: Boolean, + override val runAlways: Boolean ) : IJobAction, KotletParcelable { + override val checkpoint: Serializable? + get() = TODO("not implemented") constructor(parcel: Parcel) : this( - parcel.readInt(), + parcel.readTypedObject(StringResBuilder.CREATOR)!!, parcel.readDouble(), parcel.readInt(), - parcel.readInt() + parcel.readInt(), + parcel.readBool(), + parcel.readBool() ) - private val lazyWorker by lazy { + internal open val lazyWorker: IAsyncWorker by lazy { Mockito.spy(MockJobWorker(startAt, steps)) } - override fun getWorker(): IAsyncWorker { - println("Retrieved worker for Action with nameResId $nameResId") + override fun getWorker(sharedData: MutableMap): IAsyncWorker { + println("Retrieved worker for Action with nameResId $name") return lazyWorker } @@ -44,10 +54,12 @@ class MockJobAction( override fun writeToParcel(parcel: Parcel, flags: Int) { parcel.apply { - writeInt(nameResId) + writeTypedObject(name, flags) writeDouble(progressWeight) writeInt(startAt) writeInt(steps) + writeBool(showInGUI) + writeBool(runAlways) } } diff --git a/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockFailingJobWorker.kt b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockFailingJobWorker.kt new file mode 100644 index 0000000..c4b2d9a --- /dev/null +++ b/app/src/test/java/eu/depau/etchdroid/testutils/worker/MockFailingJobWorker.kt @@ -0,0 +1,19 @@ +package eu.depau.etchdroid.testutils.worker + +import eu.depau.etchdroid.testutils.exception.TestJobFailException +import eu.depau.etchdroid.utils.worker.enums.RateUnit +import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker + +open class MockFailingJobWorker() : AbstractAutoProgressAsyncWorker( + 0, 1, RateUnit.FURLONGS_PER_FORTNIGHT) { + + + /** + * Make the worker do one step. Returns whether there are more steps to do + * + * @return whether more work needs to be done + */ + override fun runStep(): Boolean { + throw TestJobFailException("Test job failure") + } +} \ No newline at end of file From f644e593d6367f6490e0c1b8e83152a1ca1f2c9c Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 18 Aug 2019 05:05:17 +0200 Subject: [PATCH 42/85] Implement stub I2O stream copy procedure builder --- .../java/eu/depau/etchdroid/job/JobProcedureBuilder.kt | 10 +++++++++- .../depau/etchdroid/job/procedures/inoutstreamcopy.kt | 5 +---- .../services/job/ProgressBroadcastForwarder.kt | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt b/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt index f420e41..73e3b13 100644 --- a/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt +++ b/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt @@ -5,8 +5,10 @@ import android.hardware.usb.UsbDevice import android.net.Uri import android.os.Parcel import eu.depau.etchdroid.job.enums.JobType +import eu.depau.etchdroid.job.enums.JobType.* import eu.depau.etchdroid.job.enums.TargetType import eu.depau.etchdroid.job.enums.TargetType.* +import eu.depau.etchdroid.job.procedures.buildInOutStreamCopyProcedure import eu.depau.etchdroid.utils.job.IJobProcedure import eu.depau.etchdroid.utils.job.IJobProcedureBuilder import eu.depau.kotlet.android.parcelable.* @@ -24,7 +26,13 @@ class JobProcedureBuilder() : IJobProcedureBuilder, KotletParcelable { override fun build(context: Context): IJobProcedure { assert(::jobType.isInitialized) { "Job type not set, aborting" } - TODO("not impl") + return when (jobType) { + INOUT_STREAM_COPY -> buildInOutStreamCopyProcedure(context) + DMG_EXTRACT_TO_OUTPUTSTREAM -> TODO() + WINDOWS_INSTALLER -> TODO() + MACOS_INSTALLER -> TODO() + UNETBOOTIN -> TODO() + } } diff --git a/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt b/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt index 474a045..4fa62bc 100644 --- a/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt +++ b/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt @@ -22,7 +22,7 @@ fun JobProcedureBuilder.buildInOutStreamCopyProcedure(context: Context): IJobPro val procedureName = StringResBuilder(R.string.write_x_to_y, inputName, outputName) val procedure = JobProcedure(procedureName) - procedure.apply { + return procedure.apply { // Open streams add( StreamOpenAction( @@ -85,7 +85,4 @@ fun JobProcedureBuilder.buildInOutStreamCopyProcedure(context: Context): IJobPro ) ) } - - - TODO() } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt index b2071a7..8bf5bf2 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt @@ -110,7 +110,7 @@ class ProgressBroadcastForwarder( */ override fun onProcedureError(error: Throwable) { assertProcedureStarted() - // TODO: stub + Log.d(TAG, "-> onProcedureError job $jobId action $currentActionIdx") // Ensure no more updates are sent after the procedure failed From 2319bd540eee8bda2ac34537d0cc7133a7119431 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 18 Aug 2019 05:05:39 +0200 Subject: [PATCH 43/85] Use Uri.getFilePath from Kotlet --- .../etchdroid/job/procedures/stuffnamers.kt | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt b/app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt index 26778c6..87c6602 100644 --- a/app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt +++ b/app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt @@ -3,11 +3,11 @@ package eu.depau.etchdroid.job.procedures import android.content.Context import android.hardware.usb.UsbDevice import android.net.Uri -import android.provider.OpenableColumns import eu.depau.etchdroid.R import eu.depau.etchdroid.job.enums.TargetType import eu.depau.etchdroid.job.enums.TargetType.* import eu.depau.etchdroid.utils.ktexts.name +import eu.depau.kotlet.android.extensions.uri.getFilePath /** * Utilities to give human-readable names to random stuff @@ -33,17 +33,9 @@ fun getPathFileName(path: String, context: Context): String { fun Uri.getFileName(context: Context): String { - val TAG = "UriGetFileNameExt" - var result: String - - if (this.scheme == "content") { - val cursor = context.contentResolver.query(this, null, null, null, null) - cursor.use { - if (it != null && it.moveToFirst()) { - return it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME)) - } - } + return try { + this.getFilePath(context)!! + } catch (e: Exception) { + getPathFileName(this.encodedPath ?: this.path ?: this.toString(), context) } - - return getPathFileName(this.encodedPath ?: this.path ?: this.toString(), context) } \ No newline at end of file From 9f6ebf625e1e442ef20530999bf6748523eb3dd5 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 19 Aug 2019 05:21:07 +0200 Subject: [PATCH 44/85] Switch from forked libaums to upstream with a custom wrapper --- app/build.gradle | 19 +- app/proguard-rules.pro | 2 + .../java/eu/depau/etchdroid/StateKeeper.kt | 4 +- .../etchdroid/services/UsbApiWriteService.kt | 12 +- .../ui/activities/ConfirmationActivity.kt | 3 +- .../ui/activities/UsbDrivePickerActivity.kt | 3 +- .../blockdevice/BlockDeviceInputStream.kt | 129 -------------- .../blockdevice/BlockDeviceOutputStream.kt | 131 -------------- .../depau/etchdroid/utils/streams/Seekable.kt | 5 - .../utils/streams/SeekableFileOutputStream.kt | 19 -- .../etchdroid/workers/StreamOpenWorker.kt | 17 +- .../blockdevice/BlockDeviceInputStreamTest.kt | 163 ----------------- .../BlockDeviceOutputStreamTest.kt | 167 ------------------ gradle.properties | 2 +- settings.gradle | 2 +- 15 files changed, 41 insertions(+), 637 deletions(-) delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/streams/Seekable.kt delete mode 100644 app/src/main/java/eu/depau/etchdroid/utils/streams/SeekableFileOutputStream.kt delete mode 100644 app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt delete mode 100644 app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStreamTest.kt diff --git a/app/build.gradle b/app/build.gradle index fc96a92..c485258 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,15 +18,27 @@ android { } buildTypes { release { - minifyEnabled false + minifyEnabled true + shrinkResources false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug { + minifyEnabled true + shrinkResources false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + packagingOptions { + exclude 'META-INF/libaums_release.kotlin_module' } compileOptions { encoding = 'UTF-8' sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + lintOptions { + abortOnError false + } } dependencies { @@ -45,7 +57,10 @@ dependencies { api 'com.google.guava:guava:27.0.1-android' api 'com.github.codekidX:storage-chooser:2.0.4.2' - implementation project(':libaums') +// implementation project(':libaums') +// api 'com.github.magnusja:libaums:v0.7.0' + api 'com.github.EtchDroid:libaums_wrapper:v0.1.1' + implementation project(':dmg2img') implementation 'me.jfenn:Attribouter:0.1.5' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f1b4245..1206ecf 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -19,3 +19,5 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +-keep class java.lang.ClassValue \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt index 9f6a212..3ff7f65 100644 --- a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt +++ b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt @@ -2,7 +2,7 @@ package eu.depau.etchdroid import android.hardware.usb.UsbDevice import android.net.Uri -import com.github.mjdev.libaums.UsbMassStorageDevice +import eu.depau.etchdroid.libaums_wrapper.EtchDroidUsbMassStorageDevice import eu.depau.etchdroid.utils.enums.FlashMethod import eu.depau.etchdroid.utils.imagetypes.Image @@ -12,5 +12,5 @@ object StateKeeper { var imageRepr: Image? = null var usbDevice: UsbDevice? = null - var usbMassStorageDevice: UsbMassStorageDevice? = null + var usbMassStorageDevice: EtchDroidUsbMassStorageDevice? = null } \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt index 34aeed7..98b7807 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt @@ -4,7 +4,7 @@ import android.content.Intent import android.hardware.usb.UsbDevice import android.net.Uri import android.util.Log -import com.github.mjdev.libaums.UsbMassStorageDevice +import eu.depau.etchdroid.libaums_wrapper.EtchDroidUsbMassStorageDevice import eu.depau.etchdroid.utils.exception.UsbWriteException import eu.depau.etchdroid.utils.ktexts.getFileName import eu.depau.etchdroid.utils.ktexts.name @@ -24,8 +24,8 @@ abstract class UsbApiWriteService(name: String) : UsbWriteService(name) { abstract fun getSendProgress(usbDevice: UsbDevice, uri: Uri): (Long) -> Unit abstract fun getInputStream(uri: Uri): InputStream - private fun getUsbMSDevice(usbDevice: UsbDevice): UsbMassStorageDevice? { - val msDevs = UsbMassStorageDevice.getMassStorageDevices(this) + private fun getUsbMSDevice(usbDevice: UsbDevice): EtchDroidUsbMassStorageDevice? { + val msDevs = EtchDroidUsbMassStorageDevice.getMassStorageDevices(this) for (dev in msDevs) { if (dev.usbDevice == usbDevice) @@ -35,8 +35,8 @@ abstract class UsbApiWriteService(name: String) : UsbWriteService(name) { return null } - fun writeInputStream(inputStream: InputStream, msDev: UsbMassStorageDevice, sendProgress: (Long) -> Unit): Long { - val blockDev = msDev.blockDevice + fun writeInputStream(inputStream: InputStream, msDev: EtchDroidUsbMassStorageDevice, sendProgress: (Long) -> Unit): Long { + val blockDev = msDev.blockDevices[0]!! val bsFactor = DD_BLOCKSIZE / blockDev.blockSize val buffIS = BufferedInputStream(inputStream) val byteBuffer = ByteBuffer.allocate(blockDev.blockSize * bsFactor) @@ -50,7 +50,7 @@ abstract class UsbApiWriteService(name: String) : UsbWriteService(name) { while (true) { wakeLock(true) - lastReadBytes = buffIS.read(byteBuffer.array()!!, remaining, byteBuffer.array().size - remaining) + lastReadBytes = buffIS.read(byteBuffer.array(), remaining, byteBuffer.array().size - remaining) if (lastReadBytes < 0 && readBytes > 0) { // EOF, pad with some extra bits until next block if (readBytes % blockDev.blockSize > 0) 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 8af296e..4899974 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 @@ -8,6 +8,7 @@ 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.kotlinexts.size import eu.depau.etchdroid.ui.adapters.PartitionTableRecyclerViewAdapter import eu.depau.etchdroid.utils.enums.FlashMethod import eu.depau.etchdroid.utils.imagetypes.DMGImage @@ -95,7 +96,7 @@ class ConfirmationActivity : ActivityBase() { for (trial in 0..1) { try { StateKeeper.usbMassStorageDevice!!.init() - val blockDev = StateKeeper.usbMassStorageDevice!!.blockDevice + val blockDev = StateKeeper.usbMassStorageDevice!!.blockDevices[0] if (blockDev != null) { val devSize = (blockDev.size.toLong() * blockDev.blockSize.toLong()) 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 543a7cb..037ccf7 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 @@ -19,6 +19,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.github.mjdev.libaums.UsbMassStorageDevice import eu.depau.etchdroid.R import eu.depau.etchdroid.StateKeeper +import eu.depau.etchdroid.libaums_wrapper.EtchDroidUsbMassStorageDevice.Companion.getMassStorageDevices import eu.depau.etchdroid.ui.adapters.UsbDrivesRecyclerViewAdapter import eu.depau.etchdroid.utils.enums.FlashMethod import eu.depau.etchdroid.utils.ktexts.* @@ -182,7 +183,7 @@ class UsbDrivePickerActivity : ActivityBase(), SwipeRefreshLayout.OnRefreshListe } StateKeeper.usbDevice = device - StateKeeper.usbMassStorageDevice = UsbMassStorageDevice.getMassStorageDevices(context).find { it.usbDevice == device } + StateKeeper.usbMassStorageDevice = device!!.getMassStorageDevices(context)[0] nextStep() } diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt deleted file mode 100644 index b24f0bc..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStream.kt +++ /dev/null @@ -1,129 +0,0 @@ -package eu.depau.etchdroid.utils.blockdevice - -import com.github.mjdev.libaums.driver.BlockDeviceDriver -import java.io.InputStream -import java.nio.ByteBuffer - -class BlockDeviceInputStream( - private val blockDev: BlockDeviceDriver, - private val prefetchBlocks: Int = 2048 -) : InputStream() { - private var neverFetched = true - - private val byteBuffer = ByteBuffer.allocate(blockDev.blockSize * prefetchBlocks) - - private var currentBlockOffset: Long = 0 - private val currentByteOffset: Long - get() = currentBlockOffset * blockDev.blockSize + byteBuffer.position() - - private var markedBlock: Long = 0 - private var markedBufferPosition: Int = 0 - - private val sizeBytes: Long - get() = blockDev.size.toLong() * blockDev.blockSize - - private fun isNextByteAfterEOF(): Boolean { - if (byteBuffer.hasRemaining()) - return false - return currentBlockOffset + 1 >= blockDev.size - } - - private fun fetch() { - byteBuffer.clear() - - // Ensure the buffer is limited on EOF - if (blockDev.size - currentBlockOffset < prefetchBlocks) - byteBuffer.limit( - (blockDev.size - currentBlockOffset).toInt() * blockDev.blockSize - ) - - blockDev.read(currentBlockOffset, byteBuffer) - byteBuffer.flip() - } - - private fun fetchNextIfNeeded() { - if (neverFetched) { - fetch() - neverFetched = false - return - } - if (byteBuffer.hasRemaining()) - return - currentBlockOffset++ - fetch() - } - - override fun read(): Int { - if (isNextByteAfterEOF()) - return -1 - fetchNextIfNeeded() - return byteBuffer.get().toInt() and 0xFF - } - - override fun read(b: ByteArray): Int { - return read(b, 0, b.size) - } - - override fun read(b: ByteArray, off: Int, len: Int): Int { - if (isNextByteAfterEOF()) - return -1 - - val maxPos = Math.min(off + len, b.size) - - if (len <= 0 || off > b.size) - return 0 - - var bytesRead = 0 - - for (i in off until maxPos) { - val readByte = read() - - if (readByte == -1) - break - - b[i] = readByte.toByte() - bytesRead++ - } - - return bytesRead - } - - override fun skip(n: Long): Long { - val actualSkipDistance = when { - currentByteOffset + n > sizeBytes -> sizeBytes - currentByteOffset - currentByteOffset + n < 0 -> -currentByteOffset - else -> n - } - - val newByteOffset = currentByteOffset + actualSkipDistance - val newBlockOffset = newByteOffset / blockDev.blockSize - - if (newBlockOffset != currentBlockOffset) { - currentBlockOffset = newBlockOffset - fetch() - } - - byteBuffer.position((newByteOffset - currentBlockOffset * blockDev.blockSize).toInt()) - - return actualSkipDistance - } - - override fun available(): Int { - return byteBuffer.remaining() - } - - override fun mark(readlimit: Int) { - markedBlock = currentBlockOffset - markedBufferPosition = byteBuffer.position() - } - - override fun markSupported(): Boolean { - return true - } - - override fun reset() { - currentBlockOffset = markedBlock - fetch() - byteBuffer.position(markedBufferPosition) - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt deleted file mode 100644 index 2858cdb..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStream.kt +++ /dev/null @@ -1,131 +0,0 @@ -package eu.depau.etchdroid.utils.blockdevice - -import com.github.mjdev.libaums.driver.BlockDeviceDriver -import eu.depau.etchdroid.utils.streams.Seekable -import java.io.IOException -import java.io.OutputStream -import java.nio.ByteBuffer - -class BlockDeviceOutputStream( - private val blockDev: BlockDeviceDriver, - private val bufferBlocks: Int = 2048 -) : OutputStream(), Seekable { - - private val byteBuffer = ByteBuffer.allocate(blockDev.blockSize * bufferBlocks) - - private var currentBlockOffset: Long = 0 - private val currentByteOffset: Long - get() = currentBlockOffset * blockDev.blockSize + byteBuffer.position() - - private val sizeBytes: Long - get() = blockDev.size.toLong() * blockDev.blockSize - - private val bytesUntilEOF: Long - get() = blockDev.size.toLong() * blockDev.blockSize - currentByteOffset - - override fun write(b: Int) { - if (bytesUntilEOF < 1) { - flush() - throw IOException("No space left on device") - } - - byteBuffer.put(b.toByte()) - - if (byteBuffer.remaining() == 0) - flush() - } - - override fun write(b: ByteArray) { - write(b, 0, b.size) - } - - override fun write(b: ByteArray, off: Int, len: Int) { - val maxPos = Math.min(off + len, b.size) - - if (len <= 0 || off > b.size) - return - - for (i in off until maxPos) - write(b[i].toInt()) - } - - override fun flush() { - byteBuffer.flip() - - val toWrite = byteBuffer.limit() - val incompleteBlockFullBytes = toWrite % blockDev.blockSize - val fullBlocks = (toWrite - incompleteBlockFullBytes) / blockDev.blockSize - - // Check if we're trying to flush while the last written block isn't full - if (incompleteBlockFullBytes > 0) { - val incompleteBlockBuffer = ByteBuffer.allocate(blockDev.blockSize) - - // Load last block from device - blockDev.read(currentBlockOffset + fullBlocks, incompleteBlockBuffer) - - // Add it to the incomplete block - byteBuffer.apply { - position(toWrite) - limit((fullBlocks + 1) * blockDev.blockSize) - put( - incompleteBlockBuffer.array(), - incompleteBlockFullBytes, - blockDev.blockSize - incompleteBlockFullBytes - ) - position(0) - } - } - - // Flush to device - blockDev.write(currentBlockOffset, byteBuffer) - - // Copy the incomplete block at the beginning, then push back the position - byteBuffer.apply { - position(fullBlocks * blockDev.blockSize) - limit(toWrite) - compact() - clear() - position(incompleteBlockFullBytes) - } - - // Ensure the buffer is limited on EOF - if (blockDev.size - currentBlockOffset < bufferBlocks) - byteBuffer.limit( - (blockDev.size - currentBlockOffset).toInt() * blockDev.blockSize - ) - - currentBlockOffset += fullBlocks - } - - override fun seek(offset: Long): Long { - // Flush all the unwritten changes to disk - flush() - - val actualSkipDistance = when { - currentByteOffset + offset > sizeBytes -> sizeBytes - currentByteOffset - currentByteOffset + offset < 0 -> -currentByteOffset - else -> offset - } - - val newByteOffset = currentByteOffset + actualSkipDistance - val newBlockOffset = newByteOffset / blockDev.blockSize - - // Jump to the closest block - currentBlockOffset = newBlockOffset - byteBuffer.clear() - - // Read the part between the start of the new block and the seeked position - val blockByteOffset = (newByteOffset - currentBlockOffset * blockDev.blockSize).toInt() - if (blockByteOffset > 0) { - byteBuffer.apply { - position(0) - limit(blockByteOffset) - blockDev.read(currentBlockOffset, this) - clear() - position(blockByteOffset) - } - } - - return actualSkipDistance - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/streams/Seekable.kt b/app/src/main/java/eu/depau/etchdroid/utils/streams/Seekable.kt deleted file mode 100644 index 1d0e7c6..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/streams/Seekable.kt +++ /dev/null @@ -1,5 +0,0 @@ -package eu.depau.etchdroid.utils.streams - -interface Seekable { - fun seek(offset: Long): Long -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/utils/streams/SeekableFileOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/utils/streams/SeekableFileOutputStream.kt deleted file mode 100644 index e3d81d5..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/streams/SeekableFileOutputStream.kt +++ /dev/null @@ -1,19 +0,0 @@ -package eu.depau.etchdroid.utils.streams - -import java.io.File -import java.io.FileDescriptor -import java.io.FileOutputStream - -open class SeekableFileOutputStream : FileOutputStream, Seekable { - constructor(name: String) : super(name) - constructor(name: String, append: Boolean) : super(name, append) - constructor(file: File) : super(file) - constructor(file: File, append: Boolean) : super(file, append) - constructor(fdObj: FileDescriptor) : super(fdObj) - - override fun seek(offset: Long): Long { - val prevPos = channel.position() - channel.position(prevPos + offset) - return channel.position() - prevPos - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt b/app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt index 8d408b9..c9b8aba 100644 --- a/app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt +++ b/app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt @@ -3,13 +3,14 @@ package eu.depau.etchdroid.workers import android.content.Context import android.hardware.usb.UsbDevice import android.net.Uri -import com.github.mjdev.libaums.UsbMassStorageDevice import eu.depau.etchdroid.job.enums.TargetType import eu.depau.etchdroid.job.enums.TargetType.* -import eu.depau.etchdroid.utils.blockdevice.BlockDeviceInputStream -import eu.depau.etchdroid.utils.blockdevice.BlockDeviceOutputStream +import eu.depau.etchdroid.libaums_wrapper.EtchDroidUsbMassStorageDevice +import eu.depau.etchdroid.libaums_wrapper.EtchDroidUsbMassStorageDevice.Companion.getMassStorageDevices +import eu.depau.etchdroid.libaums_wrapper.streams.BlockDeviceInputStream +import eu.depau.etchdroid.libaums_wrapper.streams.BlockDeviceOutputStream +import eu.depau.etchdroid.libaums_wrapper.streams.SeekableFileOutputStream import eu.depau.etchdroid.utils.job.enums.SharedDataType -import eu.depau.etchdroid.utils.streams.SeekableFileOutputStream import eu.depau.etchdroid.utils.worker.enums.RateUnit import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker import eu.depau.etchdroid.workers.enums.StreamDirection @@ -51,17 +52,15 @@ class StreamOpenWorker( } } - private fun getAUMSDevice(usbDevice: UsbDevice): UsbMassStorageDevice { + private fun getAUMSDevice(usbDevice: UsbDevice): EtchDroidUsbMassStorageDevice { val context = sharedData[SharedDataType.CONTEXT] as Context - val massStorageDevices = UsbMassStorageDevice.getMassStorageDevices(context) - - return massStorageDevices.find { it.usbDevice == usbDevice }!! + return usbDevice.getMassStorageDevices(context)[0] } private fun getAUMSBlockDevStream(): Any { val usbDev = (targetDescriptor as UsbDevice) val aumsDev = getAUMSDevice(usbDev).apply { init() } - val blockDev = aumsDev.blockDevice + val blockDev = aumsDev.blockDevices[0]!! return when (streamDirection) { INPUT -> BlockDeviceInputStream(blockDev) diff --git a/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt b/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt deleted file mode 100644 index 3554c66..0000000 --- a/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceInputStreamTest.kt +++ /dev/null @@ -1,163 +0,0 @@ -package eu.depau.etchdroid.utils.blockdevice - -import com.github.mjdev.libaums.driver.BlockDeviceDriver -import com.github.mjdev.libaums.driver.file.FileBlockDeviceDriver -import org.junit.Assert -import org.junit.Test -import java.io.File - -class BlockDeviceInputStreamTest { - @Test - fun testWithCommonParams() { - runReadTest( - 10L * 1024 * 1024, // 10 MiB - 512, - 2048 - ) - } - - @Test - fun testWithWeirdBlockSize() { - runReadTest( - 10L * 666 * 2 * 666 * 2, // 10 MegaDevils - 666, - 2048 - ) - } - - @Test - fun testNoPrefetch() { - runReadTest( - 10L * 1024 * 1024, // 10 MiB - 512, - 1 - ) - } - - fun runReadTest(testDevSize: Long, testBlockSize: Int, testPrefetchBlocks: Int) { - val testFile = createTestFile(testDevSize) - - try { - val testDev = createTestBlockDevice(testFile, testBlockSize) - val inputStream = BlockDeviceInputStream(testDev, prefetchBlocks = testPrefetchBlocks) - - // Read first bytes - Assert.assertEquals(0, inputStream.read()) - Assert.assertEquals(1, inputStream.read()) - Assert.assertEquals(2, inputStream.read()) - Assert.assertEquals(3, inputStream.read()) - - // Seek within prefetched buffer - val skipBytes1: Long = 2L * 0xFF - 4 - Assert.assertEquals(skipBytes1, inputStream.skip(skipBytes1)) - - Assert.assertEquals(0, inputStream.read()) - Assert.assertEquals(1, inputStream.read()) - Assert.assertEquals(2, inputStream.read()) - Assert.assertEquals(3, inputStream.read()) - - // Seek outside prefetched buffer - val skipBytes2 = 5L * 0xFF * testPrefetchBlocks - 4 + 100 - Assert.assertEquals(skipBytes2, inputStream.skip(skipBytes2)) - - Assert.assertEquals(100 and 0xFF, inputStream.read()) - Assert.assertEquals(101 and 0xFF, inputStream.read()) - Assert.assertEquals(102 and 0xFF, inputStream.read()) - Assert.assertEquals(103 and 0xFF, inputStream.read()) - - // Mark stream to get back here later - // Implementation ignores readlimit so anything works - inputStream.mark(0) - - // Seek to EOF - val remainingBytes = testDevSize - (4 + skipBytes1 + 4 + skipBytes2 + 4) - Assert.assertEquals(remainingBytes, inputStream.skip(remainingBytes * 20)) - - // Ensure EOF - Assert.assertEquals(-1, inputStream.read()) - - // Seek to last byte (previous byte) - Assert.assertEquals(-1, inputStream.skip(-1)) - Assert.assertEquals((testDevSize - 1).toInt() % 0xFF, inputStream.read()) - - // Go back to marked position - inputStream.reset() - Assert.assertEquals(104 and 0xFF, inputStream.read()) - Assert.assertEquals(105 and 0xFF, inputStream.read()) - Assert.assertEquals(106 and 0xFF, inputStream.read()) - Assert.assertEquals(107 and 0xFF, inputStream.read()) - - // Go back to beginning - inputStream.skip(-testDevSize) - - // Read to array - var byteArray = ByteArray(8) - Assert.assertEquals(byteArray.size, inputStream.read(byteArray)) - - Assert.assertArrayEquals( - byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7), - byteArray - ) - - // Read to array with offset + length - byteArray = byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0) - Assert.assertEquals(4, inputStream.read(byteArray, 4, 4)) - Assert.assertArrayEquals( - byteArrayOf(0, 0, 0, 0, 8, 9, 10, 11), - byteArray - ) - - // Read to array with length > array size - Assert.assertEquals(4, inputStream.read(byteArray, 4, 200)) - Assert.assertArrayEquals( - byteArrayOf(0, 0, 0, 0, 12, 13, 14, 15), - byteArray - ) - - // Read to array with offset outside of array - Assert.assertEquals(0, inputStream.read(byteArray, 10, 4)) - - // Go to end of prefetched blocks - inputStream.skip(-testDevSize) - inputStream.skip((testPrefetchBlocks * testBlockSize - 4).toLong()) - - // Read to array, second half needs to be fetched - Assert.assertEquals(byteArray.size, inputStream.read(byteArray)) - - val currentPos = testPrefetchBlocks * testBlockSize - 4 - - Assert.assertArrayEquals( - byteArrayOf( - ((currentPos + 0) % 0xFF).toByte(), - ((currentPos + 1) % 0xFF).toByte(), - ((currentPos + 2) % 0xFF).toByte(), - ((currentPos + 3) % 0xFF).toByte(), - ((currentPos + 4) % 0xFF).toByte(), - ((currentPos + 5) % 0xFF).toByte(), - ((currentPos + 6) % 0xFF).toByte(), - ((currentPos + 7) % 0xFF).toByte() - ), - byteArray - ) - - } finally { - testFile.delete() - } - } - - companion object { - fun createTestFile(size: Long): File { - val file = File.createTempFile("etchdroid-test-", ".img") - val fileOutputStream = file.outputStream() - - for (i in 0..size) - fileOutputStream.write(i.toInt() % 0xFF) - fileOutputStream.flush() - file.deleteOnExit() - return file - } - - fun createTestBlockDevice(file: File, blockSize: Int): BlockDeviceDriver = - FileBlockDeviceDriver(file, blockSize, 0) - } -} \ No newline at end of file diff --git a/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStreamTest.kt b/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStreamTest.kt deleted file mode 100644 index 0120ed5..0000000 --- a/app/src/test/java/eu/depau/etchdroid/utils/blockdevice/BlockDeviceOutputStreamTest.kt +++ /dev/null @@ -1,167 +0,0 @@ -package eu.depau.etchdroid.utils.blockdevice - -import com.github.mjdev.libaums.driver.BlockDeviceDriver -import com.github.mjdev.libaums.driver.file.FileBlockDeviceDriver -import org.junit.Assert -import org.junit.Test -import java.io.File -import java.io.IOException -import java.io.RandomAccessFile - -class BlockDeviceOutputStreamTest { - @Test - fun testWithCommonParams() { - runWriteTest( - 10L * 1024 * 1024, // 10 MiB - 512, - 2048 - ) - } - - @Test - fun testWithWeirdBlockSize() { - runWriteTest( - 10L * 666 * 2 * 666 * 2, // 10 MegaDevils - 666, - 2048 - ) - } - - @Test - fun testUnbuffered() { - runWriteTest( - 10L * 1024 * 1024, // 10 MiB - 512, - 1 - ) - } - - fun runWriteTest(testDevSize: Long, testBlockSize: Int, testBufferBlocks: Int) { - val testFile = createTestFile(testDevSize) - - try { - val testDev = createTestBlockDevice(testFile, testBlockSize) - val outputStream = BlockDeviceOutputStream(testDev, bufferBlocks = testBufferBlocks) - - val deviceRandomAccessFile: RandomAccessFile = testDev::class.java - .getDeclaredField("file") - .apply { isAccessible = true } - .get(testDev) as RandomAccessFile - var byteArray: ByteArray - - - // Write some bytes - outputStream.write(0) - outputStream.write(1) - outputStream.write(2) - outputStream.write(3) - outputStream.flush() - deviceRandomAccessFile.fd.sync() - - byteArray = ByteArray(8) - RandomAccessFile(testFile, "r").use { - it.read(byteArray) - } - - Assert.assertArrayEquals( - byteArrayOf( - 0, 1, 2, 3, 0xFA.toByte(), 0xF9.toByte(), 0xF8.toByte(), 0xF7.toByte() - ), - byteArray - ) - - // Fill current block - byteArray = ByteArray(testBlockSize - 4) - outputStream.write(byteArray) - outputStream.flush() - deviceRandomAccessFile.fd.sync() - - byteArray = ByteArray(testBlockSize + 8) - RandomAccessFile(testFile, "r").use { - it.read(byteArray) - } - - Assert.assertArrayEquals( - byteArrayOf( - 0, 1, 2, 3 - ), - byteArray.copyOfRange(0, 4) - ) - Assert.assertArrayEquals( - (4 until testBlockSize).map { 0.toByte() }.toByteArray(), - byteArray.copyOfRange(4, testBlockSize) - ) - Assert.assertArrayEquals( - (testBlockSize until testBlockSize + 8).map { (0xFE - it % 0xFF).toByte() }.toByteArray(), - byteArray.copyOfRange(testBlockSize, testBlockSize + 8) - ) - - // Fill the buffer except for the last 8 bytes - // Note that flush successfully wrote one full block, so the block offset is now 1 - byteArray = ByteArray(testBufferBlocks * testBlockSize - 8) - outputStream.write(byteArray) - - // Now do a write that goes out of the buffer - byteArray = (0 until 16).map { 42.toByte() }.toByteArray() - outputStream.write(byteArray) - outputStream.flush() - deviceRandomAccessFile.fd.sync() - - val fullBufferOffset = (testBufferBlocks + 1) * testBlockSize - - val byteArray1 = ByteArray(20) - RandomAccessFile(testFile, "r").use { - it.seek(fullBufferOffset - 8L) - it.read(byteArray1) - } - - Assert.assertArrayEquals( - byteArray, - byteArray1.copyOfRange(0, 16) - ) - Assert.assertArrayEquals( - (fullBufferOffset + 8 until fullBufferOffset + 12) - .map { (0xFE - it % 0xFF).toByte() } - .toByteArray(), - byteArray1.copyOfRange(16, 20) - ) - - // Go to end of file - 4 bytes - val remainingBytes = testDevSize - (fullBufferOffset + 8) - byteArray = ByteArray(remainingBytes.toInt() - 4) - outputStream.write(byteArray) - - // This should work - byteArray = ByteArray(4) - outputStream.write(byteArray) - - // This should not - try { - outputStream.write(0) - Assert.fail("Did not throw exception on EOF") - } catch (e: IOException) { - Assert.assertEquals("No space left on device", e.message) - } - - } finally { - testFile.delete() - } - } - - companion object { - fun createTestFile(size: Long): File { - val file = File.createTempFile("etchdroid-test-", ".img") - val fileOutputStream = file.outputStream() - - // Writes 0xFE, 0xFD, ..., 0x00 - for (i in 0..size) - fileOutputStream.write(0xFE - i.toInt() % 0xFF) - fileOutputStream.flush() - file.deleteOnExit() - return file - } - - fun createTestBlockDevice(file: File, blockSize: Int): BlockDeviceDriver = - FileBlockDeviceDriver(file, blockSize, 0) - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8de5058..eabcc33 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ # The setting is particularly useful for tweaking memory settings. android.enableJetifier=true android.useAndroidX=true -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx2g -Xms10m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/settings.gradle b/settings.gradle index 4a839ea..86108a8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':libaums', ':dmg2img' +include ':app', ':dmg2img' From 9ea81468f7cca10a359d975d5216d9f0b9cac377 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 19 Aug 2019 06:44:34 +0200 Subject: [PATCH 45/85] Add credits to magnusja/libaums in About screen --- app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/about.xml | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9cef0c2..df3edcf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,6 +62,7 @@ This app Apache 2.0 Userspace USB block device implementation + A little shim to make libaums work better with EtchDroid GNU GPLv2 Custom BSD-like Custom diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml index f79d2ee..a3f7512 100644 --- a/app/src/main/res/xml/about.xml +++ b/app/src/main/res/xml/about.xml @@ -69,6 +69,20 @@ repo="Depau/libaums" title="libaums (fork)" /> + + + + Date: Tue, 20 Aug 2019 06:20:50 +0200 Subject: [PATCH 46/85] Fix minor issues with layouts and activities --- .../eu/depau/etchdroid/ui/activities/StartActivity.kt | 1 + app/src/main/res/layout/activity_usb_drive_picker.xml | 1 - app/src/main/res/layout/part_data_keyvalue.xml | 4 +--- app/src/main/res/values/strings.xml | 10 +++++----- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt index 2e8207a..3ffd49f 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt @@ -130,6 +130,7 @@ class StartActivity : ActivityBase() { } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) if (requestCode == READ_REQUEST_CODE && resultCode == AppCompatActivity.RESULT_OK) { // The document selected by the user won't be returned in the intent. // Instead, a URI to that document will be contained in the return intent 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 9294c7d..d16ad6b 100644 --- a/app/src/main/res/layout/activity_usb_drive_picker.xml +++ b/app/src/main/res/layout/activity_usb_drive_picker.xml @@ -16,7 +16,6 @@ android:theme="@style/CardContentStyle"> - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df3edcf..f9822fc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -154,13 +154,13 @@ An application to write OS images to USB drives, on Android, no root required. Buy me a coffee - Used to show the progress of the current job + Used to show the progress of the current job Job progress Job outcome - Used to show a completed job outcome - Starting job... - Starting job... - Resuming from checkpoint... + Used to show a completed job outcome + Starting job… + Starting job… + Resuming from checkpoint… Done! Job failed. %s From 12e193c8e6e58a519c4bcb26dc3704cc883f5d56 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 20 Aug 2019 21:04:06 +0200 Subject: [PATCH 47/85] Remove forked libaums submodule --- .gitmodules | 3 --- libaums | 1 - 2 files changed, 4 deletions(-) delete mode 160000 libaums diff --git a/.gitmodules b/.gitmodules index d7ec75d..ba8e6f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "libaums"] - path = libaums - url = https://github.com/Depau/libaums.git [submodule "dmg2img"] path = dmg2img/src/c/dmg2img url = https://github.com/Depau/dmg2img-cmake.git diff --git a/libaums b/libaums deleted file mode 160000 index 1754ec4..0000000 --- a/libaums +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1754ec461e6515086ddd89ca733604870f2a48dd From 0cade96d3e2c5d1ac4c85abc35a0cea1b9d62acc Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 21 Aug 2019 02:59:31 +0200 Subject: [PATCH 48/85] Downgrade Android Gradle Plugin because it's broken af --- build.gradle | 2 +- gradle.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index da47923..ccd8119 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.6.0-alpha06' + classpath 'com.android.tools.build:gradle:3.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // For libaums diff --git a/gradle.properties b/gradle.properties index eabcc33..d7e06dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,7 @@ # The setting is particularly useful for tweaking memory settings. android.enableJetifier=true android.useAndroidX=true +#android.enableR8=false org.gradle.jvmargs=-Xmx2g -Xms10m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit From 1cdfc428255d74d954ea75d7193955beda05eeb2 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 21 Aug 2019 03:00:00 +0200 Subject: [PATCH 49/85] Disable minification cause we have nothing to hide --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c485258..c905d3f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,12 +18,12 @@ android { } buildTypes { release { - minifyEnabled true + minifyEnabled false shrinkResources false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } debug { - minifyEnabled true + minifyEnabled false shrinkResources false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } @@ -54,7 +54,7 @@ dependencies { implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' implementation 'com.github.Depau:kotlet-android:v0.2.5' implementation 'com.google.code.gson:gson:2.8.5' - api 'com.google.guava:guava:27.0.1-android' + implementation 'com.google.guava:guava:27.0.1-android' api 'com.github.codekidX:storage-chooser:2.0.4.2' // implementation project(':libaums') From f443e8ca63c09d68ad0999167bf00cf623202425 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 21 Aug 2019 03:00:21 +0200 Subject: [PATCH 50/85] 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 @@ - From b990601040e8216877b82815638a27e33c500ec7 Mon Sep 17 00:00:00 2001 From: Weblate Date: Sun, 25 Aug 2019 15:04:09 +0000 Subject: [PATCH 51/85] Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: EtchDroid/App Translate-URL: https://etchdroid-l10n.depau.eu/projects/etchdroid/app/ --- app/src/main/res/values-pt-rBR/strings.xml | 11 ++++------- app/src/main/res/values-zh-rCN/strings.xml | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 64b7409..0b9ab07 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,5 +1,6 @@ - -Gravar imagens diretamente para o disco (usando Android API) + + + Gravar imagens diretamente para o disco (usando Android API) Restaurar imagem DMG de macOS para o disco (usando Android API) Instalação de imagem no estilo Unetbootin (MBR apenas, requer root) Gravar imagem Windows (usando WoeUSB, requer root) @@ -61,7 +62,6 @@ Seletor de arquivo DMG Usado para exibir o resultado de uma operação de gravação finalizada Notificação de resultado de gravação de USB - Gravação falhou • Toque para informações Gravação finalizada %1$s pode ter sido desconectado durante a gravação. %1$s gravado com sucesso para %2$s @@ -94,13 +94,10 @@ Sem suporte ao tipo de arquivo Não foi possível localizar o arquivo no armazenamento interno. Tente abri-lo por meio do aplicativo. Permissão de armazenamento é necessária para ler imagens DMG - - AndroidX é uma grande melhoria à biblioteca original de suporte do Android e oferece compatibilidade com versões anteriores dos lançamentos do Android Kotlin Standard Library A Kotlin Standard Library fornece elementos essenciais para o trabalho cotidiano com Kotlin Faça produtos bonitos, mais rápido. Material é um sistema de design - apoiado por código-fonte aberto - que ajuda as equipes a construir experiências digitais Um aplicativo para gravar imagens de SO em unidades USB, no Android, sem precisar de root. Me compre um café - - + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e3cc5ef..4a72738 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -62,7 +62,6 @@ DMG 文件选择 用于显示完成写入的结果 USB写入结果通知 - 写入失败•点击查看详情 写入完成 %1$s 写入过程中USB设备可能被拔出. %1$s 成功写入到 %2$s From 9c0510b03a89e191773c333b63494e81f63e113c Mon Sep 17 00:00:00 2001 From: yzqzss <30341059+yzqzss@users.noreply.github.com> Date: Mon, 26 Aug 2019 13:04:25 +0800 Subject: [PATCH 52/85] Update Simplified Chinese translation --- app/src/main/res/values-zh-rCN/strings.xml | 54 +++++++++++++--------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4a72738..f3b97f5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -50,9 +50,9 @@ 写入 Apple® DMG 镜像 使用macOS Disk Utility创建的映像文件还原 未检测到USB驱动器。\n - 请注意,如果要写入SD,您需要使用SD卡读卡器来进行写入。 + 请注意,如果要写入SD,您需要使用SD卡读卡器来进行写入。 不再提示 - 此处有危险 + 地狱无门 清楚明白 警告:在大多数情况下DMG镜像可以很好地解压还原,但有时可能会出现问题。 写入镜像 @@ -62,25 +62,26 @@ DMG 文件选择 用于显示完成写入的结果 USB写入结果通知 + 失败·点击查看详情 写入完成 - %1$s 写入过程中USB设备可能被拔出. + %1$s 写入过程中USB设备可能被拔出 %1$s 成功写入到 %2$s 故障排除信息 由于发生以下错误,无法完成操作: 这是个常见错误。 通常,当USB驱动器在写入时被拔出,或者通过USB集线器连接时,会发生这种情况。 某些设备的USB子系统可能存在错误:花点时间重启设备,设备一般会自动修复。\n - \n - 试试这些:\n - •重新插入USB设备,然后重启应用\n - •重启设备(不骗你,试试吧)\n - •尝试其他USB驱动器\n - •避免使用不必要的适配器,加密狗或集线器\n - •在写入时避免使用手机\n - •更换优良的USB On-The-Go(OTG)适配器\n - \n - 如果问题仍然存在,请在GitHub上提交问题。 + \n + 试试这些:\n + •重新插入USB设备,然后重启应用\n + •重启设备(不骗你,试试吧)\n + •尝试其他USB驱动器\n + •避免使用不必要的适配器,加密狗或集线器\n + •在写入时避免使用手机\n + •更换优良的USB On-The-Go(OTG)适配器\n + \n + 如果问题仍然存在,请在GitHub上提交问题。 报告问题 你可以在 GitHub 上发送issues以进行反馈:\n - https://github.com/Depau/EtchDroid/issues + https://github.com/Depau/EtchDroid/issues 写入失败 未知错误。尝试重新连接USB驱动器或重新启动设备。请在GitHub上提交这个问题。 (未压缩) @@ -88,22 +89,33 @@ 关闭夜间模式 Android 9 bug Android 9上有个错误,导致一些写入失败。\n - 如果提示“写入失败”,请重启手机并重试。 + 如果提示“写入失败”,请重启手机并重试。 重置警告 所有警告对话框已恢复 文件类型不支持 无法在内部存储中找到文件。尝试在应用内打开它。 读取DMG镜像需要存储权限 - + AndroidX 对原始 Android 支持库进行了重大改进,并与各个 Android 版本向后兼容。 - - Kotlin Standard Library - The Kotlin Standard Library provides living essentials for everyday work with Kotlin + - + Material是一个设计系统 - 由开源代码支持 - 帮助开发者构建制作精美的产品。 在Android上将各种映像写入USB的应用,无需root权限。 - 捐助 + 捐赠 + Used to show the progress of the current job + 处理进度 + 处理结果 + Used to show a completed job outcome + 开始处理… + 开始处理… + 从检查点恢复… + 完成! + 处理失败. + (未知) + 写入 %1$s 到 %2$s + "从\"%1$s\" 复制数据到 \"%2$s" + 第 %1$d 步 共 %2$d 步 \ No newline at end of file From 8050670618928c3234204af8c3e2acbb754606d3 Mon Sep 17 00:00:00 2001 From: yzqzss <30341059+yzqzss@users.noreply.github.com> Date: Mon, 26 Aug 2019 13:16:54 +0800 Subject: [PATCH 53/85] Update Simplified Chinese Translation --- app/src/main/res/values-zh-rCN/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f3b97f5..123d638 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -64,7 +64,7 @@ USB写入结果通知 失败·点击查看详情 写入完成 - %1$s 写入过程中USB设备可能被拔出 + %1$s 写入过程中USB设备可能被拔出. %1$s 成功写入到 %2$s 故障排除信息 由于发生以下错误,无法完成操作: @@ -96,12 +96,12 @@ 无法在内部存储中找到文件。尝试在应用内打开它。 读取DMG镜像需要存储权限 - + AndroidX 对原始 Android 支持库进行了重大改进,并与各个 Android 版本向后兼容。 - + - + Material是一个设计系统 - 由开源代码支持 - 帮助开发者构建制作精美的产品。 在Android上将各种映像写入USB的应用,无需root权限。 捐赠 From dbd45666dbbb0e9ab21c0058d67af599aaf56cf8 Mon Sep 17 00:00:00 2001 From: Jakob Senkl Date: Sun, 25 Aug 2019 17:33:23 +0000 Subject: [PATCH 54/85] Update translation (German) Currently translated at 100.0% (102 of 102 strings) Translation: EtchDroid/App Translate-URL: https://etchdroid-l10n.depau.eu/projects/etchdroid/app/de/ --- app/src/main/res/values-de/strings.xml | 28 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 35b7653..d5f05c4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + EtchDroid Abbild direkt auf Datenträger schreiben (mithilfe der Android API) @@ -91,7 +91,7 @@ DMG Dateiwähler Zeigt das Ergebnis einer fertigen Schreiboperation an USB Schreibergebnis Benachrichtigungen - Schreiben fehlgeschlagen • Tippen für Info + Fehlgeschlagen • Tippen für Info Schreiben abgeschlossen %1$s wurde möglicherweise beim Schreiben ausgesteckt. %1$s wurde erfolgreich auf %2$s geschrieben @@ -122,8 +122,6 @@ Dateityp nicht unterstützt Datei kann im internen Speicher nicht gefunden werden. Versuche es innerhalb der App zu öffnen. Speicherberechtigung ist notwendig, um DMG Abbilder zu lesen - - AOSP @@ -135,8 +133,6 @@ true https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/ apache_2_0 - - JetBrains @@ -148,8 +144,6 @@ true https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib apache_2_0 - - Google @@ -161,8 +155,20 @@ true https://github.com/material-components/material-components-android apache_2_0 - Eine Anwendung, um Systemabbilder auf USB-Datenträger zu schreiben, auf Android und ohne Root-Pflicht. Kaufe mir einen Kaffee - - + Schritt %1$d von %2$d + Kopiere daten von %1$s zu %2$s + Schreibe %1$s zu %2$s + (unbekannt) + Aufgabe fehlgeschlagen. + Erledigt! + Fortsetzung von Speicherpunkt… + Aufgabe wird gestartet… + Aufgabe wird gestartet… + Zeigt Ergebnis einer erledigten Aufgabe + Aufgabenergebnis + Aufgabenfortschritt + Zeigt Fortschritt der aktuellen Aufgabe + Eine kleine Hilfe, damit libaums besser mit EtchDroid funktioniert + \ No newline at end of file From 32dff3c16b514cfcd82044bd4014299a9e4ed609 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 26 Aug 2019 08:00:54 +0200 Subject: [PATCH 55/85] Update Travis-CI config --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c1e1f4..23c6bd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ android: components: - tools - platform-tools - - build-tools-28.0.3 + - build-tools-29.0.2 - android-28 - extra-google-google_play_services @@ -19,5 +19,4 @@ android: install: - echo y | sdkmanager "ndk-bundle" - echo y | sdkmanager "cmake" - - echo y | sdkmanager "lldb;3.1" - + - echo y | sdkmanager "lldb" From b8e6c6cf064ced2d86c310c63240acacc6146ba0 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 26 Aug 2019 08:08:13 +0200 Subject: [PATCH 56/85] Update Travis-CI config --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index de27093..f67649e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ android: - platform-tools - build-tools-29.0.2 - android-28 + - ndk-bundle + - cmake + - lldb - extra-google-google_play_services - extra-google-m2repository @@ -14,8 +17,3 @@ android: licenses: - 'android-sdk-license-.+' - 'google-gdk-license-.+' - -install: - - echo y | sdkmanager "ndk-bundle" - - echo y | sdkmanager "cmake" - - echo y | sdkmanager "lldb" From 4fdf7fa76e60536107261b3dfce5c91b1b1bb69d Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 26 Aug 2019 08:13:07 +0200 Subject: [PATCH 57/85] Accept more SDK licenses for Travis build --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f67649e..ea07a4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,3 +17,5 @@ android: licenses: - 'android-sdk-license-.+' - 'google-gdk-license-.+' + - 'platforms;android-.+' + - 'build-tools;.+' From ba6d97cb9971951e745ec682177ec7f57fd259e5 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 26 Aug 2019 08:24:02 +0200 Subject: [PATCH 58/85] Switch to install packages manually in Travis --- .travis.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea07a4e..53d4d1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,13 @@ language: android -android: - components: - - tools - - platform-tools - - build-tools-29.0.2 - - android-28 - - ndk-bundle - - cmake - - lldb - - - extra-google-google_play_services - - extra-google-m2repository - - extra-android-m2repository - - licenses: - - 'android-sdk-license-.+' - - 'google-gdk-license-.+' - - 'platforms;android-.+' - - 'build-tools;.+' +install: + - yes | sdkmanager "tools" + - yes | sdkmanager "platform-tools" + - yes | sdkmanager "platforms;android-28" + - yes | sdkmanager "ndk-bundle" + - yes | sdkmanager "ndk;20.0.5594570" + - yes | sdkmanager "build-tools;29.0.2" + - yes | sdkmanager "cmake;3.10.2.4988404" + - yes | sdkmanager "lldb;3.1" + - yes | sdkmanager "extras;android;m2repository" + - yes | sdkmanager "extras;google;m2repository" From bf3cd40b18281d39988447640af2a814f9bf43e6 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 26 Aug 2019 08:29:31 +0200 Subject: [PATCH 59/85] Pipe sdkmanager output to /dev/null in Travis build --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53d4d1e..0c83dcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,13 @@ language: android install: - - yes | sdkmanager "tools" - - yes | sdkmanager "platform-tools" - - yes | sdkmanager "platforms;android-28" - - yes | sdkmanager "ndk-bundle" - - yes | sdkmanager "ndk;20.0.5594570" - - yes | sdkmanager "build-tools;29.0.2" - - yes | sdkmanager "cmake;3.10.2.4988404" - - yes | sdkmanager "lldb;3.1" - - yes | sdkmanager "extras;android;m2repository" - - yes | sdkmanager "extras;google;m2repository" + - yes | sdkmanager "tools" > /dev/null + - yes | sdkmanager "platform-tools" > /dev/null + - yes | sdkmanager "platforms;android-28" > /dev/null + - yes | sdkmanager "ndk-bundle" > /dev/null + - yes | sdkmanager "ndk;20.0.5594570" > /dev/null + - yes | sdkmanager "build-tools;29.0.2" > /dev/null + - yes | sdkmanager "cmake;3.10.2.4988404" > /dev/null + - yes | sdkmanager "lldb;3.1" > /dev/null + - yes | sdkmanager "extras;android;m2repository" > /dev/null + - yes | sdkmanager "extras;google;m2repository" > /dev/null From 03b1ad028cde026c9365186e79eff5b3c198e82b Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 26 Aug 2019 08:50:03 +0200 Subject: [PATCH 60/85] Suppress unused-command-line-argument warning --- dmg2img/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dmg2img/CMakeLists.txt b/dmg2img/CMakeLists.txt index d28ad45..33513de 100644 --- a/dmg2img/CMakeLists.txt +++ b/dmg2img/CMakeLists.txt @@ -16,9 +16,12 @@ execute_process( COMMAND touch VERSION WORKING_DIRECTORY src/c/libressl) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments") + include_directories(src/c/bzip2) include_directories(src/c/libressl/include) add_subdirectory(src/c/bzip2) add_subdirectory(src/c/libressl) -add_subdirectory(src/c/dmg2img) \ No newline at end of file +add_subdirectory(src/c/dmg2img) From 51ea00ff4333f52f3bb5eb0afd705db1296b331f Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 26 Aug 2019 10:50:49 +0200 Subject: [PATCH 61/85] Put back build-tools in android.components so Travis-CI doesn't complain --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0c83dcf..7cf1b1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: android +android: + components: + - build-tools-29.0.2 + install: - yes | sdkmanager "tools" > /dev/null - yes | sdkmanager "platform-tools" > /dev/null From f62229d0e0f03a585cdfadaa2d6ac090a1fc2f61 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 26 Aug 2019 11:16:45 +0200 Subject: [PATCH 62/85] Do not run instrumented tests on Travis-CI --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7cf1b1e..8d71707 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,3 +15,6 @@ install: - yes | sdkmanager "lldb;3.1" > /dev/null - yes | sdkmanager "extras;android;m2repository" > /dev/null - yes | sdkmanager "extras;google;m2repository" > /dev/null + +script: + - ./gradlew build test From 407a7045e48d6f10f0516d3f8e5f4cfc401bc515 Mon Sep 17 00:00:00 2001 From: yzqzss Date: Mon, 26 Aug 2019 05:49:38 +0000 Subject: [PATCH 63/85] Update translation (English) Currently translated at 100.0% (102 of 102 strings) Translation: EtchDroid/App Translate-URL: https://etchdroid-l10n.depau.eu/projects/etchdroid/app/en/ --- app/src/main/res/values/strings.xml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f9822fc..dd1d3cb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ + EtchDroid Write image directly to disk (using Android API) @@ -84,7 +85,7 @@ I understand While in most cases DMG images can be restored just fine, sometimes there may be inconsistencies. This is a warning. Flash image - If you continue, the selected image will be written and all data stored on the USB drive will be lost forever. + If you continue, the selected image will be written and all data stored on the USB drive will be lost forever! Warning Cancel MPL-2.0 @@ -112,10 +113,8 @@ File type not supported Cannot find file in internal storage. Try opening it from within the app. Storage permission is required to read DMG images - - - + AOSP https://developer.android.com AndroidX Jetpack @@ -125,10 +124,8 @@ true https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/ apache_2_0 - - - + JetBrains https://kotlinlang.org/ Kotlin Standard Library @@ -138,10 +135,8 @@ true https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib apache_2_0 - - - + Google https://material.io/develop/ Material Components @@ -151,7 +146,6 @@ true https://github.com/material-components/material-components-android apache_2_0 - An application to write OS images to USB drives, on Android, no root required. Buy me a coffee Used to show the progress of the current job @@ -168,5 +162,4 @@ Write %1$s to %2$s "Copy data from "%1$s" to "%2$s" Step %1$d of %2$d - - + \ No newline at end of file From 9948550902a20c59c4941361578ee94539e79e9f Mon Sep 17 00:00:00 2001 From: yzqzss Date: Mon, 26 Aug 2019 05:47:44 +0000 Subject: [PATCH 64/85] Update translation (Chinese (Simplified)) Currently translated at 96.1% (98 of 102 strings) Translation: EtchDroid/App Translate-URL: https://etchdroid-l10n.depau.eu/projects/etchdroid/app/zh_Hans/ --- app/src/main/res/values-zh-rCN/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 123d638..2366788 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -11,7 +11,7 @@ 选择的写入方式: 选择的USB设备: 未知文件名 - 镜像文件大小大于USB设备,塞不进去。 + 镜像文件大小大于USB设备,塞不进去 无法读取USB设备 点击“写入”按钮将镜像写入USB驱动器 USB 写入状态 @@ -35,8 +35,8 @@ 大小 此app USB相关驱动支持 - Custom BSD-like - Custom + 自定义 BSD-like + 自定义 关于 转换压缩的Apple® DMG镜像 选择USB驱动器 @@ -97,18 +97,18 @@ 读取DMG镜像需要存储权限 - AndroidX 对原始 Android 支持库进行了重大改进,并与各个 Android 版本向后兼容。 + AndroidX 对原始 Android 支持库进行了重大改进,并与各个 Android 版本向后兼容 - Material是一个设计系统 - 由开源代码支持 - 帮助开发者构建制作精美的产品。 + Material是一个设计系统 - 由开源代码支持 - 帮助开发者构建制作精美的产品 在Android上将各种映像写入USB的应用,无需root权限。 捐赠 - Used to show the progress of the current job + 用于显示当前处理的进度 处理进度 处理结果 - Used to show a completed job outcome + 用于显示处理完成的结果 开始处理… 开始处理… 从检查点恢复… From cc41ca3f9b81a3843b9b71184f902f00c337eea5 Mon Sep 17 00:00:00 2001 From: "Demetrio F. B" Date: Sun, 15 Sep 2019 10:03:18 +0000 Subject: [PATCH 65/85] Add translation (Romanian) --- app/src/main/res/values-ro/strings.xml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/src/main/res/values-ro/strings.xml diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml new file mode 100644 index 0000000..a6b3dae --- /dev/null +++ b/app/src/main/res/values-ro/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From 9bfd685c5d7c9e263ceeeafee96bc3b88f40ad23 Mon Sep 17 00:00:00 2001 From: "Demetrio F. B" Date: Sun, 15 Sep 2019 11:37:30 +0000 Subject: [PATCH 66/85] Update translation (German) Currently translated at 100.0% (102 of 102 strings) Translation: EtchDroid/App Translate-URL: https://etchdroid-l10n.depau.eu/projects/etchdroid/app/de/ --- app/src/main/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d5f05c4..ae36c74 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -84,7 +84,7 @@ Ich verstehe In den meisten Fällen können DMG Abbilder gut wiederhergestellt werden, aber manchmal könnten Probleme auftreten. Dies ist eine Warnung. Abbild flashen - Wenn du fortfährst, wird das ausgewählte Abbild geschrieben und alle Daten auf dem USB-Datenträger gehen für immer verloren. + Wenn du fortfährst, wird das ausgewählte Abbild geschrieben und alle Daten auf dem USB-Datenträger gehen für immer verloren! Warnung Abbrechen MPL-2.0 From 9c5a0942be6d786fa6927317e45435504e07809f Mon Sep 17 00:00:00 2001 From: "Demetrio F. B" Date: Sun, 15 Sep 2019 11:35:54 +0000 Subject: [PATCH 67/85] Update translation (Italian) Currently translated at 90.2% (92 of 102 strings) Translation: EtchDroid/App Translate-URL: https://etchdroid-l10n.depau.eu/projects/etchdroid/app/it/ --- app/src/main/res/values-it/strings.xml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8341f91..bd1bea7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,4 +1,4 @@ - + EtchDroid Scrivi immagine su dispositivo USB (utilizzando le API di Android) @@ -84,7 +84,7 @@ Capisco, prosegui Sebbene nella maggior parte dei casi le immagini DMG vengono ripristinate correttamente, talvolta potrebbero esserci delle inconsistenze. Tienilo a mente. Scrivi immagine - Se continui, l\'immagine verrà scritta e tutti i dati attualmente memorizzati sul dispositivo USB andranno persi. + Se continui, l\'immagine verrà scritta e tutti i dati attualmente memorizzati sul dispositivo USB andranno persi! Attenzione Annulla MPL-2.0 @@ -122,11 +122,15 @@ Tipo di file non supportato Impossibile trovare file nella memoria interna. Prova ad aprirlo da dentro l\'app. Il permesso per l\'archiviazione è richiesto per leggere i file DMG -AndroidX è una nuova versione della Libreria di Supporto Android e fornisce compatibilità con le precedenti versioni di Android + AndroidX è una nuova versione della Libreria di Supporto Android e fornisce compatibilità con le precedenti versioni di Android Libreria Standard Kotlin La libreria standard Kotlin fornisce il materiale essenziale per lavorare con Kotlin Un\'applicazione per scrivere immagini di sistemi operativi su chiavette USB, su Android, senza root. Offrimi un caffè - -Crea bei prodotti, più velocemente. Material è un sistema di design che, con l\'aiuto di software open-source, aiuta i team a sviluppare esperienze digitali - + Crea bei prodotti, più velocemente. Material è un sistema di design che, con l\'aiuto di software open-source, aiuta i team a sviluppare esperienze digitali + Fatto! + Mostra il risultato dell\'azione corrente + Risultato + Progressi + Mostra il progresso dell\'azione corrente + \ No newline at end of file From 313d3e6af6eac42cbec5f4a1d37a4c058b2d13f0 Mon Sep 17 00:00:00 2001 From: "Demetrio F. B" Date: Sun, 15 Sep 2019 10:15:58 +0000 Subject: [PATCH 68/85] Update translation (Romanian) Currently translated at 32.4% (33 of 102 strings) Translation: EtchDroid/App Translate-URL: https://etchdroid-l10n.depau.eu/projects/etchdroid/app/ro/ --- app/src/main/res/values-ro/strings.xml | 43 +++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a6b3dae..c4888dd 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,2 +1,43 @@ - \ No newline at end of file + + (necunoscut) + Terminat! + Începere din checkpoint… + Începere acțiune… + Începere acțiune… + Folosit pentru afișare rezultat de acțiune terminat + Rezultat de acțiune + Acțiune progres + Folosit pentru afișare progres la curent acțiune + Ințeles + Nu poate scrie imaginul la disc USB + Gata pentru scriere + Selectează disc USB + Acest aplicația + Dimensiune + Tip + Etichete + Nume + Necunoscut + Stocare disponibil + Nimic + Imagine selectat nu este DMG imaginul (poate este stricat) + Scrie imagine… + Inițializând… + Utilizat pentru afișati statul de imagineuri în scriere la discuri USB + Stat de scriere pentru USB + Atingeți Scrie pentru scriere imaginul la discul USB + Nu poate citire dispozitiv USB + Unetbootin flash stilul (Numai MBR, necesită root-ul) + Restabilește macOS DMG imagine la discul (utilizând Android API) + Scrie imagine la discul (utilizând Android API) + Nu poate scrie imagine deoarece el este mai mare ca dispozitiv USB + Nume de fișier neconosciut + Acces refuzat pentru + Dispozitiv USB selectat: + Mod de scrie selectat: + Imagine selectat: + Acces refuzat pentru dispozitiv USB + Reîncarcă + Scrie imagine de Windows (utilizând WoeUSB, necesită root-ul) + \ No newline at end of file From 34a38a010f4a915e48ec183e6dd1c1a1ec8d51e6 Mon Sep 17 00:00:00 2001 From: "Demetrio F. B" Date: Sun, 22 Sep 2019 16:03:22 +0000 Subject: [PATCH 69/85] Update translation (Romanian) Currently translated at 42.2% (43 of 102 strings) Translation: EtchDroid/App Translate-URL: https://etchdroid-l10n.depau.eu/projects/etchdroid/app/ro/ --- app/src/main/res/values-ro/strings.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c4888dd..60c3565 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -40,4 +40,14 @@ Acces refuzat pentru dispozitiv USB Reîncarcă Scrie imagine de Windows (utilizând WoeUSB, necesită root-ul) + Despre + Personalizat + Similar la BSD + Neformatată + Volumul fizic Linux LVM2 + Swap Linux + LUKS criptat + Datele APT + Tabel Partiții Apple (APT) + Tabel Partiții GUID (GPT) \ No newline at end of file From 882de9c5249e56810c14c083a196b7be61317847 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 5 Jan 2020 01:30:00 +0100 Subject: [PATCH 70/85] Test libaums USB bulk-only reset fix --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c905d3f..ca60995 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,7 +59,7 @@ dependencies { // implementation project(':libaums') // api 'com.github.magnusja:libaums:v0.7.0' - api 'com.github.EtchDroid:libaums_wrapper:v0.1.1' + api 'com.github.EtchDroid:libaums_wrapper:feature~bulk-only-reset-SNAPSHOT' implementation project(':dmg2img') From 645f725617bc12b6f3858528e137a8f5c89dbe70 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 5 Jan 2020 02:22:37 +0100 Subject: [PATCH 71/85] Do not crash whole app on exception --- .../java/eu/depau/etchdroid/services/UsbApiWriteService.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt index 98b7807..bdf4529 100644 --- a/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt @@ -109,8 +109,7 @@ abstract class UsbApiWriteService(name: String) : UsbWriteService(name) { resultNotification(usbDevice.name, uri.getFileName(this)!!, null, writtenBytes, startTime) } catch (e: Exception) { resultNotification(usbDevice.name, uri.getFileName(this)!!, e, writtenBytes, startTime) - Log.e(TAG, "Could't write image to ${usbDevice.name}") - throw e + Log.e(TAG, "Could't write image to ${usbDevice.name}", e) } finally { wakeLock(false) msDev.close() From 46ed58ce51826673b7727699e91f4a643c9a35a1 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 5 Jan 2020 02:23:35 +0100 Subject: [PATCH 72/85] Update "Android 9 error" possible message in ErrorActivity --- .../main/java/eu/depau/etchdroid/ui/activities/ErrorActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/eu/depau/etchdroid/ui/activities/ErrorActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/ErrorActivity.kt index 15a14f8..59b9f99 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/activities/ErrorActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/ErrorActivity.kt @@ -12,7 +12,7 @@ class ErrorActivity : ActivityBase() { val msg = intent.getStringExtra("error") error_message.text = msg - if ("errno 88" in msg) + if ("bulk only mass storage reset" in msg) troubleshooting_info.text = getString(R.string.troubleshoot_sock_op_on_non_sock) else troubleshooting_info.text = getString(R.string.unknown_error) From f1d7b184513a3c187cd532ad66b41c8b315d12a9 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 5 Jan 2020 02:33:48 +0100 Subject: [PATCH 73/85] "Fix" dialog button color --- app/src/main/res/values-night/styles.xml | 12 ++++++++++-- app/src/main/res/values/styles.xml | 14 +++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 3e2042c..4fe7e68 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -1,8 +1,16 @@ + - @@ -14,5 +22,5 @@ @style/PersonDialogTheme - + + + +