diff --git a/.gitignore b/.gitignore
index daaeaef..05fb84d 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,
@@ -121,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/.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/.travis.yml b/.travis.yml
index a5a95af..8d71707 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: android
android:
components:
- - build-tools-28.0.3
+ - build-tools-29.0.2
install:
- yes | sdkmanager "tools" > /dev/null
@@ -10,8 +10,11 @@ install:
- 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;28.0.3" > /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
+
+script:
+ - ./gradlew build test
diff --git a/app/build.gradle b/app/build.gradle
index 61adc37..6ba8c40 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,50 +5,71 @@ 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
- versionCode 9
- versionName "1.3.32"
+ minSdkVersion 21
+ targetSdkVersion 29
+ versionCode 11
+ versionName "1.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
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 {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
- implementation 'com.google.android.material:material:1.2.0-alpha02'
- implementation 'androidx.recyclerview:recyclerview:1.1.0'
+ implementation 'androidx.appcompat:appcompat:1.2.0-alpha01'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+ implementation 'com.google.android.material:material:1.2.0-alpha03'
+ implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha01'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.core:core:1.2.0-rc01'
- implementation 'androidx.fragment:fragment:1.2.0-rc02'
+ implementation 'androidx.fragment:fragment:1.2.0-rc05'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
- api 'com.google.guava:guava:27.0.1-android'
-
+ implementation 'com.github.Depau:kotlet-android:v0.2.5'
+ implementation 'com.google.code.gson:gson:2.8.5'
+ implementation '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')
+
+ api 'com.github.EtchDroid:libaums_wrapper:v1.1'
+ api 'me.jahnen:libaums-libusbcommunication:0.1'
+
implementation project(':dmg2img')
implementation 'me.jfenn:Attribouter:0.1.5'
- testImplementation 'junit:junit:4.13-beta-1'
+ implementation 'androidx.room:room-runtime:2.2.3'
+ annotationProcessor 'androidx.room:room-compiler:2.2.3'
+
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/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b4245..7380432 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,6 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
+
+-dontobfuscate
+-keep class java.lang.ClassValue
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d0b32cf..6c33239 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"/>
-
+
+
+
+
\ No newline at end of file
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..3d41836
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/AppBuildConfig.kt
@@ -0,0 +1,9 @@
+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/StateKeeper.kt b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
index fcb54f8..bcb824c 100644
--- a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
+++ b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
@@ -2,15 +2,14 @@ package eu.depau.etchdroid
import android.hardware.usb.UsbDevice
import android.net.Uri
-import com.github.mjdev.libaums.UsbMassStorageDevice
-import eu.depau.etchdroid.enums.FlashMethod
-import eu.depau.etchdroid.img_types.Image
+import eu.depau.etchdroid.libaums_wrapper.EtchDroidUsbMassStorageDevice
+import eu.depau.etchdroid.utils.enums.FlashMethod
+import eu.depau.etchdroid.utils.imagetypes.Image
object StateKeeper {
var flashMethod: FlashMethod? = null
var imageFile: Uri? = null
var imageRepr: Image? = null
-
var usbDevice: UsbDevice? = null
- var usbMassStorageDevice: UsbMassStorageDevice? = null
+ var libusbRegistered: Boolean = false
}
\ No newline at end of file
diff --git a/app/src/main/java/eu/depau/etchdroid/activities/LicensesActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/LicensesActivity.kt
deleted file mode 100644
index 12f4eb4..0000000
--- a/app/src/main/java/eu/depau/etchdroid/activities/LicensesActivity.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package eu.depau.etchdroid.activities
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.MenuItem
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import eu.depau.etchdroid.R
-import eu.depau.etchdroid.adapters.LicenseRecyclerViewAdapter
-import eu.depau.etchdroid.utils.ClickListener
-import eu.depau.etchdroid.utils.License
-import eu.depau.etchdroid.utils.RecyclerViewTouchListener
-import kotlinx.android.synthetic.main.activity_licenses.*
-
-
-class LicensesActivity : AppCompatActivity() {
- private lateinit var recyclerView: RecyclerView
- private lateinit var viewManager: RecyclerView.LayoutManager
- private lateinit var viewAdapter: LicenseRecyclerViewAdapter
-
- lateinit var licenses: Array
-
- 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/broadcasts/JobProgressUpdateBroadcast.kt b/app/src/main/java/eu/depau/etchdroid/broadcasts/JobProgressUpdateBroadcast.kt
new file mode 100644
index 0000000..8d5c837
--- /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.broadcasts.dto.JobProgressUpdateBroadcastDTO
+
+object JobProgressUpdateBroadcast {
+ const val ACTION = "eu.depau.etchdroid.broadcast.JOB_PROGRESS_UPDATE"
+
+ fun getIntent(dto: JobProgressUpdateBroadcastDTO) = Intent().apply {
+ 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
new file mode 100644
index 0000000..75f65aa
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/broadcasts/dto/JobProgressUpdateBroadcastDTO.kt
@@ -0,0 +1,30 @@
+package eu.depau.etchdroid.broadcasts.dto
+
+import android.content.Intent
+import eu.depau.etchdroid.utils.worker.enums.RateUnit
+import java.io.Serializable
+
+
+data class JobProgressUpdateBroadcastDTO(
+ val jobId: Long,
+ 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: Throwable? = null
+) : Serializable {
+ fun writeToIntent(intent: Intent) {
+ intent.putExtra(EXTRA, this)
+ }
+
+ companion object {
+ const val EXTRA = "eu.depau.etchdroid.broadcast.extras.UPDATE_DTO"
+
+ fun readFromIntent(intent: Intent) =
+ intent.getSerializableExtra(EXTRA)!! 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..5cad1ef
--- /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 = 0,
+ 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..9b91c29
--- /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.*
+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)
+
+ @Update
+ fun update(job: Job)
+
+ @Delete
+ fun delete(job: Job)
+}
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/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/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/JobProcedureBuilder.kt b/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt
new file mode 100644
index 0000000..73e3b13
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/job/JobProcedureBuilder.kt
@@ -0,0 +1,121 @@
+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.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.*
+
+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" }
+
+ return when (jobType) {
+ INOUT_STREAM_COPY -> buildInOutStreamCopyProcedure(context)
+ DMG_EXTRACT_TO_OUTPUTSTREAM -> TODO()
+ WINDOWS_INSTALLER -> TODO()
+ MACOS_INSTALLER -> TODO()
+ UNETBOOTIN -> TODO()
+ }
+ }
+
+
+ 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/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/job/procedures/inoutstreamcopy.kt b/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt
new file mode 100644
index 0000000..4fa62bc
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/job/procedures/inoutstreamcopy.kt
@@ -0,0 +1,88 @@
+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)
+
+ return 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
+ )
+ )
+ }
+}
\ 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..87c6602
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/job/procedures/stuffnamers.kt
@@ -0,0 +1,41 @@
+package eu.depau.etchdroid.job.procedures
+
+import android.content.Context
+import android.hardware.usb.UsbDevice
+import android.net.Uri
+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
+ */
+
+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 {
+ return try {
+ this.getFilePath(context)!!
+ } catch (e: Exception) {
+ 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
new file mode 100644
index 0000000..d817293
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/notification/IServiceNotificationBuilder.kt
@@ -0,0 +1,8 @@
+package eu.depau.etchdroid.notification
+
+import androidx.core.app.NotificationCompat
+
+interface IServiceNotificationBuilder {
+ 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/JobServiceNotificationBuilder.kt b/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationBuilder.kt
new file mode 100644
index 0000000..aacbb18
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/notification/impl/JobServiceNotificationBuilder.kt
@@ -0,0 +1,64 @@
+package eu.depau.etchdroid.notification.impl
+
+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.R
+import eu.depau.etchdroid.notification.IServiceNotificationBuilder
+import eu.depau.kotlet.android.extensions.notification.NotificationImportanceCompat
+import eu.depau.kotlet.android.extensions.notification.registerNotificationChannel
+
+class JobServiceNotificationBuilder(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 {
+ 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 getBuilder(): NotificationCompat.Builder {
+ val builder = getNotificationBuilder(notificationChannelProgress)
+ return builder.apply {
+ setSmallIcon(R.drawable.ic_usb_white_24dp)
+ setContentTitle(context.getString(R.string.notif_starting_job))
+ setProgress(100, 0, true)
+ }
+ }
+
+ 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/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..bdf4529 100644
--- a/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt
+++ b/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt
@@ -4,10 +4,10 @@ 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.exceptions.UsbWriteException
-import eu.depau.etchdroid.kotlin_exts.getFileName
-import eu.depau.etchdroid.kotlin_exts.name
+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
import java.io.BufferedInputStream
import java.io.InputStream
import java.nio.ByteBuffer
@@ -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)
@@ -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()
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..ba1e245 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
@@ -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/JobService.kt b/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt
new file mode 100644
index 0000000..edbb863
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/services/job/JobService.kt
@@ -0,0 +1,25 @@
+package eu.depau.etchdroid.services.job
+
+import android.app.IntentService
+import android.content.Intent
+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) {
+ override fun onHandleIntent(intent: Intent?) {
+ 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/ProgressBroadcastForwarder.kt b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt
new file mode 100644
index 0000000..8bf5bf2
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/services/job/ProgressBroadcastForwarder.kt
@@ -0,0 +1,200 @@
+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
+
+/**
+ * This class is subscribed to IAsyncWorker+IWorkerProgressSender events by the worker service.
+ * It is aware of the current JobProcedure.
+ *
+ * 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 job = db.jobRepository().getById(jobId)
+ private val procedure = job.jobProcedure
+
+ 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()")
+ }
+ }
+
+
+ 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 = job.jobProcedure
+ .subList(0, currentActionIdx!!)
+ .map { it.progressWeight }
+ .sum()
+
+ 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)
+ }
+
+
+ /**
+ * Called by the worker service to notify the forwarder that the currently referenced procedure
+ * has finished successfully.
+ */
+ override fun onProcedureDone() {
+ assertProcedureStarted()
+
+ 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)
+ }
+
+
+ /**
+ * Called by the worker service to notify the forwarder that the currently referenced procedure
+ * has failed with the provided exception.
+ */
+ override fun onProcedureError(error: Throwable) {
+ assertProcedureStarted()
+
+ 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)
+ }
+
+
+ /**
+ * 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 onWorkerProgress(dto: ProgressUpdateDTO) {
+ assertProcedureStarted()
+
+ 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)
+ }
+
+
+ /**
+ * 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 onActionStart(actionIndex: Int) {
+ assertProcedureStarted()
+ currentActionIdx = actionIndex
+
+ 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)
+ }
+
+
+ /**
+ * 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.
+ */
+ override fun onActionDone() {
+ assertProcedureStarted()
+ 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/services/job/dto/JobServiceIntentDTO.kt b/app/src/main/java/eu/depau/etchdroid/services/job/dto/JobServiceIntentDTO.kt
new file mode 100644
index 0000000..04a7fbe
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/services/job/dto/JobServiceIntentDTO.kt
@@ -0,0 +1,28 @@
+package eu.depau.etchdroid.services.job.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/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/activities/ActivityBase.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/ActivityBase.kt
similarity index 81%
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..84c7a94 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,7 +1,10 @@
-package eu.depau.etchdroid.activities
+package eu.depau.etchdroid.ui.activities
import android.Manifest
+import android.content.Intent
import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.view.Menu
@@ -10,16 +13,14 @@ 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.ui.misc.DoNotShowAgainDialogFragment
+import eu.depau.etchdroid.ui.misc.NightModeHelper
+import eu.depau.etchdroid.utils.ktexts.toast
import me.jfenn.attribouter.Attribouter
-import android.content.Intent
-import android.net.Uri
abstract class ActivityBase : AppCompatActivity() {
- protected lateinit var nightModeHelper: NightModeHelper
+ protected var nightModeHelper: NightModeHelper? = null
val DISMISSED_DIALOGS_PREFS = "dismissed_dialogs"
val READ_REQUEST_CODE = 42
val READ_EXTERNAL_STORAGE_PERMISSION = 29
@@ -38,8 +39,11 @@ abstract class ActivityBase : AppCompatActivity() {
editor.apply()
}
+ internal val isNightMode: Boolean
+ get() = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES != 0
+
fun showAndroidPieAlertDialog(callback: () -> Unit) {
- val dialogFragment = DoNotShowAgainDialogFragment(nightModeHelper.nightMode)
+ val dialogFragment = DoNotShowAgainDialogFragment(isNightMode)
dialogFragment.title = getString(R.string.android_pie_bug)
dialogFragment.message = getString(R.string.android_pie_bug_dialog_text)
dialogFragment.positiveButton = getString(R.string.i_understand)
@@ -72,12 +76,21 @@ abstract class ActivityBase : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- nightModeHelper = NightModeHelper(this, R.style.AppTheme)
+
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+ nightModeHelper = NightModeHelper(this, R.style.AppTheme)
+ }
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
// Inflate the menu; this adds items to the action bar if it is present.
menuInflater.inflate(R.menu.menu_main, menu)
+
+ // Hide night mode menu on Android 10 as it causes weird issues
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ menu.findItem(R.id.action_nightmode).isVisible = false
+ }
+
return true
}
@@ -102,7 +115,7 @@ abstract class ActivityBase : AppCompatActivity() {
return true
}
R.id.action_nightmode -> {
- nightModeHelper.toggle()
+ nightModeHelper?.toggle()
return true
}
else -> super.onOptionsItemSelected(item)
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 88%
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..0992bb4 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,24 +1,31 @@
-package eu.depau.etchdroid.activities
+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.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.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.utils.DoNotShowAgainDialogFragment
+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 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
@@ -36,7 +43,7 @@ class ConfirmationActivity : ActivityBase() {
fun showDataLossAlertDialog() {
- val dialogFragment = DoNotShowAgainDialogFragment(nightModeHelper.nightMode)
+ val dialogFragment = DoNotShowAgainDialogFragment(isNightMode)
dialogFragment.title = getString(R.string.warning)
dialogFragment.message = getString(R.string.dataloss_confirmation_dialog_message)
dialogFragment.positiveButton = getString(R.string.confirm_flash_image)
@@ -93,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!!.blockDevice
+ aumsDev.init()
+ val blockDev = aumsDev.blockDevices[0]
if (blockDev != null) {
val devSize = (blockDev.size.toLong() * blockDev.blockSize.toLong())
@@ -112,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 {
@@ -119,7 +128,7 @@ class ConfirmationActivity : ActivityBase() {
break
}
} finally {
- StateKeeper.usbMassStorageDevice!!.close()
+ aumsDev.close()
}
}
}
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 60%
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..60f78c1 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
@@ -11,10 +11,6 @@ class ErrorActivity : ActivityBase() {
setContentView(R.layout.activity_error)
val msg = intent.getStringExtra("error")
error_message.text = msg
-
- if ("errno 88" in msg)
- troubleshooting_info.text = getString(R.string.troubleshoot_sock_op_on_non_sock)
- else
- troubleshooting_info.text = getString(R.string.unknown_error)
+ troubleshooting_info.text = getString(R.string.unknown_error)
}
}
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 75%
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..8037fc5 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
@@ -8,11 +8,13 @@ import android.os.Environment
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import com.codekidlabs.storagechooser.StorageChooser
+import com.github.mjdev.libaums.usb.UsbCommunicationFactory
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.ui.misc.DoNotShowAgainDialogFragment
+import eu.depau.etchdroid.utils.enums.FlashMethod
import kotlinx.android.synthetic.main.activity_start.*
+import me.jahnen.libaums.libusbcommunication.LibusbCommunicationCreator
import java.io.File
@@ -37,33 +39,53 @@ class StartActivity : ActivityBase() {
setContentView(R.layout.activity_start)
btn_image_raw.setOnClickListener(this::onButtonClicked)
btn_image_dmg.setOnClickListener(this::onButtonClicked)
+ btn_broken_usb.setOnClickListener(this::onButtonClicked)
+
+ if (!StateKeeper.libusbRegistered) {
+ UsbCommunicationFactory.apply {
+ registerCommunication(LibusbCommunicationCreator())
+ underlyingUsbCommunication = UsbCommunicationFactory.UnderlyingUsbCommunication.OTHER
+ }
+ StateKeeper.libusbRegistered = true
+ }
}
fun onButtonClicked(view: View) = onButtonClicked(view, true)
+ private fun openBrokenUsbPage() {
+ val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://etchdroid.depau.eu/broken_usb/"))
+ startActivity(intent)
+ }
+
private fun onButtonClicked(view: View?, showDMGDialog: Boolean = true, showAndroidPieDialog: Boolean = true) {
- if (view != null)
+ if (view != null) {
+ if (view.id == R.id.btn_broken_usb) {
+ openBrokenUsbPage()
+ return
+ }
+
StateKeeper.flashMethod = when (view.id) {
R.id.btn_image_raw -> FlashMethod.FLASH_API
R.id.btn_image_dmg -> FlashMethod.FLASH_DMG_API
- else -> null
+ else -> null
}
- if (showAndroidPieDialog && shouldShowAndroidPieAlertDialog) {
- showAndroidPieAlertDialog { onButtonClicked(view, showDMGDialog, false) }
- return
- }
+// if (showAndroidPieDialog && shouldShowAndroidPieAlertDialog) {
+// showAndroidPieAlertDialog { onButtonClicked(view, showDMGDialog, false) }
+// return
+// }
- if (showDMGDialog && shouldShowDMGAlertDialog && StateKeeper.flashMethod == FlashMethod.FLASH_DMG_API) {
- showDMGBetaAlertDialog { onButtonClicked(view, false, showAndroidPieDialog) }
- return
- }
+ if (showDMGDialog && shouldShowDMGAlertDialog && StateKeeper.flashMethod == FlashMethod.FLASH_DMG_API) {
+ showDMGBetaAlertDialog { onButtonClicked(view, false, showAndroidPieDialog) }
+ return
+ }
- showFilePicker()
+ showFilePicker()
+ }
}
fun showDMGBetaAlertDialog(callback: () -> Unit) {
- val dialogFragment = DoNotShowAgainDialogFragment(nightModeHelper.nightMode)
+ val dialogFragment = DoNotShowAgainDialogFragment(isNightMode)
dialogFragment.title = getString(R.string.here_be_dragons)
dialogFragment.message = getString(R.string.dmg_alert_dialog_text)
dialogFragment.positiveButton = getString(R.string.i_understand)
@@ -130,6 +152,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/java/eu/depau/etchdroid/activities/UsbDrivePickerActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/UsbDrivePickerActivity.kt
similarity index 93%
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..1a72019 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,13 @@ 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.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.*
+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
@@ -120,7 +121,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 {
@@ -182,7 +183,6 @@ class UsbDrivePickerActivity : ActivityBase(), SwipeRefreshLayout.OnRefreshListe
}
StateKeeper.usbDevice = device
- StateKeeper.usbMassStorageDevice = UsbMassStorageDevice.getMassStorageDevices(context).find { it.usbDevice == device }
nextStep()
}
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 95%
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..ac9cc34 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
@@ -21,7 +21,7 @@ class DoNotShowAgainDialogFragment(nightMode: Boolean) : DialogFragment() {
constructor() : this(false)
init {
- setStyle(DialogFragment.STYLE_NORMAL, dialogTheme)
+ setStyle(STYLE_NORMAL, dialogTheme)
}
interface DialogListener {
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/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/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/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/utils/StringResBuilder.kt b/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt
new file mode 100644
index 0000000..f4f1f03
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/StringResBuilder.kt
@@ -0,0 +1,45 @@
+package eu.depau.etchdroid.utils
+
+import android.annotation.SuppressLint
+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 {
+ @SuppressLint("ParcelClassLoader")
+ constructor(parcel: Parcel) : this(
+ parcel.readInt(),
+ parcel.readArray(null) as Array
+ )
+
+ 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) {
+ 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/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/exceptions/CannotGetFilePathException.kt b/app/src/main/java/eu/depau/etchdroid/utils/exception/CannotGetFilePathException.kt
similarity index 61%
rename from app/src/main/java/eu/depau/etchdroid/exceptions/CannotGetFilePathException.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/exception/CannotGetFilePathException.kt
index 7e5ccd6..180b596 100644
--- a/app/src/main/java/eu/depau/etchdroid/exceptions/CannotGetFilePathException.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/exception/CannotGetFilePathException.kt
@@ -1,3 +1,3 @@
-package eu.depau.etchdroid.exceptions
+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/exceptions/UsbWriteException.kt b/app/src/main/java/eu/depau/etchdroid/utils/exception/UsbWriteException.kt
similarity index 70%
rename from app/src/main/java/eu/depau/etchdroid/exceptions/UsbWriteException.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/exception/UsbWriteException.kt
index d79681e..3a54fad 100644
--- a/app/src/main/java/eu/depau/etchdroid/exceptions/UsbWriteException.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/exception/UsbWriteException.kt
@@ -1,6 +1,6 @@
-package eu.depau.etchdroid.exceptions
+package eu.depau.etchdroid.utils.exception
-import eu.depau.etchdroid.kotlin_exts.toHRSize
+import eu.depau.etchdroid.utils.ktexts.toHRSize
import java.io.IOException
class UsbWriteException(offset: Long, writtenBytes: Long, exc: Exception) : IOException(
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..8780b07
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/DMGImage.kt
@@ -0,0 +1,153 @@
+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.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 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 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(context, 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
+ }
+
+ 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
new file mode 100644
index 0000000..0237d4a
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/imagetypes/Image.kt
@@ -0,0 +1,13 @@
+package eu.depau.etchdroid.utils.imagetypes
+
+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/job/IJobAction.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt
new file mode 100644
index 0000000..5bd4624
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobAction.kt
@@ -0,0 +1,51 @@
+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 {
+ /**
+ * 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(sharedData: MutableMap): 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..3aa00b0
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedure.kt
@@ -0,0 +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 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
new file mode 100644
index 0000000..8d5a817
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProcedureBuilder.kt
@@ -0,0 +1,8 @@
+package eu.depau.etchdroid.utils.job
+
+import android.content.Context
+import android.os.Parcelable
+
+interface IJobProcedureBuilder : Parcelable {
+ fun build(context: Context): IJobProcedure
+}
\ 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
new file mode 100644
index 0000000..d474502
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/job/IJobProgressListener.kt
@@ -0,0 +1,42 @@
+package eu.depau.etchdroid.utils.job
+
+/**
+ * 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 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 onProcedureError will follow with an Exception reference.
+ */
+ fun onActionDone()
+
+ /**
+ * 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 onProcedureStart(startActionIndex: Int = 0)
+
+ /**
+ * 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: 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/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/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/job/impl/JobProcedure.kt b/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt
new file mode 100644
index 0000000..c597a67
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/job/impl/JobProcedure.kt
@@ -0,0 +1,31 @@
+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
+
+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 {
+ writeParcelable(name, flags)
+ 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/kotlin_exts/ContextGetBinary.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextGetBinary.kt
similarity index 96%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextGetBinary.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextGetBinary.kt
index cb89b83..8644ef0 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextGetBinary.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextGetBinary.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import android.content.Context
import android.os.Build
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextToast.kt
similarity index 82%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextToast.kt
index 9f44b4f..03e9dfe 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ContextToast.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import android.content.Context
import android.widget.Toast
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/InputStreamToString.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/InputStreamToString.kt
similarity index 91%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/InputStreamToString.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/InputStreamToString.kt
index 807f4df..6b9a752 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/InputStreamToString.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/InputStreamToString.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import java.io.ByteArrayOutputStream
import java.io.IOException
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/kotlin_exts/NumberToSizeString.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToSizeString.kt
similarity index 96%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToSizeString.kt
index c259192..1e65fab 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToSizeString.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
// https://stackoverflow.com/a/3758880/1124621
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToTimeString.kt
similarity index 95%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToTimeString.kt
index 5a0ea78..983c43b 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/NumberToTimeString.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
private val timeStrings = arrayOf("s", "m", "h", "d")
private val timeDivs = arrayOf(60, 60, 24)
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetDisplayName.kt
similarity index 94%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetDisplayName.kt
index c52c4b9..34d8fbf 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetDisplayName.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import android.content.Context
import android.net.Uri
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileExt.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileExt.kt
similarity index 92%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileExt.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileExt.kt
index bc55af2..2e058a7 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileExt.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileExt.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import android.content.ContentResolver
import android.net.Uri
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFilePath.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFilePath.kt
similarity index 97%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFilePath.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFilePath.kt
index 714eeda..6981ca3 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFilePath.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFilePath.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import android.content.ContentUris
import android.content.Context
@@ -7,7 +7,7 @@ import android.os.Build
import android.os.Environment
import android.provider.DocumentsContract
import android.provider.MediaStore
-import eu.depau.etchdroid.exceptions.CannotGetFilePathException
+import eu.depau.etchdroid.utils.exception.CannotGetFilePathException
/**
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileSize.kt
similarity index 96%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileSize.kt
index 46fa800..91fa893 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UriGetFileSize.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import android.content.ContentResolver
import android.content.Context
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UsbDeviceVidPidName.kt
similarity index 91%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/UsbDeviceVidPidName.kt
index 76a0ac9..b0cd036 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/UsbDeviceVidPidName.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import android.hardware.usb.UsbDevice
import android.os.Build
diff --git a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ViewSnackbar.kt
similarity index 84%
rename from app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ktexts/ViewSnackbar.kt
index 4f4192b..9e67127 100644
--- a/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/ViewSnackbar.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.kotlin_exts
+package eu.depau.etchdroid.utils.ktexts
import android.view.View
import com.google.android.material.snackbar.Snackbar
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/utils/worker/IAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IAsyncWorker.kt
new file mode 100644
index 0000000..47c78a0
--- /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: IWorkerProgressSender {
+ /**
+ * 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/IWorkerProgressListener.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressListener.kt
new file mode 100644
index 0000000..f578f74
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/IWorkerProgressListener.kt
@@ -0,0 +1,13 @@
+package eu.depau.etchdroid.utils.worker
+
+import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO
+
+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 onWorkerProgress(dto: ProgressUpdateDTO)
+}
\ 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/dto/ProgressUpdateDTO.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt
new file mode 100644
index 0000000..e4265c4
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/dto/ProgressUpdateDTO.kt
@@ -0,0 +1,36 @@
+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 message: StringResBuilder? = null
+) : KotletParcelable {
+ constructor(parcel: Parcel) : this(
+ progress = parcel.readNullable { parcel.readDouble() },
+ rate = parcel.readNullable { parcel.readDouble() },
+ rateUnit = parcel.readNullable { parcel.readEnum() },
+ message = parcel.readNullable {
+ (parcel.readParcelable(StringResBuilder::class.java.classLoader) as StringResBuilder?)!!
+ }
+ )
+
+ override fun writeToParcel(parcel: Parcel, flags: Int) {
+ parcel.apply {
+ writeNullable(progress) { writeDouble(it) }
+ writeNullable(rate) { writeDouble(it) }
+ writeNullable(rateUnit) { writeEnum(rateUnit) }
+ writeNullable(message) { writeParcelable(message, flags) }
+ }
+ }
+
+ companion object {
+ @JvmField
+ val CREATOR = parcelableCreator(::ProgressUpdateDTO)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/RateUnit.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/RateUnit.kt
new file mode 100644
index 0000000..2aae7b4
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/enums/RateUnit.kt
@@ -0,0 +1,6 @@
+package eu.depau.etchdroid.utils.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/utils/worker/impl/AbstractAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt
new file mode 100644
index 0000000..735b5d8
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAsyncWorker.kt
@@ -0,0 +1,5 @@
+package eu.depau.etchdroid.utils.worker.impl
+
+import eu.depau.etchdroid.utils.worker.IAsyncWorker
+
+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
new file mode 100644
index 0000000..211112f
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractAutoProgressAsyncWorker.kt
@@ -0,0 +1,43 @@
+package eu.depau.etchdroid.utils.worker.impl
+
+import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO
+import eu.depau.etchdroid.utils.worker.enums.RateUnit
+
+
+abstract class AbstractAutoProgressAsyncWorker(
+ private val alreadyDone: Long,
+ private val totalToDo: Long,
+ private val rateUnit: RateUnit
+) : AbstractAsyncWorker() {
+
+ private var doneAccumulator = alreadyDone
+ private var doneSinceLastUpdate = 0L
+ private var lastUpdateTime = 0L
+
+ fun progressUpdate(stepDone: Long) {
+ val currentTime = System.currentTimeMillis()
+
+ doneSinceLastUpdate += stepDone
+ doneAccumulator += stepDone
+
+ if (currentTime > lastUpdateTime + UPDATE_INTERVAL) {
+ val progress = doneAccumulator.toDouble() / totalToDo
+ val speedUnitPerMillis = doneSinceLastUpdate.toDouble() / (currentTime - lastUpdateTime)
+
+ val dto = ProgressUpdateDTO(
+ progress = progress,
+ rate = speedUnitPerMillis * 1000,
+ rateUnit = rateUnit
+ )
+
+ notifyWorkerProgress(dto)
+
+ doneSinceLastUpdate = 0
+ 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/AbstractWorkerProgressSender.kt b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractWorkerProgressSender.kt
new file mode 100644
index 0000000..c1b1055
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/utils/worker/impl/AbstractWorkerProgressSender.kt
@@ -0,0 +1,19 @@
+package eu.depau.etchdroid.utils.worker.impl
+
+import eu.depau.etchdroid.utils.worker.IWorkerProgressListener
+import eu.depau.etchdroid.utils.worker.IWorkerProgressSender
+import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO
+
+
+abstract class AbstractWorkerProgressSender : IWorkerProgressSender {
+ private val listeners = ArrayList()
+
+ override fun attachWorkerProgressListener(listener: IWorkerProgressListener) =
+ listeners.add(listener)
+
+ override fun detachWorkerProgressListener(listener: IWorkerProgressListener) =
+ listeners.remove(listener)
+
+ 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/Dmg2OutputStreamConvertAsyncWorker.kt b/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncWorker.kt
new file mode 100644
index 0000000..a1c6e50
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/workers/Dmg2OutputStreamConvertAsyncWorker.kt
@@ -0,0 +1,23 @@
+package eu.depau.etchdroid.workers
+
+import android.content.Context
+import android.net.Uri
+import eu.depau.etchdroid.utils.imagetypes.DMGImage
+import java.io.OutputStream
+
+
+class Dmg2OutputStreamConvertAsyncWorker private constructor(
+ private val i2oStreamWorker: Input2OutputStreamCopyAsyncWorker
+) : IMergedAsyncWorkerProgressSender by i2oStreamWorker {
+
+ constructor(
+ context: Context,
+ sourceDmgUri: Uri,
+ dest: OutputStream,
+ chunkSize: Int
+ ) : this(
+ DMGImage.getRawImageInputStream(context, sourceDmgUri).let {
+ Input2OutputStreamCopyAsyncWorker(it, dest, 0, chunkSize, 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..f20fb6a
--- /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.IWorkerProgressSender
+
+
+internal interface IMergedAsyncWorkerProgressSender: IAsyncWorker, IWorkerProgressSender
\ 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
new file mode 100644
index 0000000..15d5054
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/workers/Input2OutputStreamCopyAsyncWorker.kt
@@ -0,0 +1,41 @@
+package eu.depau.etchdroid.workers
+
+import eu.depau.etchdroid.utils.worker.enums.RateUnit
+import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker
+import java.io.InputStream
+import java.io.OutputStream
+
+
+open class Input2OutputStreamCopyAsyncWorker(
+ private val source: InputStream,
+ private val dest: OutputStream,
+ private val seek: Long,
+ chunkSize: Int = 512 * 32 * 64, // 1 MB
+ size: Long
+) :
+ IMergedAsyncWorkerProgressSender,
+ AbstractAutoProgressAsyncWorker(
+ 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)
+ return false
+
+ dest.write(buffer, 0, readBytes)
+ progressUpdate(readBytes.toLong())
+
+ return true
+ }
+}
\ No newline at end of file
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..c9b8aba
--- /dev/null
+++ b/app/src/main/java/eu/depau/etchdroid/workers/StreamOpenWorker.kt
@@ -0,0 +1,80 @@
+package eu.depau.etchdroid.workers
+
+import android.content.Context
+import android.hardware.usb.UsbDevice
+import android.net.Uri
+import eu.depau.etchdroid.job.enums.TargetType
+import eu.depau.etchdroid.job.enums.TargetType.*
+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.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): EtchDroidUsbMassStorageDevice {
+ val context = sharedData[SharedDataType.CONTEXT] as Context
+ return usbDevice.getMassStorageDevices(context)[0]
+ }
+
+ private fun getAUMSBlockDevStream(): Any {
+ val usbDev = (targetDescriptor as UsbDevice)
+ val aumsDev = getAUMSDevice(usbDev).apply { init() }
+ val blockDev = aumsDev.blockDevices[0]!!
+
+ 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
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">
@@ -146,10 +142,62 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/textView4"
- android:text="@string/dmg_image_desc"/>
+ android:text="@string/dmg_image_desc" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 e5be547..9e85df8 100644
--- a/app/src/main/res/layout/activity_usb_drive_picker.xml
+++ b/app/src/main/res/layout/activity_usb_drive_picker.xml
@@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/DarkThemeOverlay"
- tools:context=".activities.UsbDrivePickerActivity">
+ tools:context=".ui.activities.UsbDrivePickerActivity">
-
-
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 8fdb8a7..97babec 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,7 +1,7 @@
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 057eab0..2710da7 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
@@ -133,4 +133,11 @@
Risultato
Progressi
Mostra il progresso dell\'azione corrente
-
\ No newline at end of file
+ Dispositivo USB non supportato?
+ Se Android dice che c\'è un problema con il dispositivo USB o che non è supportato dopo aver usato EtchDroid, leggi questa pagina.
+ Scrivi %1$s su %2$s
+ Copia dati da %1$s a %2$s
+ Lavoro fallito.
+ (sconosciuto)
+ Passaggio %1$d di %2$d
+
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a214edf..f377fa7 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -6,4 +6,5 @@
#888888
#dddddd
#23242a
+ #3F414C
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index efe892c..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
-
+
\ No newline at end of file
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 @@
-
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 31958d6..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
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/colors.xml b/app/src/main/res/values/colors.xml
index 5ca2e51..f50336e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,4 +6,5 @@
#999999
#222222
#F4F4F6
+ #f1f8e9
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 17eec6d..3bf00e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,6 +63,8 @@
This app
Apache 2.0
Userspace USB block device implementation
+ A cross-platform library to access USB devices
+ A little shim to make libaums work better with EtchDroid
GNU GPLv2
Custom BSD-like
Custom
@@ -91,15 +93,14 @@
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
Troubleshooting information
The operation could not be completed because the following error occurred:
- This is a common error. Usually this happens when the USB drive is unplugged while it\'s being written to, or when it\'s connected through a USB hub. On some devices there might be a bug in Android\'s USB subsystem: usually a reboot will fix it for some time. \n\nTry these:\n• Unplug and re-plug the USB device, then restart the app\n• Reboot your device (really, try it)\n• Try another USB drive\n• Avoid using unnecessary adapters, dongles or hubs\n• Avoid using your phone while it\'s writing\n• Replace defective USB On-The-Go adapters\n\nIf the problem persists, please file an issue on GitHub.
Reporting issues
- Issues can be reported on GitHub:\nhttps://github.com/Depau/EtchDroid/issues
+ Issues can be reported on GitHub:\nhttps://github.com/EtchDroid/EtchDroid/issues
Write failed
Unknown error. Try to reattach the USB drive or reboot the device. Please file an issue on GitHub.
(uncompressed)
@@ -147,7 +148,6 @@
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
Job progress
Job outcome
@@ -161,5 +161,7 @@
(unknown)
Write %1$s to %2$s
"Copy data from "%1$s" to "%2$s"
+ If Android says there\'s an issue with your USB drive or that it\'s unsupported after using EtchDroid, read this.
+ Unsupported USB drive?
Step %1$d of %2$d
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 364d9da..dd803cb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,19 +6,31 @@
- @color/colorAccent
- @style/Widget.Support.CoordinatorLayout
- @style/Widget.Design.FloatingActionButton
+ - @style/DialogThemeLight
-
+
+
+
+