From 0ef88ceaa0fdff15704162f98d109bc8d1e7a0d3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 6 Oct 2022 17:54:53 +0200
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/Helper.java  | 5 +++++
 app/src/main/java/eu/faircode/email/ToastEx.java | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 30e687ec5f..d24b6f7f02 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -55,6 +55,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.LocaleList;
+import android.os.Looper;
 import android.os.Parcel;
 import android.os.PowerManager;
 import android.os.StatFs;
@@ -2452,6 +2453,10 @@ public class Helper {
         }
     }
 
+    static boolean isUiThread() {
+        return (Looper.myLooper() == Looper.getMainLooper());
+    }
+
     // Cryptography
 
     static String sha256(String data) throws NoSuchAlgorithmException {
diff --git a/app/src/main/java/eu/faircode/email/ToastEx.java b/app/src/main/java/eu/faircode/email/ToastEx.java
index f42fd4bda0..3800a72cff 100644
--- a/app/src/main/java/eu/faircode/email/ToastEx.java
+++ b/app/src/main/java/eu/faircode/email/ToastEx.java
@@ -22,7 +22,6 @@ package eu.faircode.email;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Build;
-import android.os.Looper;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -99,7 +98,7 @@ public class ToastEx extends Toast {
     @Override
     public void show() {
         // https://developer.android.com/preview/features/toasts
-        if (Looper.myLooper() != Looper.getMainLooper())
+        if (!Helper.isUiThread())
             Log.e("Toast from background");
 
         // https://stackoverflow.com/questions/56017928/toast-not-showing-in-android-q