mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Check if debug info available

This commit is contained in:
M66B 2023-12-16 13:16:25 +01:00
parent ab3956eec4
commit c1eaa33c10
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -209,9 +209,12 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
}, new Callable<Boolean>() {
@Override
public Boolean call() {
drawerLayout.closeDrawer(drawerContainer);
onDebugInfo();
return true;
if (DebugHelper.isAvailable()) {
drawerLayout.closeDrawer(drawerContainer);
onDebugInfo();
return true;
} else
return false;
}
}).setExternal(true));

11
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -909,10 +909,13 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}, new Callable<Boolean>() {
@Override
public Boolean call() {
if (!drawerLayout.isLocked(drawerContainer))
drawerLayout.closeDrawer(drawerContainer);
onDebugInfo();
return true;
if (DebugHelper.isAvailable()) {
if (!drawerLayout.isLocked(drawerContainer))
drawerLayout.closeDrawer(drawerContainer);
onDebugInfo();
return true;
} else
return false;
}
}).setExternal(true));

4
app/src/main/java/eu/faircode/email/DebugHelper.java
View File

@ -169,6 +169,10 @@ public class DebugHelper {
"networkaddress.cache.negative.ttl"
));
static boolean isAvailable() {
return true;
}
static EntityMessage getDebugInfo(Context context, String source, int title, Throwable ex, String log, Bundle args) throws IOException, JSONException {
StringBuilder sb = new StringBuilder();
sb.append(context.getString(title)).append("\n\n");

2
app/src/main/java/eu/faircode/email/Log.java
View File

@ -1824,7 +1824,7 @@ public class Log {
}
});
if (report)
if (report && DebugHelper.isAvailable())
builder.setNeutralButton(R.string.title_report, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {