msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Revert "Enabled overview mode by default for new installs"

Browse Source 
This reverts commit 1a4de41dee.
master
M66B 3 weeks ago
parent 80d5b4aef7
commit ea5bdf4586
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File

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

@ -81,7 +81,7 @@ public class ActivityAMP extends ActivityBase {
wvAmp.clearCache(true);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean overview_mode = prefs.getBoolean("overview_mode", true);
boolean overview_mode = prefs.getBoolean("overview_mode", false);
boolean safe_browsing = prefs.getBoolean("safe_browsing", false);
WebSettings settings = wvAmp.getSettings();
@ -233,7 +233,7 @@ public class ActivityAMP extends ActivityBase {
message == null || message.subject == null ? "AMP" : message.subject);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean overview_mode = prefs.getBoolean("overview_mode", true);
boolean overview_mode = prefs.getBoolean("overview_mode", false);
String html;
ContentResolver resolver = context.getContentResolver();

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

@ -140,7 +140,7 @@ public class ActivitySignature extends ActivityBase {
public void onClick(View view) {
Bundle args = new Bundle();
args.putString("html", getHtml());
args.putBoolean("overview_mode", true);
args.putBoolean("overview_mode", false);
args.putBoolean("safe_browsing", false);
args.putBoolean("force_light", true);

8
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -3322,7 +3322,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message.ui_found && found && !TextUtils.isEmpty(searched))
HtmlHelper.highlightSearched(context, document, searched);
boolean overview_mode = prefs.getBoolean("overview_mode", true);
boolean overview_mode = prefs.getBoolean("overview_mode", false);
HtmlHelper.setViewport(document, overview_mode);
if (inline || show_images)
HtmlHelper.embedInlineImages(context, message.id, document, show_images);
@ -4810,7 +4810,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.getMenu().add(Menu.NONE, R.string.title_fullscreen, 1, R.string.title_fullscreen);
popupMenu.getMenu().add(Menu.NONE, R.string.title_fit_width, 2, R.string.title_fit_width)
.setCheckable(true)
.setChecked(prefs.getBoolean("overview_mode", true));
.setChecked(prefs.getBoolean("overview_mode", false));
popupMenu.getMenu().add(Menu.NONE, R.string.title_monospaced_pre, 4, R.string.title_monospaced_pre)
.setCheckable(true)
.setChecked(prefs.getBoolean("monospaced_pre", false));
@ -5974,7 +5974,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
protected String onExecute(Context context, Bundle args) throws Throwable {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean overview_mode = prefs.getBoolean("overview_mode", true);
boolean overview_mode = prefs.getBoolean("overview_mode", false);
boolean disable_tracking = prefs.getBoolean("disable_tracking", true);
boolean monospaced_pre = prefs.getBoolean("monospaced_pre", false);
@ -5999,7 +5999,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
protected void onExecuted(Bundle args, String html) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean overview_mode = prefs.getBoolean("overview_mode", true);
boolean overview_mode = prefs.getBoolean("overview_mode", false);
boolean safe_browsing = prefs.getBoolean("safe_browsing", false);
Bundle fargs = new Bundle();

3
app/src/main/java/eu/faircode/email/ApplicationEx.java
Unescape View File

@ -874,9 +874,6 @@ public class ApplicationEx extends Application
} else if (version < 2196) {
if (!prefs.contains("forward_new"))
editor.putBoolean("forward_new", true);
} else if (version < 2197) {
if (!prefs.contains("overview_mode"))
editor.putBoolean("overview_mode", false);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)

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

@ -1685,7 +1685,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
sbMessageZoom.setProgress(message_zoom - 50);
swEditorZoom.setChecked(prefs.getBoolean("editor_zoom", true));
swOverviewMode.setChecked(prefs.getBoolean("overview_mode", true));
swOverviewMode.setChecked(prefs.getBoolean("overview_mode", false));
swContrast.setChecked(prefs.getBoolean("contrast", false));
swHyphenation.setChecked(prefs.getBoolean("hyphenation", false));

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

@ -69,7 +69,7 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
this.viewportHeight = prefs.getInt("viewport_height", getDefaultViewportHeight(context));
boolean overview_mode = prefs.getBoolean("overview_mode", true);
boolean overview_mode = prefs.getBoolean("overview_mode", false);
boolean safe_browsing = prefs.getBoolean("safe_browsing", false);
setVerticalScrollBarEnabled(false);

Write Preview
Loading…
Cancel
Save