From 5ff0ca0267cad95f9578c37004a031fac5f983fb Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 28 Jan 2024 09:29:40 +0100 Subject: [PATCH] Limit reported error length --- app/src/main/java/eu/faircode/email/ActivityError.java | 6 +++--- app/src/main/java/eu/faircode/email/ActivityMain.java | 3 ++- app/src/main/java/eu/faircode/email/Helper.java | 6 ++++++ app/src/main/java/eu/faircode/email/Log.java | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityError.java b/app/src/main/java/eu/faircode/email/ActivityError.java index 2ff9da0587..987b8d1414 100644 --- a/app/src/main/java/eu/faircode/email/ActivityError.java +++ b/app/src/main/java/eu/faircode/email/ActivityError.java @@ -182,9 +182,6 @@ public class ActivityError extends ActivityBase { public void onClick(View v) { StringBuilder sb = new StringBuilder(); - sb.append(title) - .append("\n"); - sb.append("auth_type=") .append(ServiceAuthenticator.getAuthTypeName(auth_type)) .append("\n"); @@ -199,6 +196,9 @@ public class ActivityError extends ActivityBase { .append(provider) .append("\n"); + if (!TextUtils.isEmpty(message)) + sb.append(Helper.limit(message, 384)); + Uri uri = Helper.getSupportUri(v.getContext(), "Sync:error") .buildUpon() .appendQueryParameter("message", sb.toString()) diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java index 7a06fb4e5a..ec07d0367a 100644 --- a/app/src/main/java/eu/faircode/email/ActivityMain.java +++ b/app/src/main/java/eu/faircode/email/ActivityMain.java @@ -337,7 +337,8 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack public void onClick(DialogInterface dialog, int which) { Uri uri = Helper.getSupportUri(ActivityMain.this, "Main:error") .buildUpon() - .appendQueryParameter("message", Log.formatThrowable(ex, false)) + .appendQueryParameter("message", + Helper.limit(Log.formatThrowable(ex, false), 384)) .build(); Helper.view(ActivityMain.this, uri, true); } diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 74a04ff529..3d7d6f297c 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -2649,6 +2649,12 @@ public class Helper { return value; } + static String limit(String value, int max) { + if (TextUtils.isEmpty(value) || value.length() < max) + return value; + return value.substring(0, max); + } + // Files static { diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index fbb356e38c..10879e9545 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -1867,7 +1867,7 @@ public class Log { if (!TextUtils.isEmpty(message)) uri = uri .buildUpon() - .appendQueryParameter("message", "Unexpected: " + message) + .appendQueryParameter("message", Helper.limit(message, 384)) .build(); Helper.view(context, uri, true); }