Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-25 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable viewport height for GitHub version

Browse Source
This commit is contained in:
M66B
2025-01-16 11:25:57 +01:00
parent 9059225a86
commit b12e2f89fb
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,6 +159,25 @@ public class ApplicationEx extends Application
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
public void uncaughtException(@NonNull Thread thread, @NonNull Throwable ex) {
// java.lang.IllegalStateException: Unable to create layer for WebViewEx, size 768x4864 max size 8192 color type 4 has context 1
// at android.os.MessageQueue.nativePollOnce(MessageQueue.java:-2)
// at android.os.MessageQueue.next(MessageQueue.java:326)
// at android.os.Looper.loop(Looper.java:183)
// at android.app.ActivityThread.main(ActivityThread.java:7266)
if (ex instanceof IllegalStateException &&
ex.getMessage() != null &&
ex.getMessage().contains("Unable to create layer for WebView")) {
int viewport_height = prefs.getInt("viewport_height", WebViewEx.DEFAULT_VIEWPORT_HEIGHT);
if (viewport_height > WebViewEx.DEFAULT_VIEWPORT_HEIGHT) {
prefs.edit().putInt("viewport_height", WebViewEx.DEFAULT_VIEWPORT_HEIGHT).apply();
Log.setCrashReporting(true);
Log.e(ex);
System.exit(1);
return;
}
}
if (!crash_reports && Log.isOwnFault(ex)) {
Log.e(ex);

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

@@ -280,8 +280,12 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
// Unable to create layer for WebViewEx, size 1088x16384 max size 16383 color type 4 has context 1)
int limitHeight = MeasureSpec.makeMeasureSpec(viewportHeight, MeasureSpec.AT_MOST);
super.onMeasure(widthMeasureSpec, limitHeight);
if (viewportHeight == 0)
heightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
else
heightMeasureSpec = MeasureSpec.makeMeasureSpec(viewportHeight, MeasureSpec.AT_MOST);
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int mh = getMeasuredHeight();
Log.i("Measured height=" + mh + " last=" + height + "/" + maxHeight + " ch=" + getContentHeight());
@@ -477,6 +481,9 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
}
static int getDefaultViewportHeight(Context context) {
if (!Helper.isPlayStoreInstall())
return 0;
if (Helper.isGoogle() && Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE /* Android 14 */)
return DEFAULT_VIEWPORT_HEIGHT * 2;
else