From 41adb3bdaace07253bcffa53517c02dc1adfcde8 Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@fb.com>
Date: Mon, 24 Sep 2018 07:27:54 -0700
Subject: [PATCH] Rename android internals

Summary: Rename public method and internal references inside the android package to Flipper.

Reviewed By: jknoxville, priteshrnandgaonkar

Differential Revision: D10008330

fbshipit-source-id: fd9b8a54bc9766e2d10b10c9b428f62e0bc3224a
---
 .../flipper/android/AndroidFlipperClient.java      | 14 +++++++-------
 .../flipper/android/utils/FlipperUtils.java        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
index 2a0ed30a1..d9d080df6 100644
--- a/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
+++ b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
@@ -18,7 +18,7 @@ import com.facebook.flipper.core.FlipperClient;
 
 public final class AndroidFlipperClient {
   private static boolean sIsInitialized = false;
-  private static FlipperThread sSonarThread;
+  private static FlipperThread sFlipperThread;
   private static FlipperThread sConnectionThread;
   private static final String[] REQUIRED_PERMISSIONS =
       new String[] {"android.permission.INTERNET", "android.permission.ACCESS_WIFI_STATE"};
@@ -26,15 +26,15 @@ public final class AndroidFlipperClient {
   public static synchronized FlipperClient getInstance(Context context) {
     if (!sIsInitialized) {
       checkRequiredPermissions(context);
-      sSonarThread = new FlipperThread("SonarEventBaseThread");
-      sSonarThread.start();
-      sConnectionThread = new FlipperThread("SonarConnectionThread");
+      sFlipperThread = new FlipperThread("FlipperEventBaseThread");
+      sFlipperThread.start();
+      sConnectionThread = new FlipperThread("FlipperConnectionThread");
       sConnectionThread.start();
 
       final Context app =
           context.getApplicationContext() == null ? context : context.getApplicationContext();
       FlipperClientImpl.init(
-          sSonarThread.getEventBase(),
+          sFlipperThread.getEventBase(),
           sConnectionThread.getEventBase(),
           getServerHost(app),
           "Android",
@@ -60,7 +60,7 @@ public final class AndroidFlipperClient {
     for (String permission : REQUIRED_PERMISSIONS) {
       if (ContextCompat.checkSelfPermission(context, permission)
           == PackageManager.PERMISSION_DENIED) {
-        Log.e("Sonar", String.format("App needs permission \"%s\" to work with sonar", permission));
+        Log.e("Flipper", String.format("App needs permission \"%s\" to work with sonar", permission));
       }
     }
   }
@@ -96,7 +96,7 @@ public final class AndroidFlipperClient {
       final int ip = info.getIpAddress();
       return String.format("%d.%d.%d.2", (ip & 0xff), (ip >> 8 & 0xff), (ip >> 16 & 0xff));
     } else {
-      // Running on physical device. Sonar desktop will run `adb reverse tcp:8088 tcp:8088`
+      // Running on physical device. Flipper desktop will run `adb reverse tcp:8088 tcp:8088`
       return "localhost";
     }
   }
diff --git a/android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java b/android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java
index b80ed4db1..da0f6ab85 100644
--- a/android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java
+++ b/android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java
@@ -16,7 +16,7 @@ public final class FlipperUtils {
 
   private FlipperUtils() {}
 
-  public static boolean shouldEnableSonar(Context context) {
+  public static boolean shouldEnableFlipper(Context context) {
     return BuildConfig.IS_INTERNAL_BUILD && !isEndToEndTest() && isMainProcess(context);
   }