diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt index 7232cc85..ef7ef3e7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import com.google.android.material.snackbar.Snackbar import kotlinx.android.synthetic.main.fragment_import.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -15,6 +16,7 @@ import net.pokeranalytics.android.util.csv.CSVImporter import net.pokeranalytics.android.util.csv.ImportDelegate import net.pokeranalytics.android.util.csv.ImportException import timber.log.Timber +import java.io.IOException import java.io.InputStream import java.text.NumberFormat import java.util.* @@ -74,6 +76,8 @@ class ImportFragment : RealmFragment(), ImportDelegate { this.importer = CSVImporter(inputStream) this.importer.delegate = this + var error = false + GlobalScope.launch(coroutineContext) { val test = GlobalScope.async { @@ -84,6 +88,9 @@ class ImportFragment : RealmFragment(), ImportDelegate { importer.start() } catch (e: ImportException) { // shouldDismissActivity = true + error = true + } catch (e: IOException) { + error = true } val e = Date() val duration = (e.time - s.time) / 1000.0 @@ -92,6 +99,12 @@ class ImportFragment : RealmFragment(), ImportDelegate { } test.await() + if (error && view != null) { + Snackbar.make(view!!, R.string.import_error, Snackbar.LENGTH_INDEFINITE).show() + } + + + // if (shouldDismissActivity) { // // activity?.let { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 538c113d..a196d228 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,6 +41,7 @@ You\'ve reached the maximum number of free sessions. Please subscribe for unlimited use and don\'t hesitate to tell us how you feel about your current experience! Stacking incoming Stacking outgoing + There has been an issue with the import. Please check out your file or contact the support! Address Naming suggestions