diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java b/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java index f64b293..47a7f1b 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java @@ -237,10 +237,15 @@ public class MainActivity extends AppCompatActivity { if (mOpen5eImportDisposable != null && mOpen5eImportDisposable.isDisposed()) { break; } - ((MonsterCardsApplication) getApplication()).getMonsterRepository() - .saveMonster(monster) - .blockingAwait(); - totalImported++; + try { + ((MonsterCardsApplication) getApplication()).getMonsterRepository() + .saveMonster(monster) + .blockingAwait(); + totalImported++; + } catch (Exception e) { + Logger.logError("Failed to save monster to database", e); + runOnUiThread(() -> ToastHelper.showShort(MainActivity.this, "An error occurred while saving a monster.")); + } } nextUrl = page.nextUrl; } while (nextUrl != null && !nextUrl.isEmpty()); @@ -422,6 +427,7 @@ public class MainActivity extends AppCompatActivity { } } catch (IOException e) { Logger.logError("error reading file", e); + ToastHelper.showLong(this, "An error occurred while reading the file."); return null; } return builder.toString(); diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/shared/MCFragment.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/shared/MCFragment.java index 003d014..5ac0647 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/shared/MCFragment.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/shared/MCFragment.java @@ -34,6 +34,7 @@ import com.majinnaibu.monstercards.importers.Open5eImporter; import com.majinnaibu.monstercards.models.Monster; import com.majinnaibu.monstercards.utils.Logger; import com.majinnaibu.monstercards.utils.SnackbarHelper; +import com.majinnaibu.monstercards.utils.ToastHelper; import java.io.BufferedReader; import java.io.InputStream; @@ -212,6 +213,10 @@ public class MCFragment extends Fragment { } } catch (Exception e) { Logger.logError("Error reading URI contents for import", e); + Context ctx = getContext(); + if (ctx != null) { + ToastHelper.showLong(ctx, "An error occurred while reading the file."); + } return null; } return builder.toString();