Merge branch 'cyberta_master' into #8885_testing_ProviderManager

1 files changed, 9 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java
index bb9fb2d4..5bb637b7 100644
--- a/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java
@@ -16,6 +16,8 @@
  */
 package se.leap.bitmaskclient.utils;
 
+import android.content.Context;
+import android.os.Looper;
 import android.support.annotation.NonNull;
 
 import org.json.JSONException;
@@ -157,5 +159,12 @@ public class ConfigHelper {
         return byteArrayToHex(byteArray);
     }
 
+    public static void ensureNotOnMainThread(@NonNull Context context) throws IllegalStateException{
+        Looper looper = Looper.myLooper();
+        if (looper != null && looper == context.getMainLooper()) {
+            throw new IllegalStateException(
+                    "calling this from your main thread can lead to deadlock");
+        }
+    }
 
 }