jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename android package classes to Flipper

Browse Source 
Summary: Rename SonarClientImpl, SonarConnectionImpl, SonarResponderImpl, SonarThread.

Reviewed By: priteshrnandgaonkar

Differential Revision: D9966853

fbshipit-source-id: e9f0faa32aff6efa2287aa94f6da6b6b395b7a1f
This commit is contained in:
Pascal Hartig
2018-09-22 04:58:41 -07:00
committed by Facebook Github Bot
parent 470ac6f6f7
commit 9a841d369b
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/src/main/cpp/sonar.cpp
View File

@@ -97,7 +97,7 @@ class JFlipperResponder : public jni::JavaClass<JFlipperResponder> {
class JFlipperResponderImpl : public jni::HybridClass<JFlipperResponderImpl, JFlipperResponder> { class JFlipperResponderImpl : public jni::HybridClass<JFlipperResponderImpl, JFlipperResponder> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarResponderImpl;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperResponderImpl;";
static void registerNatives() { static void registerNatives() {
registerHybrid({ registerHybrid({
@@ -143,7 +143,7 @@ class JFlipperConnection : public jni::JavaClass<JFlipperConnection> {
class JFlipperConnectionImpl : public jni::HybridClass<JFlipperConnectionImpl, JFlipperConnection> { class JFlipperConnectionImpl : public jni::HybridClass<JFlipperConnectionImpl, JFlipperConnection> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarConnectionImpl;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperConnectionImpl;";
static void registerNatives() { static void registerNatives() {
registerHybrid({ registerHybrid({
@@ -267,7 +267,7 @@ public:
class JFlipperClient : public jni::HybridClass<JFlipperClient> { class JFlipperClient : public jni::HybridClass<JFlipperClient> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarClientImpl;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperClientImpl;";
static void registerNatives() { static void registerNatives() {
registerHybrid({ registerHybrid({

14
android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
View File

@@ -18,22 +18,22 @@ import com.facebook.flipper.core.FlipperClient;
public final class AndroidFlipperClient { public final class AndroidFlipperClient {
private static boolean sIsInitialized = false; private static boolean sIsInitialized = false;
private static SonarThread sSonarThread; private static FlipperThread sSonarThread;
private static SonarThread sConnectionThread; private static FlipperThread sConnectionThread;
private static final String[] REQUIRED_PERMISSIONS = private static final String[] REQUIRED_PERMISSIONS =
new String[] {"android.permission.INTERNET", "android.permission.ACCESS_WIFI_STATE"}; new String[] {"android.permission.INTERNET", "android.permission.ACCESS_WIFI_STATE"};
public static synchronized FlipperClient getInstance(Context context) { public static synchronized FlipperClient getInstance(Context context) {
if (!sIsInitialized) { if (!sIsInitialized) {
checkRequiredPermissions(context); checkRequiredPermissions(context);
sSonarThread = new SonarThread("SonarEventBaseThread"); sSonarThread = new FlipperThread("SonarEventBaseThread");
sSonarThread.start(); sSonarThread.start();
sConnectionThread = new SonarThread("SonarConnectionThread"); sConnectionThread = new FlipperThread("SonarConnectionThread");
sConnectionThread.start(); sConnectionThread.start();
final Context app = final Context app =
context.getApplicationContext() == null ? context : context.getApplicationContext(); context.getApplicationContext() == null ? context : context.getApplicationContext();
SonarClientImpl.init( FlipperClientImpl.init(
sSonarThread.getEventBase(), sSonarThread.getEventBase(),
sConnectionThread.getEventBase(), sConnectionThread.getEventBase(),
getServerHost(app), getServerHost(app),
@@ -45,14 +45,14 @@ public final class AndroidFlipperClient {
context.getFilesDir().getAbsolutePath()); context.getFilesDir().getAbsolutePath());
sIsInitialized = true; sIsInitialized = true;
} }
return SonarClientImpl.getInstance(); return FlipperClientImpl.getInstance();
} }
public static synchronized FlipperClient getInstanceIfInitialized() { public static synchronized FlipperClient getInstanceIfInitialized() {
if (!sIsInitialized) { if (!sIsInitialized) {
return null; return null;
} }
return SonarClientImpl.getInstance(); return FlipperClientImpl.getInstance();
} }
static void checkRequiredPermissions(Context context) { static void checkRequiredPermissions(Context context) {

6
android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java → android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
View File

@@ -17,7 +17,7 @@ import com.facebook.flipper.core.FlipperStateUpdateListener;
import com.facebook.flipper.core.StateSummary; import com.facebook.flipper.core.StateSummary;
@DoNotStrip @DoNotStrip
class SonarClientImpl implements FlipperClient { class FlipperClientImpl implements FlipperClient {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("sonar");
@@ -26,7 +26,7 @@ class SonarClientImpl implements FlipperClient {
private final HybridData mHybridData; private final HybridData mHybridData;
private SonarClientImpl(HybridData hd) { private FlipperClientImpl(HybridData hd) {
mHybridData = hd; mHybridData = hd;
} }
@@ -41,7 +41,7 @@ class SonarClientImpl implements FlipperClient {
String appId, String appId,
String privateAppDirectory); String privateAppDirectory);
public static native SonarClientImpl getInstance(); public static native FlipperClientImpl getInstance();
@Override @Override
public native void addPlugin(FlipperPlugin plugin); public native void addPlugin(FlipperPlugin plugin);

4
android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java → android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
View File

@@ -17,7 +17,7 @@ import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperReceiver; import com.facebook.flipper.core.FlipperReceiver;
@DoNotStrip @DoNotStrip
class SonarConnectionImpl implements FlipperConnection { class FlipperConnectionImpl implements FlipperConnection {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("sonar");
@@ -26,7 +26,7 @@ class SonarConnectionImpl implements FlipperConnection {
private final HybridData mHybridData; private final HybridData mHybridData;
private SonarConnectionImpl(HybridData hd) { private FlipperConnectionImpl(HybridData hd) {
mHybridData = hd; mHybridData = hd;
} }

4
android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java → android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
View File

@@ -16,7 +16,7 @@ import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperResponder; import com.facebook.flipper.core.FlipperResponder;
@DoNotStrip @DoNotStrip
class SonarResponderImpl implements FlipperResponder { class FlipperResponderImpl implements FlipperResponder {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("sonar");
@@ -25,7 +25,7 @@ class SonarResponderImpl implements FlipperResponder {
private final HybridData mHybridData; private final HybridData mHybridData;
private SonarResponderImpl(HybridData hd) { private FlipperResponderImpl(HybridData hd) {
mHybridData = hd; mHybridData = hd;
} }

4
android/src/main/java/com/facebook/flipper/android/SonarThread.java → android/src/main/java/com/facebook/flipper/android/FlipperThread.java
View File

@@ -10,10 +10,10 @@ package com.facebook.flipper.android;
import android.os.Process; import android.os.Process;
import javax.annotation.Nullable; import javax.annotation.Nullable;
class SonarThread extends Thread { class FlipperThread extends Thread {
private @Nullable EventBase mEventBase; private @Nullable EventBase mEventBase;
SonarThread(final String name) { FlipperThread(final String name) {
super(name); super(name);
} }