mirror of
https://github.com/TrianguloY/UrlChecker.git
synced 2024-09-19 20:02:16 +02:00
allow cause when logging debug error
This commit is contained in:
parent
9c17c933a0
commit
baaf2e7431
@ -338,8 +338,7 @@ public class BackupActivity extends Activity {
|
|||||||
default -> AndroidUtils.assertError("Unknown type: " + type);
|
default -> AndroidUtils.assertError("Unknown type: " + type);
|
||||||
}
|
}
|
||||||
} catch (JSONException e) {
|
} catch (JSONException e) {
|
||||||
AndroidUtils.assertError("Error when restoring key: " + key);
|
AndroidUtils.assertError("Error when restoring key: " + key, e);
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,8 +92,7 @@ public class MainDialog extends Activity {
|
|||||||
try {
|
try {
|
||||||
module.onPrepareUrl(urlData);
|
module.onPrepareUrl(urlData);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
AndroidUtils.assertError("Exception in onPrepareUrl for module " + module.getClass().getName(), e);
|
||||||
AndroidUtils.assertError("Exception in onPrepareUrl for module " + module.getClass().getName());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -122,8 +121,7 @@ public class MainDialog extends Activity {
|
|||||||
continue main_loop;
|
continue main_loop;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
AndroidUtils.assertError("Exception in onModifyUrl for module " + module.getClass().getName(), e);
|
||||||
AndroidUtils.assertError("Exception in onModifyUrl for module " + module.getClass().getName());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,8 +132,7 @@ public class MainDialog extends Activity {
|
|||||||
try {
|
try {
|
||||||
module.onDisplayUrl(urlData);
|
module.onDisplayUrl(urlData);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
AndroidUtils.assertError("Exception in onDisplayUrl for module " + module.getClass().getName(), e);
|
||||||
AndroidUtils.assertError("Exception in onDisplayUrl for module " + module.getClass().getName());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,8 +143,7 @@ public class MainDialog extends Activity {
|
|||||||
try {
|
try {
|
||||||
module.onFinishUrl(urlData);
|
module.onFinishUrl(urlData);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
AndroidUtils.assertError("Exception in onFinishUrl for module " + module.getClass().getName(), e);
|
||||||
AndroidUtils.assertError("Exception in onFinishUrl for module " + module.getClass().getName());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -312,8 +308,7 @@ public class MainDialog extends Activity {
|
|||||||
module.onInitialize(child);
|
module.onInitialize(child);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// can't add module
|
// can't add module
|
||||||
e.printStackTrace();
|
AndroidUtils.assertError("Exception in initializeModule for module " + moduleData.getId(), e);
|
||||||
AndroidUtils.assertError("Exception in initializeModule for module " + moduleData.getId());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ public class ClearUrlCatalog {
|
|||||||
return rules;
|
return rules;
|
||||||
} catch (JSONException e) {
|
} catch (JSONException e) {
|
||||||
// invalid catalog, return empty
|
// invalid catalog, return empty
|
||||||
AndroidUtils.assertError(e.getMessage());
|
AndroidUtils.assertError(e.getMessage(), e);
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,14 +43,17 @@ public interface AndroidUtils {
|
|||||||
view.setAlpha(enabled ? 1f : 0.35f);
|
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) {
|
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) {
|
if (BuildConfig.DEBUG) {
|
||||||
// in debug mode, throw exception
|
// in debug mode, throw exception
|
||||||
throw new AssertionError(detailMessage);
|
throw new AssertionError(detailMessage, cause);
|
||||||
}
|
}
|
||||||
// non-debug, just discard
|
// non-debug, just discard
|
||||||
}
|
}
|
||||||
@ -172,8 +175,11 @@ public interface AndroidUtils {
|
|||||||
static void longTapForDescription(View view) {
|
static void longTapForDescription(View view) {
|
||||||
view.setOnLongClickListener(v -> {
|
view.setOnLongClickListener(v -> {
|
||||||
var contentDescription = v.getContentDescription();
|
var contentDescription = v.getContentDescription();
|
||||||
if (contentDescription == null) AndroidUtils.assertError("No content description for view " + view);
|
if (contentDescription == null) {
|
||||||
|
AndroidUtils.assertError("No content description for view " + view);
|
||||||
|
} else {
|
||||||
Toast.makeText(v.getContext(), contentDescription, Toast.LENGTH_SHORT).show();
|
Toast.makeText(v.getContext(), contentDescription, Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user