From 57b0a0f98d435a09c9514f10fd076cbcce7a30b3 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Sat, 14 May 2022 13:29:17 -0700
Subject: [PATCH] don't try to determine if I'm on an emulator

What I have doesn't work, and there's no consensus online what might
---
 .../org/eehouse/android/xw4/MQTTUtils.java    |  3 ---
 .../java/org/eehouse/android/xw4/XWApp.java   | 27 -------------------
 2 files changed, 30 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
index 0c0928255..deae66fd5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
@@ -368,9 +368,6 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
                 params.put( "tmpKey", getTmpKey(mContext) );
                 params.put( "frstV", Utils.getFirstVersion( mContext ) );
                 params.put( "relayDID", DevID.getRelayDevID( mContext ) );
-                if ( XWApp.onEmulator() ) {
-                    params.put( "emu", true );
-                }
 
                 Log.d( TAG, "registerOnce(): sending %s", params );
                 HttpsURLConnection conn
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index 9363a88c6..ec011d8fa 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -138,33 +138,6 @@ public class XWApp extends Application
         return context.getString( R.string.app_name );
     }
 
-    public static boolean onEmulator()
-    {
-        if ( null == s_onEmulator ) {
-            // https://ray-chong.medium.com/android-emulator-detection-4d0f994aab5e
-            boolean onEmulator =
-                Build.MANUFACTURER.contains("Genymotion")
-                || Build.MODEL.contains("google_sdk")
-                || Build.MODEL.toLowerCase().contains("droid4x")
-                || Build.MODEL.contains("Emulator")
-                || Build.MODEL.contains("Android SDK built for x86")
-                || Build.HARDWARE == "goldfish"
-                || Build.HARDWARE == "vbox86"
-                || Build.HARDWARE.toLowerCase().contains("nox")
-                || Build.FINGERPRINT.startsWith("generic")
-                || Build.PRODUCT == "sdk"
-                || Build.PRODUCT == "google_sdk"
-                || Build.PRODUCT == "sdk_x86"
-                || Build.PRODUCT == "vbox86p"
-                || Build.PRODUCT.toLowerCase().contains("nox")
-                || Build.BOARD.toLowerCase().contains("nox")
-                || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
-                ;
-            s_onEmulator = new Boolean( onEmulator );
-        }
-        return s_onEmulator;
-    }
-
     public static Context getContext()
     {
         Assert.assertNotNull( s_context );