From fc64d7929fb2b63b1af89f2906ee1db7439eab25 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Fri, 17 Aug 2018 02:50:18 +0200 Subject: [PATCH] Warn that drive size can't be checked with DMG images --- .../depau/etchdroid/fragments/ConfirmInfoFragment.kt | 12 +++++++++--- app/src/main/res/values/strings.xml | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt index 7b7d9c7..5857132 100644 --- a/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt +++ b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt @@ -7,10 +7,10 @@ import android.view.View import android.view.ViewGroup import eu.depau.etchdroid.R import eu.depau.etchdroid.StateKeeper -import eu.depau.etchdroid.services.UsbAPIWriteService -import eu.depau.etchdroid.kotlin_exts.* import eu.depau.etchdroid.enums.FlashMethod import eu.depau.etchdroid.enums.WizardStep +import eu.depau.etchdroid.kotlin_exts.* +import eu.depau.etchdroid.services.UsbAPIWriteService import kotlinx.android.synthetic.main.fragment_confirminfo.view.* import java.io.IOException @@ -73,7 +73,13 @@ class ConfirmInfoFragment : WizardFragment() { if (imgSize!! > devSize) view.confirm_extra_info.text = getString(R.string.image_bigger_than_usb) else { - view.confirm_extra_info.text = getString(R.string.tap_next_to_write) + var text = + if (StateKeeper.flashMethod == FlashMethod.FLASH_DMG_API) + getString(R.string.no_image_size_check_dmg) + "\n" + else + "" + text += getString(R.string.tap_next_to_write) + view.confirm_extra_info.text = text canContinue = true } } else { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 31aa7c6..aba94ef 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,4 +71,5 @@ Label Type Size + Image size checks can\'t be performed on DMG images. Make sure the USB drive is large enough before flashing.