diff --git a/app/src/main/java/com/trianguloy/urlchecker/activities/BackupActivity.java b/app/src/main/java/com/trianguloy/urlchecker/activities/BackupActivity.java index 002ca21..f1be11f 100644 --- a/app/src/main/java/com/trianguloy/urlchecker/activities/BackupActivity.java +++ b/app/src/main/java/com/trianguloy/urlchecker/activities/BackupActivity.java @@ -338,8 +338,7 @@ public class BackupActivity extends Activity { default -> AndroidUtils.assertError("Unknown type: " + type); } } catch (JSONException e) { - AndroidUtils.assertError("Error when restoring key: " + key); - e.printStackTrace(); + AndroidUtils.assertError("Error when restoring key: " + key, e); } } diff --git a/app/src/main/java/com/trianguloy/urlchecker/dialogs/MainDialog.java b/app/src/main/java/com/trianguloy/urlchecker/dialogs/MainDialog.java index 5051751..0c134ae 100644 --- a/app/src/main/java/com/trianguloy/urlchecker/dialogs/MainDialog.java +++ b/app/src/main/java/com/trianguloy/urlchecker/dialogs/MainDialog.java @@ -92,8 +92,7 @@ public class MainDialog extends Activity { try { module.onPrepareUrl(urlData); } catch (Exception e) { - e.printStackTrace(); - AndroidUtils.assertError("Exception in onPrepareUrl for module " + module.getClass().getName()); + AndroidUtils.assertError("Exception in onPrepareUrl for module " + module.getClass().getName(), e); } } @@ -122,8 +121,7 @@ public class MainDialog extends Activity { continue main_loop; } } catch (Exception e) { - e.printStackTrace(); - AndroidUtils.assertError("Exception in onModifyUrl for module " + module.getClass().getName()); + AndroidUtils.assertError("Exception in onModifyUrl for module " + module.getClass().getName(), e); } } @@ -134,8 +132,7 @@ public class MainDialog extends Activity { try { module.onDisplayUrl(urlData); } catch (Exception e) { - e.printStackTrace(); - AndroidUtils.assertError("Exception in onDisplayUrl for module " + module.getClass().getName()); + AndroidUtils.assertError("Exception in onDisplayUrl for module " + module.getClass().getName(), e); } } @@ -146,8 +143,7 @@ public class MainDialog extends Activity { try { module.onFinishUrl(urlData); } catch (Exception e) { - e.printStackTrace(); - AndroidUtils.assertError("Exception in onFinishUrl for module " + module.getClass().getName()); + AndroidUtils.assertError("Exception in onFinishUrl for module " + module.getClass().getName(), e); } } @@ -312,8 +308,7 @@ public class MainDialog extends Activity { module.onInitialize(child); } catch (Exception e) { // can't add module - e.printStackTrace(); - AndroidUtils.assertError("Exception in initializeModule for module " + moduleData.getId()); + AndroidUtils.assertError("Exception in initializeModule for module " + moduleData.getId(), e); } } diff --git a/app/src/main/java/com/trianguloy/urlchecker/modules/companions/ClearUrlCatalog.java b/app/src/main/java/com/trianguloy/urlchecker/modules/companions/ClearUrlCatalog.java index 2654739..aa6595d 100644 --- a/app/src/main/java/com/trianguloy/urlchecker/modules/companions/ClearUrlCatalog.java +++ b/app/src/main/java/com/trianguloy/urlchecker/modules/companions/ClearUrlCatalog.java @@ -114,7 +114,7 @@ public class ClearUrlCatalog { return rules; } catch (JSONException e) { // invalid catalog, return empty - AndroidUtils.assertError(e.getMessage()); + AndroidUtils.assertError(e.getMessage(), e); return Collections.emptyList(); } } diff --git a/app/src/main/java/com/trianguloy/urlchecker/utilities/methods/AndroidUtils.java b/app/src/main/java/com/trianguloy/urlchecker/utilities/methods/AndroidUtils.java index 38b3b1e..7284819 100644 --- a/app/src/main/java/com/trianguloy/urlchecker/utilities/methods/AndroidUtils.java +++ b/app/src/main/java/com/trianguloy/urlchecker/utilities/methods/AndroidUtils.java @@ -43,14 +43,17 @@ public interface AndroidUtils { view.setAlpha(enabled ? 1f : 0.35f); } - /** - * In debug mode, throws an AssertionError, in production just logs it and continues. - */ + /** In debug mode, throws an AssertionError, in production just logs it and continues. */ static void assertError(String detailMessage) { - Log.d("ASSERT_ERROR", detailMessage); + assertError(detailMessage, null); + } + + /** In debug mode, throws an AssertionError, in production just logs it and continues. */ + static void assertError(String detailMessage, Throwable cause) { + Log.d("ASSERT_ERROR", detailMessage, cause); if (BuildConfig.DEBUG) { // in debug mode, throw exception - throw new AssertionError(detailMessage); + throw new AssertionError(detailMessage, cause); } // non-debug, just discard } @@ -172,8 +175,11 @@ public interface AndroidUtils { static void longTapForDescription(View view) { view.setOnLongClickListener(v -> { var contentDescription = v.getContentDescription(); - if (contentDescription == null) AndroidUtils.assertError("No content description for view " + view); - Toast.makeText(v.getContext(), contentDescription, Toast.LENGTH_SHORT).show(); + if (contentDescription == null) { + AndroidUtils.assertError("No content description for view " + view); + } else { + Toast.makeText(v.getContext(), contentDescription, Toast.LENGTH_SHORT).show(); + } return true; }); }