Added menu item to disable main log

pull/197/head
M66B 5 years ago
parent 6e3708d8ce
commit ccb026b7b2

@ -20,8 +20,10 @@ package eu.faircode.email;
*/ */
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.preference.PreferenceManager;
import androidx.room.Entity; import androidx.room.Entity;
import androidx.room.Index; import androidx.room.Index;
import androidx.room.PrimaryKey; import androidx.room.PrimaryKey;
@ -61,6 +63,11 @@ public class EntityLog {
static void log(final Context context, String data) { static void log(final Context context, String data) {
Log.i(data); Log.i(data);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean main_log = prefs.getBoolean("main_log", true);
if (!main_log)
return;
final EntityLog entry = new EntityLog(); final EntityLog entry = new EntityLog();
entry.time = new Date().getTime(); entry.time = new Date().getTime();
entry.data = data; entry.data = data;

@ -19,7 +19,9 @@ package eu.faircode.email;
Copyright 2018-2021 by Marcel Bokhorst (M66B) Copyright 2018-2021 by Marcel Bokhorst (M66B)
*/ */
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -106,6 +108,10 @@ public class FragmentLogs extends FragmentBase {
@Override @Override
public void onPrepareOptionsMenu(Menu menu) { public void onPrepareOptionsMenu(Menu menu) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean main_log = prefs.getBoolean("main_log", true);
menu.findItem(R.id.menu_enabled).setChecked(main_log);
menu.findItem(R.id.menu_auto_scroll).setChecked(autoScroll); menu.findItem(R.id.menu_auto_scroll).setChecked(autoScroll);
super.onPrepareOptionsMenu(menu); super.onPrepareOptionsMenu(menu);
} }
@ -113,9 +119,15 @@ public class FragmentLogs extends FragmentBase {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
int itemId = item.getItemId(); int itemId = item.getItemId();
if (itemId == R.id.menu_auto_scroll) { if (itemId == R.id.menu_enabled) {
autoScroll = !item.isChecked(); boolean enabled = !item.isChecked();
item.setChecked(autoScroll); onMenuEnable(enabled);
item.setChecked(enabled);
return true;
} else if (itemId == R.id.menu_auto_scroll) {
boolean enabled = !item.isChecked();
onMenuAutoScoll(enabled);
item.setChecked(enabled);
return true; return true;
} else if (itemId == R.id.menu_clear) { } else if (itemId == R.id.menu_clear) {
onMenuClear(); onMenuClear();
@ -124,6 +136,15 @@ public class FragmentLogs extends FragmentBase {
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
private void onMenuEnable(boolean enabled) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
prefs.edit().putBoolean("main_log", enabled).apply();
}
private void onMenuAutoScoll(boolean enabled) {
autoScroll = enabled;
}
private void onMenuClear() { private void onMenuClear() {
EntityLog.clear(getContext()); EntityLog.clear(getContext());
} }

@ -1,9 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_enabled"
android:checkable="true"
android:checked="true"
android:title="@string/title_enabled"
app:showAsAction="never" />
<item <item
android:id="@+id/menu_auto_scroll" android:id="@+id/menu_auto_scroll"
android:checkable="true" android:checkable="true"
android:checked="true"
android:title="@string/title_auto_scroll" android:title="@string/title_auto_scroll"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item

Loading…
Cancel
Save