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

Rename java core classes

Browse Source 
Summary:
Rename everything `Sonar*.java` in `core/`.

Biggest chunk of the rename happened with

```fish
for name in (cat names.txt)
    ambr --no-interactive --regex '\b'"$name"'\b' (echo $name | sed 's/Sonar/Flipper/') fbandroid/java/com/facebook
end
```

names.txt:
```
SonarArray
SonarClient
SonarConnection
SonarDynamic
SonarObject
SonarPlugin
SonarReceiver
SonarResponder
SonarStateUpdateListener
SonarValue

```

The controller you requested could not be found.

Reviewed By: priteshrnandgaonkar

Differential Revision: D9940900

fbshipit-source-id: 4a1342fac02513025d80dcb0af62c26ea38b5086
This commit is contained in:
Pascal Hartig
2018-09-20 10:29:14 -07:00
committed by Facebook Github Bot
parent cc6f28f7c4
commit 0a20d95195
52 changed files with 514 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
View File

@@ -7,7 +7,7 @@ import android.content.Context;
import com.facebook.litho.config.ComponentsConfiguration; import com.facebook.litho.config.ComponentsConfiguration;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import com.facebook.flipper.android.AndroidSonarClient; import com.facebook.flipper.android.AndroidSonarClient;
import com.facebook.flipper.core.SonarClient; import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.plugins.inspector.DescriptorMapping; import com.facebook.flipper.plugins.inspector.DescriptorMapping;
import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin; import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin;
import com.facebook.flipper.plugins.leakcanary.LeakCanarySonarPlugin; import com.facebook.flipper.plugins.leakcanary.LeakCanarySonarPlugin;
@@ -27,7 +27,7 @@ public class FlipperSampleApplication extends Application {
super.onCreate(); super.onCreate();
SoLoader.init(this, false); SoLoader.init(this, false);
final SonarClient client = AndroidSonarClient.getInstance(this); final FlipperClient client = AndroidSonarClient.getInstance(this);
final DescriptorMapping descriptorMapping = DescriptorMapping.withDefaults(); final DescriptorMapping descriptorMapping = DescriptorMapping.withDefaults();
NetworkSonarPlugin networkPlugin = new NetworkSonarPlugin(); NetworkSonarPlugin networkPlugin = new NetworkSonarPlugin();

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

@@ -64,7 +64,7 @@ class JEventBase : public jni::HybridClass<JEventBase> {
class JFlipperObject : public jni::JavaClass<JFlipperObject> { class JFlipperObject : public jni::JavaClass<JFlipperObject> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarObject;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperObject;";
static jni::local_ref<JFlipperObject> create(const folly::dynamic& json) { static jni::local_ref<JFlipperObject> create(const folly::dynamic& json) {
return newInstance(folly::toJson(json)); return newInstance(folly::toJson(json));
@@ -78,7 +78,7 @@ class JFlipperObject : public jni::JavaClass<JFlipperObject> {
class JFlipperArray : public jni::JavaClass<JFlipperArray> { class JFlipperArray : public jni::JavaClass<JFlipperArray> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarArray;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperArray;";
static jni::local_ref<JFlipperArray> create(const folly::dynamic& json) { static jni::local_ref<JFlipperArray> create(const folly::dynamic& json) {
return newInstance(folly::toJson(json)); return newInstance(folly::toJson(json));
@@ -92,7 +92,7 @@ class JFlipperArray : public jni::JavaClass<JFlipperArray> {
class JFlipperResponder : public jni::JavaClass<JFlipperResponder> { class JFlipperResponder : public jni::JavaClass<JFlipperResponder> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarResponder;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperResponder;";
}; };
class JFlipperResponderImpl : public jni::HybridClass<JFlipperResponderImpl, JFlipperResponder> { class JFlipperResponderImpl : public jni::HybridClass<JFlipperResponderImpl, JFlipperResponder> {
@@ -128,7 +128,7 @@ class JFlipperResponderImpl : public jni::HybridClass<JFlipperResponderImpl, JFl
class JFlipperReceiver : public jni::JavaClass<JFlipperReceiver> { class JFlipperReceiver : public jni::JavaClass<JFlipperReceiver> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarReceiver;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperReceiver;";
void receive(const folly::dynamic params, std::shared_ptr<FlipperResponder> responder) const { void receive(const folly::dynamic params, std::shared_ptr<FlipperResponder> responder) const {
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFlipperObject::javaobject>, jni::alias_ref<JFlipperResponder::javaobject>)>("onReceive"); static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFlipperObject::javaobject>, jni::alias_ref<JFlipperResponder::javaobject>)>("onReceive");
@@ -138,7 +138,7 @@ class JFlipperReceiver : public jni::JavaClass<JFlipperReceiver> {
class JFlipperConnection : public jni::JavaClass<JFlipperConnection> { class JFlipperConnection : public jni::JavaClass<JFlipperConnection> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarConnection;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperConnection;";
}; };
class JFlipperConnectionImpl : public jni::HybridClass<JFlipperConnectionImpl, JFlipperConnection> { class JFlipperConnectionImpl : public jni::HybridClass<JFlipperConnectionImpl, JFlipperConnection> {
@@ -182,7 +182,7 @@ class JFlipperConnectionImpl : public jni::HybridClass<JFlipperConnectionImpl, J
class JFlipperPlugin : public jni::JavaClass<JFlipperPlugin> { class JFlipperPlugin : public jni::JavaClass<JFlipperPlugin> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarPlugin;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperPlugin;";
std::string identifier() const { std::string identifier() const {
static const auto method = javaClassStatic()->getMethod<std::string()>("getId"); static const auto method = javaClassStatic()->getMethod<std::string()>("getId");
@@ -202,7 +202,7 @@ class JFlipperPlugin : public jni::JavaClass<JFlipperPlugin> {
class JFlipperStateUpdateListener : public jni::JavaClass<JFlipperStateUpdateListener> { class JFlipperStateUpdateListener : public jni::JavaClass<JFlipperStateUpdateListener> {
public: public:
constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarStateUpdateListener;"; constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperStateUpdateListener;";
void onUpdate() { void onUpdate() {
static const auto method = javaClassStatic()->getMethod<void()>("onUpdate"); static const auto method = javaClassStatic()->getMethod<void()>("onUpdate");

6
android/src/main/java/com/facebook/flipper/android/AndroidSonarClient.java
View File

@@ -14,7 +14,7 @@ import android.net.wifi.WifiManager;
import android.os.Build; import android.os.Build;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.util.Log; import android.util.Log;
import com.facebook.flipper.core.SonarClient; import com.facebook.flipper.core.FlipperClient;
public final class AndroidSonarClient { public final class AndroidSonarClient {
private static boolean sIsInitialized = false; private static boolean sIsInitialized = false;
@@ -23,7 +23,7 @@ public final class AndroidSonarClient {
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 SonarClient getInstance(Context context) { public static synchronized FlipperClient getInstance(Context context) {
if (!sIsInitialized) { if (!sIsInitialized) {
checkRequiredPermissions(context); checkRequiredPermissions(context);
sSonarThread = new SonarThread("SonarEventBaseThread"); sSonarThread = new SonarThread("SonarEventBaseThread");
@@ -48,7 +48,7 @@ public final class AndroidSonarClient {
return SonarClientImpl.getInstance(); return SonarClientImpl.getInstance();
} }
public static synchronized SonarClient getInstanceIfInitialized() { public static synchronized FlipperClient getInstanceIfInitialized() {
if (!sIsInitialized) { if (!sIsInitialized) {
return null; return null;
} }

16
android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java
View File

@@ -11,13 +11,13 @@ import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import com.facebook.flipper.BuildConfig; import com.facebook.flipper.BuildConfig;
import com.facebook.flipper.core.SonarClient; import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.core.SonarPlugin; import com.facebook.flipper.core.FlipperPlugin;
import com.facebook.flipper.core.SonarStateUpdateListener; import com.facebook.flipper.core.FlipperStateUpdateListener;
import com.facebook.flipper.core.StateSummary; import com.facebook.flipper.core.StateSummary;
@DoNotStrip @DoNotStrip
class SonarClientImpl implements SonarClient { class SonarClientImpl implements FlipperClient {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("sonar");
@@ -44,13 +44,13 @@ class SonarClientImpl implements SonarClient {
public static native SonarClientImpl getInstance(); public static native SonarClientImpl getInstance();
@Override @Override
public native void addPlugin(SonarPlugin plugin); public native void addPlugin(FlipperPlugin plugin);
@Override @Override
public native <T extends SonarPlugin> T getPlugin(String id); public native <T extends FlipperPlugin> T getPlugin(String id);
@Override @Override
public native void removePlugin(SonarPlugin plugin); public native void removePlugin(FlipperPlugin plugin);
@Override @Override
public native void start(); public native void start();
@@ -59,7 +59,7 @@ class SonarClientImpl implements SonarClient {
public native void stop(); public native void stop();
@Override @Override
public native void subscribeForUpdates(SonarStateUpdateListener stateListener); public native void subscribeForUpdates(FlipperStateUpdateListener stateListener);
@Override @Override
public native void unsubscribe(); public native void unsubscribe();

20
android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java
View File

@@ -11,13 +11,13 @@ import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import com.facebook.flipper.BuildConfig; import com.facebook.flipper.BuildConfig;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
@DoNotStrip @DoNotStrip
class SonarConnectionImpl implements SonarConnection { class SonarConnectionImpl implements FlipperConnection {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("sonar");
@@ -31,22 +31,22 @@ class SonarConnectionImpl implements SonarConnection {
} }
@Override @Override
public void send(String method, SonarObject params) { public void send(String method, FlipperObject params) {
sendObject(method, params); sendObject(method, params);
} }
@Override @Override
public void send(String method, SonarArray params) { public void send(String method, FlipperArray params) {
sendArray(method, params); sendArray(method, params);
} }
public native void sendObject(String method, SonarObject params); public native void sendObject(String method, FlipperObject params);
public native void sendArray(String method, SonarArray params); public native void sendArray(String method, FlipperArray params);
@Override @Override
public native void reportError(Throwable throwable); public native void reportError(Throwable throwable);
@Override @Override
public native void receive(String method, SonarReceiver receiver); public native void receive(String method, FlipperReceiver receiver);
} }

20
android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java
View File

@@ -11,12 +11,12 @@ import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import com.facebook.flipper.BuildConfig; import com.facebook.flipper.BuildConfig;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
@DoNotStrip @DoNotStrip
class SonarResponderImpl implements SonarResponder { class SonarResponderImpl implements FlipperResponder {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("sonar");
@@ -30,24 +30,24 @@ class SonarResponderImpl implements SonarResponder {
} }
@Override @Override
public void success(SonarObject params) { public void success(FlipperObject params) {
successObject(params); successObject(params);
} }
@Override @Override
public void success(SonarArray params) { public void success(FlipperArray params) {
successArray(params); successArray(params);
} }
@Override @Override
public void success() { public void success() {
successObject(new SonarObject.Builder().build()); successObject(new FlipperObject.Builder().build());
} }
public native void successObject(SonarObject response); public native void successObject(FlipperObject response);
public native void successArray(SonarArray response); public native void successArray(FlipperArray response);
@Override @Override
public native void error(SonarObject response); public native void error(FlipperObject response);
} }

10
android/src/main/java/com/facebook/flipper/android/diagnostics/SonarDiagnosticActivity.java
View File

@@ -5,8 +5,8 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Toast; import android.widget.Toast;
import com.facebook.flipper.android.AndroidSonarClient; import com.facebook.flipper.android.AndroidSonarClient;
import com.facebook.flipper.core.SonarClient; import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.core.SonarStateUpdateListener; import com.facebook.flipper.core.FlipperStateUpdateListener;
import com.facebook.flipper.core.StateSummary; import com.facebook.flipper.core.StateSummary;
import com.facebook.flipper.core.StateSummary.StateElement; import com.facebook.flipper.core.StateSummary.StateElement;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@@ -14,7 +14,7 @@ import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import android.widget.ScrollView; import android.widget.ScrollView;
public class SonarDiagnosticActivity extends Activity implements SonarStateUpdateListener { public class SonarDiagnosticActivity extends Activity implements FlipperStateUpdateListener {
private TextView summaryView; private TextView summaryView;
private TextView logView; private TextView logView;
@@ -39,7 +39,7 @@ public class SonarDiagnosticActivity extends Activity implements SonarStateUpdat
protected void onStart() { protected void onStart() {
super.onStart(); super.onStart();
final SonarClient client = AndroidSonarClient.getInstance(this); final FlipperClient client = AndroidSonarClient.getInstance(this);
client.subscribeForUpdates(this); client.subscribeForUpdates(this);
summaryView.setText(getSummary()); summaryView.setText(getSummary());
@@ -85,7 +85,7 @@ public class SonarDiagnosticActivity extends Activity implements SonarStateUpdat
protected void onStop() { protected void onStop() {
super.onStop(); super.onStop();
final SonarClient client = AndroidSonarClient.getInstance(this); final FlipperClient client = AndroidSonarClient.getInstance(this);
client.unsubscribe(); client.unsubscribe();
} }
} }

4
android/src/main/java/com/facebook/flipper/core/ErrorReportingRunnable.java
View File

@@ -9,9 +9,9 @@ package com.facebook.flipper.core;
public abstract class ErrorReportingRunnable implements Runnable { public abstract class ErrorReportingRunnable implements Runnable {
private final SonarConnection mConnection; private final FlipperConnection mConnection;
public ErrorReportingRunnable(SonarConnection connection) { public ErrorReportingRunnable(FlipperConnection connection) {
mConnection = connection; mConnection = connection;
} }

32
android/src/main/java/com/facebook/flipper/core/SonarArray.java → android/src/main/java/com/facebook/flipper/core/FlipperArray.java
View File

@@ -13,14 +13,14 @@ import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class SonarArray { public class FlipperArray {
final JSONArray mJson; final JSONArray mJson;
SonarArray(JSONArray json) { FlipperArray(JSONArray json) {
mJson = (json != null ? json : new JSONArray()); mJson = (json != null ? json : new JSONArray());
} }
SonarArray(String json) { FlipperArray(String json) {
try { try {
mJson = new JSONArray(json); mJson = new JSONArray(json);
} catch (JSONException e) { } catch (JSONException e) {
@@ -28,8 +28,8 @@ public class SonarArray {
} }
} }
public SonarDynamic getDynamic(int index) { public FlipperDynamic getDynamic(int index) {
return new SonarDynamic(mJson.opt(index)); return new FlipperDynamic(mJson.opt(index));
} }
public String getString(int index) { public String getString(int index) {
@@ -56,14 +56,14 @@ public class SonarArray {
return mJson.optBoolean(index); return mJson.optBoolean(index);
} }
public SonarObject getObject(int index) { public FlipperObject getObject(int index) {
final Object o = mJson.opt(index); final Object o = mJson.opt(index);
return new SonarObject((JSONObject) o); return new FlipperObject((JSONObject) o);
} }
public SonarArray getArray(int index) { public FlipperArray getArray(int index) {
final Object o = mJson.opt(index); final Object o = mJson.opt(index);
return new SonarArray((JSONArray) o); return new FlipperArray((JSONArray) o);
} }
public int length() { public int length() {
@@ -135,30 +135,30 @@ public class SonarArray {
return this; return this;
} }
public Builder put(SonarValue v) { public Builder put(FlipperValue v) {
return put(v.toSonarObject()); return put(v.toSonarObject());
} }
public Builder put(SonarArray a) { public Builder put(FlipperArray a) {
mJson.put(a == null ? null : a.mJson); mJson.put(a == null ? null : a.mJson);
return this; return this;
} }
public Builder put(SonarArray.Builder b) { public Builder put(FlipperArray.Builder b) {
return put(b.build()); return put(b.build());
} }
public Builder put(SonarObject o) { public Builder put(FlipperObject o) {
mJson.put(o == null ? null : o.mJson); mJson.put(o == null ? null : o.mJson);
return this; return this;
} }
public Builder put(SonarObject.Builder b) { public Builder put(FlipperObject.Builder b) {
return put(b.build()); return put(b.build());
} }
public SonarArray build() { public FlipperArray build() {
return new SonarArray(mJson); return new FlipperArray(mJson);
} }
} }
} }

10
android/src/main/java/com/facebook/flipper/core/SonarClient.java → android/src/main/java/com/facebook/flipper/core/FlipperClient.java
View File

@@ -7,18 +7,18 @@
*/ */
package com.facebook.flipper.core; package com.facebook.flipper.core;
public interface SonarClient { public interface FlipperClient {
void addPlugin(SonarPlugin plugin); void addPlugin(FlipperPlugin plugin);
<T extends SonarPlugin> T getPlugin(String id); <T extends FlipperPlugin> T getPlugin(String id);
void removePlugin(SonarPlugin plugin); void removePlugin(FlipperPlugin plugin);
void start(); void start();
void stop(); void stop();
void subscribeForUpdates(SonarStateUpdateListener stateListener); void subscribeForUpdates(FlipperStateUpdateListener stateListener);
void unsubscribe(); void unsubscribe();

12
android/src/main/java/com/facebook/flipper/core/SonarConnection.java → android/src/main/java/com/facebook/flipper/core/FlipperConnection.java
View File

@@ -8,30 +8,30 @@
package com.facebook.flipper.core; package com.facebook.flipper.core;
/** /**
* A connection between a SonarPlugin and the desktop Sonar application. Register request handlers * A connection between a FlipperPlugin and the desktop Sonar application. Register request handlers
* to respond to calls made by the desktop application or directly send messages to the desktop * to respond to calls made by the desktop application or directly send messages to the desktop
* application. * application.
*/ */
public interface SonarConnection { public interface FlipperConnection {
/** /**
* Call a remote method on the Sonar desktop application, passing an optional JSON object as a * Call a remote method on the Sonar desktop application, passing an optional JSON object as a
* parameter. * parameter.
*/ */
void send(String method, SonarObject params); void send(String method, FlipperObject params);
/** /**
* Call a remote method on the Sonar desktop application, passing an optional JSON array as a * Call a remote method on the Sonar desktop application, passing an optional JSON array as a
* parameter. * parameter.
*/ */
void send(String method, SonarArray params); void send(String method, FlipperArray params);
/** Report client error */ /** Report client error */
void reportError(Throwable throwable); void reportError(Throwable throwable);
/** /**
* Register a receiver for a remote method call issued by the Sonar desktop application. The * Register a receiver for a remote method call issued by the Sonar desktop application. The
* SonarReceiver is passed a responder to respond back to the desktop application. * FlipperReceiver is passed a responder to respond back to the desktop application.
*/ */
void receive(String method, SonarReceiver receiver); void receive(String method, FlipperReceiver receiver);
} }

16
android/src/main/java/com/facebook/flipper/core/SonarDynamic.java → android/src/main/java/com/facebook/flipper/core/FlipperDynamic.java
View File

@@ -11,10 +11,10 @@ import javax.annotation.Nullable;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
public class SonarDynamic { public class FlipperDynamic {
private final Object mObject; private final Object mObject;
public SonarDynamic(Object object) { public FlipperDynamic(Object object) {
mObject = object; mObject = object;
} }
@@ -108,17 +108,17 @@ public class SonarDynamic {
return (Boolean) mObject; return (Boolean) mObject;
} }
public SonarObject asObject() { public FlipperObject asObject() {
if (mObject instanceof JSONObject) { if (mObject instanceof JSONObject) {
return new SonarObject((JSONObject) mObject); return new FlipperObject((JSONObject) mObject);
} }
return (SonarObject) mObject; return (FlipperObject) mObject;
} }
public SonarArray asArray() { public FlipperArray asArray() {
if (mObject instanceof JSONArray) { if (mObject instanceof JSONArray) {
return new SonarArray((JSONArray) mObject); return new FlipperArray((JSONArray) mObject);
} }
return (SonarArray) mObject; return (FlipperArray) mObject;
} }
} }

52
android/src/main/java/com/facebook/flipper/core/SonarObject.java → android/src/main/java/com/facebook/flipper/core/FlipperObject.java
View File

@@ -12,14 +12,14 @@ import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class SonarObject { public class FlipperObject {
final JSONObject mJson; final JSONObject mJson;
public SonarObject(JSONObject json) { public FlipperObject(JSONObject json) {
mJson = (json != null ? json : new JSONObject()); mJson = (json != null ? json : new JSONObject());
} }
public SonarObject(String json) { public FlipperObject(String json) {
try { try {
mJson = new JSONObject(json); mJson = new JSONObject(json);
} catch (JSONException e) { } catch (JSONException e) {
@@ -27,8 +27,8 @@ public class SonarObject {
} }
} }
public SonarDynamic getDynamic(String name) { public FlipperDynamic getDynamic(String name) {
return new SonarDynamic(mJson.opt(name)); return new FlipperDynamic(mJson.opt(name));
} }
public String getString(String name) { public String getString(String name) {
@@ -58,14 +58,14 @@ public class SonarObject {
return mJson.optBoolean(name); return mJson.optBoolean(name);
} }
public SonarObject getObject(String name) { public FlipperObject getObject(String name) {
final Object o = mJson.opt(name); final Object o = mJson.opt(name);
return new SonarObject((JSONObject) o); return new FlipperObject((JSONObject) o);
} }
public SonarArray getArray(String name) { public FlipperArray getArray(String name) {
final Object o = mJson.opt(name); final Object o = mJson.opt(name);
return new SonarArray((JSONArray) o); return new FlipperArray((JSONArray) o);
} }
public boolean contains(String name) { public boolean contains(String name) {
@@ -115,16 +115,16 @@ public class SonarObject {
return put(name, (Boolean) obj); return put(name, (Boolean) obj);
} else if (obj instanceof Object[]) { } else if (obj instanceof Object[]) {
return put(name, Arrays.deepToString((Object[]) obj)); return put(name, Arrays.deepToString((Object[]) obj));
} else if (obj instanceof SonarObject) { } else if (obj instanceof FlipperObject) {
return put(name, (SonarObject) obj); return put(name, (FlipperObject) obj);
} else if (obj instanceof SonarObject.Builder) { } else if (obj instanceof FlipperObject.Builder) {
return put(name, (SonarObject.Builder) obj); return put(name, (FlipperObject.Builder) obj);
} else if (obj instanceof SonarArray) { } else if (obj instanceof FlipperArray) {
return put(name, (SonarArray) obj); return put(name, (FlipperArray) obj);
} else if (obj instanceof SonarArray.Builder) { } else if (obj instanceof FlipperArray.Builder) {
return put(name, (SonarArray.Builder) obj); return put(name, (FlipperArray.Builder) obj);
} else if (obj instanceof SonarValue) { } else if (obj instanceof FlipperValue) {
return put(name, ((SonarValue) obj).toSonarObject()); return put(name, ((FlipperValue) obj).toSonarObject());
} else { } else {
return put(name, obj.toString()); return put(name, obj.toString());
} }
@@ -184,11 +184,11 @@ public class SonarObject {
return this; return this;
} }
public Builder put(String name, SonarValue v) { public Builder put(String name, FlipperValue v) {
return put(name, v.toSonarObject()); return put(name, v.toSonarObject());
} }
public Builder put(String name, SonarArray a) { public Builder put(String name, FlipperArray a) {
try { try {
mJson.put(name, a == null ? null : a.mJson); mJson.put(name, a == null ? null : a.mJson);
} catch (JSONException e) { } catch (JSONException e) {
@@ -197,11 +197,11 @@ public class SonarObject {
return this; return this;
} }
public Builder put(String name, SonarArray.Builder b) { public Builder put(String name, FlipperArray.Builder b) {
return put(name, b.build()); return put(name, b.build());
} }
public Builder put(String name, SonarObject o) { public Builder put(String name, FlipperObject o) {
try { try {
mJson.put(name, o == null ? null : o.mJson); mJson.put(name, o == null ? null : o.mJson);
} catch (JSONException e) { } catch (JSONException e) {
@@ -210,12 +210,12 @@ public class SonarObject {
return this; return this;
} }
public Builder put(String name, SonarObject.Builder b) { public Builder put(String name, FlipperObject.Builder b) {
return put(name, b.build()); return put(name, b.build());
} }
public SonarObject build() { public FlipperObject build() {
return new SonarObject(mJson); return new FlipperObject(mJson);
} }
} }
} }

16
android/src/main/java/com/facebook/flipper/core/SonarPlugin.java → android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java
View File

@@ -8,13 +8,13 @@
package com.facebook.flipper.core; package com.facebook.flipper.core;
/** /**
* A SonarPlugin is an object which exposes an API to the Desktop Sonar application. When a * A FlipperPlugin is an object which exposes an API to the Desktop Sonar application. When a
* connection is established the plugin is given a SonarConnection on which it can register request * connection is established the plugin is given a FlipperConnection on which it can register request
* handlers and send messages. When the SonarConnection is invalid onDisconnect is called. onConnect * handlers and send messages. When the FlipperConnection is invalid onDisconnect is called. onConnect
* may be called again on the same plugin object if Sonar re-connects, this will provide a new * may be called again on the same plugin object if Sonar re-connects, this will provide a new
* SonarConnection, do not attempt to re-use the previous connection. * FlipperConnection, do not attempt to re-use the previous connection.
*/ */
public interface SonarPlugin { public interface FlipperPlugin {
/** /**
* @return The id of this plugin. This is the namespace which Sonar desktop plugins will call * @return The id of this plugin. This is the namespace which Sonar desktop plugins will call
@@ -25,12 +25,12 @@ public interface SonarPlugin {
/** /**
* Called when a connection has been established. The connection passed to this method is valid * Called when a connection has been established. The connection passed to this method is valid
* until {@link SonarPlugin#onDisconnect()} is called. * until {@link FlipperPlugin#onDisconnect()} is called.
*/ */
void onConnect(SonarConnection connection) throws Exception; void onConnect(FlipperConnection connection) throws Exception;
/** /**
* Called when the connection passed to {@link SonarPlugin#onConnect(SonarConnection)} is no * Called when the connection passed to {@link FlipperPlugin#onConnect(FlipperConnection)} is no
* longer valid. Do not try to use the connection in or after this method has been called. * longer valid. Do not try to use the connection in or after this method has been called.
*/ */
void onDisconnect() throws Exception; void onDisconnect() throws Exception;

4
android/src/main/java/com/facebook/flipper/core/SonarReceiver.java → android/src/main/java/com/facebook/flipper/core/FlipperReceiver.java
View File

@@ -11,7 +11,7 @@ package com.facebook.flipper.core;
* A receiver of a remote method call issued by the Sonar desktop application. If the given * A receiver of a remote method call issued by the Sonar desktop application. If the given
* responder is present it means the Sonar desktop application is expecting a response. * responder is present it means the Sonar desktop application is expecting a response.
*/ */
public interface SonarReceiver { public interface FlipperReceiver {
/** /**
* Reciver for a request sent from the Sonar desktop client. * Reciver for a request sent from the Sonar desktop client.
@@ -21,5 +21,5 @@ public interface SonarReceiver {
* through. In this case the request should be made from the desktop using send() instead of * through. In this case the request should be made from the desktop using send() instead of
* call(). * call().
*/ */
void onReceive(SonarObject params, SonarResponder responder) throws Exception; void onReceive(FlipperObject params, FlipperResponder responder) throws Exception;
} }

8
android/src/main/java/com/facebook/flipper/core/SonarResponder.java → android/src/main/java/com/facebook/flipper/core/FlipperResponder.java
View File

@@ -12,17 +12,17 @@ package com.facebook.flipper.core;
* app. The Sonar Responder will automatically wrap the response in an approriate object depending * app. The Sonar Responder will automatically wrap the response in an approriate object depending
* on if it is an error or not. * on if it is an error or not.
*/ */
public interface SonarResponder { public interface FlipperResponder {
/** Deliver a successful response to the Sonar desktop app. */ /** Deliver a successful response to the Sonar desktop app. */
void success(SonarObject response); void success(FlipperObject response);
/** Deliver a successful response to the Sonar desktop app. */ /** Deliver a successful response to the Sonar desktop app. */
void success(SonarArray response); void success(FlipperArray response);
/** Deliver a successful response to the Sonar desktop app. */ /** Deliver a successful response to the Sonar desktop app. */
void success(); void success();
/** Inform the Sonar desktop app of an error in handling the request. */ /** Inform the Sonar desktop app of an error in handling the request. */
void error(SonarObject response); void error(FlipperObject response);
} }

12
android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java Normal file
View File

@@ -0,0 +1,12 @@
package com.facebook.flipper.core;
public interface FlipperStateUpdateListener {
/**
* Called when the state of the sonar client changes.
* Typical implementations will subscribe by calling {@link com.facebook.flipper.core.FlipperClient#subscribeForUpdates()}, to start receiving update events.
* Calling {@link com.facebook.flipper.core.FlipperClient#getState()} will retrieve the updated state.
*/
void onUpdate();
}

4
android/src/main/java/com/facebook/flipper/core/SonarValue.java → android/src/main/java/com/facebook/flipper/core/FlipperValue.java
View File

@@ -7,6 +7,6 @@
*/ */
package com.facebook.flipper.core; package com.facebook.flipper.core;
public interface SonarValue { public interface FlipperValue {
SonarObject toSonarObject(); FlipperObject toSonarObject();
} }

12
android/src/main/java/com/facebook/flipper/core/SonarStateUpdateListener.java
View File

@@ -1,12 +0,0 @@
package com.facebook.flipper.core;
public interface SonarStateUpdateListener {
/**
* Called when the state of the sonar client changes.
* Typical implementations will subscribe by calling {@link com.facebook.flipper.core.SonarClient#subscribeForUpdates()}, to start receiving update events.
* Calling {@link com.facebook.flipper.core.SonarClient#getState()} will retrieve the updated state.
*/
void onUpdate();
}

24
android/src/main/java/com/facebook/flipper/plugins/common/BufferingSonarPlugin.java
View File

@@ -7,26 +7,26 @@
*/ */
package com.facebook.flipper.plugins.common; package com.facebook.flipper.plugins.common;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarPlugin; import com.facebook.flipper.core.FlipperPlugin;
import javax.annotation.Nullable; import javax.annotation.Nullable;
/** /**
* Sonar plugin that keeps events in a buffer until a connection is available. * Sonar plugin that keeps events in a buffer until a connection is available.
* *
* <p>In order to send data to the {@link SonarConnection}, use {@link #send(String, SonarObject)} * <p>In order to send data to the {@link FlipperConnection}, use {@link #send(String, FlipperObject)}
* instead of {@link SonarConnection#send(String, SonarObject)}. * instead of {@link FlipperConnection#send(String, FlipperObject)}.
*/ */
public abstract class BufferingSonarPlugin implements SonarPlugin { public abstract class BufferingSonarPlugin implements FlipperPlugin {
private static final int BUFFER_SIZE = 500; private static final int BUFFER_SIZE = 500;
private @Nullable RingBuffer<CachedSonarEvent> mEventQueue; private @Nullable RingBuffer<CachedSonarEvent> mEventQueue;
private @Nullable SonarConnection mConnection; private @Nullable FlipperConnection mConnection;
@Override @Override
public synchronized void onConnect(SonarConnection connection) { public synchronized void onConnect(FlipperConnection connection) {
mConnection = connection; mConnection = connection;
sendBufferedEvents(); sendBufferedEvents();
@@ -37,7 +37,7 @@ public abstract class BufferingSonarPlugin implements SonarPlugin {
mConnection = null; mConnection = null;
} }
public synchronized SonarConnection getConnection() { public synchronized FlipperConnection getConnection() {
return mConnection; return mConnection;
} }
@@ -45,7 +45,7 @@ public abstract class BufferingSonarPlugin implements SonarPlugin {
return mConnection != null; return mConnection != null;
} }
public synchronized void send(String method, SonarObject sonarObject) { public synchronized void send(String method, FlipperObject sonarObject) {
if (mEventQueue == null) { if (mEventQueue == null) {
mEventQueue = new RingBuffer<>(BUFFER_SIZE); mEventQueue = new RingBuffer<>(BUFFER_SIZE);
} }
@@ -67,9 +67,9 @@ public abstract class BufferingSonarPlugin implements SonarPlugin {
private static class CachedSonarEvent { private static class CachedSonarEvent {
final String method; final String method;
final SonarObject sonarObject; final FlipperObject sonarObject;
private CachedSonarEvent(String method, SonarObject sonarObject) { private CachedSonarEvent(String method, FlipperObject sonarObject) {
this.method = method; this.method = method;
this.sonarObject = sonarObject; this.sonarObject = sonarObject;
} }

18
android/src/main/java/com/facebook/flipper/plugins/common/MainThreadSonarReceiver.java
View File

@@ -10,22 +10,22 @@ package com.facebook.flipper.plugins.common;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import com.facebook.flipper.core.ErrorReportingRunnable; import com.facebook.flipper.core.ErrorReportingRunnable;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
public abstract class MainThreadSonarReceiver implements SonarReceiver { public abstract class MainThreadSonarReceiver implements FlipperReceiver {
public MainThreadSonarReceiver(SonarConnection connection) { public MainThreadSonarReceiver(FlipperConnection connection) {
this.mConnection = connection; this.mConnection = connection;
} }
private final SonarConnection mConnection; private final FlipperConnection mConnection;
private final Handler mHandler = new Handler(Looper.getMainLooper()); private final Handler mHandler = new Handler(Looper.getMainLooper());
@Override @Override
public final void onReceive(final SonarObject params, final SonarResponder responder) { public final void onReceive(final FlipperObject params, final FlipperResponder responder) {
mHandler.post( mHandler.post(
new ErrorReportingRunnable(mConnection) { new ErrorReportingRunnable(mConnection) {
@Override @Override
@@ -35,6 +35,6 @@ public abstract class MainThreadSonarReceiver implements SonarReceiver {
}); });
} }
public abstract void onReceiveOnMainThread(SonarObject params, SonarResponder responder) public abstract void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
throws Exception; throws Exception;
} }

8
android/src/main/java/com/facebook/flipper/plugins/console/ConsoleSonarPlugin.java
View File

@@ -7,11 +7,11 @@
*/ */
package com.facebook.flipper.plugins.console; package com.facebook.flipper.plugins.console;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarPlugin; import com.facebook.flipper.core.FlipperPlugin;
import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver; import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver;
public class ConsoleSonarPlugin implements SonarPlugin { public class ConsoleSonarPlugin implements FlipperPlugin {
private final JavascriptEnvironment mJavascriptEnvironment; private final JavascriptEnvironment mJavascriptEnvironment;
private JavascriptSession mJavascriptSession; private JavascriptSession mJavascriptSession;
@@ -26,7 +26,7 @@ public class ConsoleSonarPlugin implements SonarPlugin {
} }
@Override @Override
public void onConnect(SonarConnection connection) throws Exception { public void onConnect(FlipperConnection connection) throws Exception {
ConsoleCommandReceiver.listenForCommands(connection, mJavascriptEnvironment); ConsoleCommandReceiver.listenForCommands(connection, mJavascriptEnvironment);
} }

30
android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java
View File

@@ -8,16 +8,16 @@
package com.facebook.flipper.plugins.console.iface; package com.facebook.flipper.plugins.console.iface;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
import com.facebook.flipper.plugins.common.MainThreadSonarReceiver; import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
import org.json.JSONObject; import org.json.JSONObject;
/** /**
* Convenience class for adding console execution to a Sonar Plugin. Calling {@link * Convenience class for adding console execution to a Sonar Plugin. Calling {@link
* ConsoleCommandReceiver#listenForCommands(SonarConnection, ScriptingEnvironment, ContextProvider)} * ConsoleCommandReceiver#listenForCommands(FlipperConnection, ScriptingEnvironment, ContextProvider)}
* will add the necessary listeners for responding to command execution calls. * will add the necessary listeners for responding to command execution calls.
*/ */
public class ConsoleCommandReceiver { public class ConsoleCommandReceiver {
@@ -33,15 +33,15 @@ public class ConsoleCommandReceiver {
} }
public static void listenForCommands( public static void listenForCommands(
final SonarConnection connection, final FlipperConnection connection,
final ScriptingEnvironment scriptingEnvironment, final ScriptingEnvironment scriptingEnvironment,
final ContextProvider contextProvider) { final ContextProvider contextProvider) {
final ScriptingSession session = scriptingEnvironment.startSession(); final ScriptingSession session = scriptingEnvironment.startSession();
final SonarReceiver executeCommandReceiver = final FlipperReceiver executeCommandReceiver =
new MainThreadSonarReceiver(connection) { new MainThreadSonarReceiver(connection) {
@Override @Override
public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
final String command = params.getString("command"); final String command = params.getString("command");
final String contextObjectId = params.getString("context"); final String contextObjectId = params.getString("context");
@@ -51,18 +51,18 @@ public class ConsoleCommandReceiver {
contextObject == null contextObject == null
? session.evaluateCommand(command) ? session.evaluateCommand(command)
: session.evaluateCommand(command, contextObject); : session.evaluateCommand(command, contextObject);
responder.success(new SonarObject(o)); responder.success(new FlipperObject(o));
} catch (Exception e) { } catch (Exception e) {
responder.error(new SonarObject.Builder().put("message", e.getMessage()).build()); responder.error(new FlipperObject.Builder().put("message", e.getMessage()).build());
} }
} }
}; };
final SonarReceiver isEnabledReceiver = final FlipperReceiver isEnabledReceiver =
new SonarReceiver() { new FlipperReceiver() {
@Override @Override
public void onReceive(SonarObject params, SonarResponder responder) throws Exception { public void onReceive(FlipperObject params, FlipperResponder responder) throws Exception {
responder.success( responder.success(
new SonarObject.Builder() new FlipperObject.Builder()
.put("isEnabled", scriptingEnvironment.isEnabled()) .put("isEnabled", scriptingEnvironment.isEnabled())
.build()); .build());
} }
@@ -73,7 +73,7 @@ public class ConsoleCommandReceiver {
} }
public static void listenForCommands( public static void listenForCommands(
SonarConnection connection, ScriptingEnvironment scriptingEnvironment) { FlipperConnection connection, ScriptingEnvironment scriptingEnvironment) {
listenForCommands(connection, scriptingEnvironment, nullContextProvider); listenForCommands(connection, scriptingEnvironment, nullContextProvider);
} }

4
android/src/main/java/com/facebook/flipper/plugins/inspector/DescriptorMapping.java
View File

@@ -15,7 +15,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.widget.TextView; import android.widget.TextView;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.plugins.inspector.descriptors.ActivityDescriptor; import com.facebook.flipper.plugins.inspector.descriptors.ActivityDescriptor;
import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor; import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
import com.facebook.flipper.plugins.inspector.descriptors.DialogDescriptor; import com.facebook.flipper.plugins.inspector.descriptors.DialogDescriptor;
@@ -74,7 +74,7 @@ public class DescriptorMapping {
return mMapping.get(clazz); return mMapping.get(clazz);
} }
void onConnect(SonarConnection connection) { void onConnect(FlipperConnection connection) {
for (NodeDescriptor descriptor : mMapping.values()) { for (NodeDescriptor descriptor : mMapping.values()) {
descriptor.setConnection(connection); descriptor.setConnection(connection);
descriptor.setDescriptorMapping(this); descriptor.setDescriptorMapping(this);

142
android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java
View File

@@ -16,13 +16,13 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.facebook.flipper.core.ErrorReportingRunnable; import com.facebook.flipper.core.ErrorReportingRunnable;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarPlugin; import com.facebook.flipper.core.FlipperPlugin;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
import com.facebook.flipper.plugins.common.MainThreadSonarReceiver; import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver; import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver;
import com.facebook.flipper.plugins.console.iface.NullScriptingEnvironment; import com.facebook.flipper.plugins.console.iface.NullScriptingEnvironment;
@@ -35,7 +35,7 @@ import java.util.List;
import java.util.Stack; import java.util.Stack;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class InspectorSonarPlugin implements SonarPlugin { public class InspectorSonarPlugin implements FlipperPlugin {
private ApplicationWrapper mApplication; private ApplicationWrapper mApplication;
private DescriptorMapping mDescriptorMapping; private DescriptorMapping mDescriptorMapping;
@@ -43,7 +43,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
private ScriptingEnvironment mScriptingEnvironment; private ScriptingEnvironment mScriptingEnvironment;
private String mHighlightedId; private String mHighlightedId;
private TouchOverlayView mTouchOverlay; private TouchOverlayView mTouchOverlay;
private SonarConnection mConnection; private FlipperConnection mConnection;
private @Nullable List<ExtensionCommand> mExtensionCommands; private @Nullable List<ExtensionCommand> mExtensionCommands;
private boolean mShowLithoAccessibilitySettings; private boolean mShowLithoAccessibilitySettings;
@@ -51,8 +51,8 @@ public class InspectorSonarPlugin implements SonarPlugin {
public interface ExtensionCommand { public interface ExtensionCommand {
/** The command to respond to */ /** The command to respond to */
String command(); String command();
/** The corresponding SonarReceiver for the command */ /** The corresponding FlipperReceiver for the command */
SonarReceiver receiver(ObjectTracker tracker, SonarConnection connection); FlipperReceiver receiver(ObjectTracker tracker, FlipperConnection connection);
} }
private static Application getAppContextFromContext(Context context) { private static Application getAppContextFromContext(Context context) {
@@ -121,7 +121,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
@Override @Override
public void onConnect(SonarConnection connection) throws Exception { public void onConnect(FlipperConnection connection) throws Exception {
mConnection = connection; mConnection = connection;
mDescriptorMapping.onConnect(connection); mDescriptorMapping.onConnect(connection);
@@ -173,50 +173,50 @@ public class InspectorSonarPlugin implements SonarPlugin {
mConnection = null; mConnection = null;
} }
final SonarReceiver mShouldShowLithoAccessibilitySettings = final FlipperReceiver mShouldShowLithoAccessibilitySettings =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
responder.success(new SonarObject.Builder().put("showLithoAccessibilitySettings", mShowLithoAccessibilitySettings).build()); responder.success(new FlipperObject.Builder().put("showLithoAccessibilitySettings", mShowLithoAccessibilitySettings).build());
} }
}; };
final SonarReceiver mGetRoot = final FlipperReceiver mGetRoot =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
responder.success(getNode(trackObject(mApplication))); responder.success(getNode(trackObject(mApplication)));
} }
}; };
final SonarReceiver mGetAXRoot = final FlipperReceiver mGetAXRoot =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
// applicationWrapper is not used by accessibility, but is a common ancestor for multiple view roots // applicationWrapper is not used by accessibility, but is a common ancestor for multiple view roots
responder.success(getAXNode(trackObject(mApplication))); responder.success(getAXNode(trackObject(mApplication)));
} }
}; };
final SonarReceiver mGetNodes = final FlipperReceiver mGetNodes =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final SonarObject params, final SonarResponder responder) public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder)
throws Exception { throws Exception {
final SonarArray ids = params.getArray("ids"); final FlipperArray ids = params.getArray("ids");
final SonarArray.Builder result = new SonarArray.Builder(); final FlipperArray.Builder result = new FlipperArray.Builder();
for (int i = 0, count = ids.length(); i < count; i++) { for (int i = 0, count = ids.length(); i < count; i++) {
final String id = ids.getString(i); final String id = ids.getString(i);
final SonarObject node = getNode(id); final FlipperObject node = getNode(id);
if (node != null) { if (node != null) {
result.put(node); result.put(node);
} else { } else {
responder.error( responder.error(
new SonarObject.Builder() new FlipperObject.Builder()
.put("message", "No node with given id") .put("message", "No node with given id")
.put("id", id) .put("id", id)
.build()); .build());
@@ -224,17 +224,17 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
} }
responder.success(new SonarObject.Builder().put("elements", result).build()); responder.success(new FlipperObject.Builder().put("elements", result).build());
} }
}; };
final SonarReceiver mGetAXNodes = final FlipperReceiver mGetAXNodes =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final SonarObject params, final SonarResponder responder) public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder)
throws Exception { throws Exception {
final SonarArray ids = params.getArray("ids"); final FlipperArray ids = params.getArray("ids");
final SonarArray.Builder result = new SonarArray.Builder(); final FlipperArray.Builder result = new FlipperArray.Builder();
// getNodes called to refresh accessibility focus // getNodes called to refresh accessibility focus
final boolean forAccessibilityEvent = params.getBoolean("forAccessibilityEvent"); final boolean forAccessibilityEvent = params.getBoolean("forAccessibilityEvent");
@@ -242,7 +242,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
for (int i = 0, count = ids.length(); i < count; i++) { for (int i = 0, count = ids.length(); i < count; i++) {
final String id = ids.getString(i); final String id = ids.getString(i);
final SonarObject node = getAXNode(id); final FlipperObject node = getAXNode(id);
// sent request for non-existent node, potentially in error // sent request for non-existent node, potentially in error
if (node == null) { if (node == null) {
@@ -253,7 +253,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
responder.error( responder.error(
new SonarObject.Builder() new FlipperObject.Builder()
.put("message", "No accessibility node with given id") .put("message", "No accessibility node with given id")
.put("id", id) .put("id", id)
.build()); .build());
@@ -273,14 +273,14 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
} }
} }
responder.success(new SonarObject.Builder().put("elements", result).build()); responder.success(new FlipperObject.Builder().put("elements", result).build());
} }
}; };
final SonarReceiver mOnRequestAXFocus = final FlipperReceiver mOnRequestAXFocus =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final SonarObject params, final SonarResponder responder) public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder)
throws Exception { throws Exception {
final String nodeId = params.getString("id"); final String nodeId = params.getString("id");
@@ -293,15 +293,15 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
}; };
final SonarReceiver mSetData = final FlipperReceiver mSetData =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
final String nodeId = params.getString("id"); final String nodeId = params.getString("id");
final boolean ax = params.getBoolean("ax"); final boolean ax = params.getBoolean("ax");
final SonarArray keyPath = params.getArray("path"); final FlipperArray keyPath = params.getArray("path");
final SonarDynamic value = params.getDynamic("value"); final FlipperDynamic value = params.getDynamic("value");
final Object obj = mObjectTracker.get(nodeId); final Object obj = mObjectTracker.get(nodeId);
if (obj == null) { if (obj == null) {
@@ -324,10 +324,10 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
}; };
final SonarReceiver mSetHighlighted = final FlipperReceiver mSetHighlighted =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
final String nodeId = params.getString("id"); final String nodeId = params.getString("id");
final boolean isAlignmentMode = params.getBoolean("isAlignmentMode"); final boolean isAlignmentMode = params.getBoolean("isAlignmentMode");
@@ -343,10 +343,10 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
}; };
final SonarReceiver mSetSearchActive = final FlipperReceiver mSetSearchActive =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
final boolean active = params.getBoolean("active"); final boolean active = params.getBoolean("active");
ApplicationDescriptor.setSearchActive(active); ApplicationDescriptor.setSearchActive(active);
@@ -373,27 +373,27 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
}; };
final SonarReceiver mIsSearchActive = final FlipperReceiver mIsSearchActive =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
responder.success(new SonarObject.Builder().put("isSearchActive", ApplicationDescriptor.getSearchActive()).build()); responder.success(new FlipperObject.Builder().put("isSearchActive", ApplicationDescriptor.getSearchActive()).build());
} }
}; };
final SonarReceiver mGetSearchResults = final FlipperReceiver mGetSearchResults =
new MainThreadSonarReceiver(mConnection) { new MainThreadSonarReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
final String query = params.getString("query"); final String query = params.getString("query");
final boolean axEnabled = params.getBoolean("axEnabled"); final boolean axEnabled = params.getBoolean("axEnabled");
final SearchResultNode matchTree = searchTree(query.toLowerCase(), mApplication, axEnabled); final SearchResultNode matchTree = searchTree(query.toLowerCase(), mApplication, axEnabled);
final SonarObject results = matchTree == null ? null : matchTree.toSonarObject(); final FlipperObject results = matchTree == null ? null : matchTree.toSonarObject();
final SonarObject response = final FlipperObject response =
new SonarObject.Builder().put("results", results).put("query", query).build(); new FlipperObject.Builder().put("results", results).put("query", query).build();
responder.success(response); responder.success(response);
} }
}; };
@@ -409,7 +409,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
// if in layout inspector and talkback is running, override the first click to locate the clicked view // if in layout inspector and talkback is running, override the first click to locate the clicked view
if (mConnection != null && AccessibilityUtil.isTalkbackEnabled(getContext()) && event.getPointerCount() == 1) { if (mConnection != null && AccessibilityUtil.isTalkbackEnabled(getContext()) && event.getPointerCount() == 1) {
SonarObject params = new SonarObject.Builder() FlipperObject params = new FlipperObject.Builder()
.put("type", "usage") .put("type", "usage")
.put("eventName", "accessibility:clickToInspectTalkbackRunning").build(); .put("eventName", "accessibility:clickToInspectTalkbackRunning").build();
mConnection.send("track", params); mConnection.send("track", params);
@@ -451,7 +451,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
private Touch createTouch(final int touchX, final int touchY, final boolean ax) throws Exception { private Touch createTouch(final int touchX, final int touchY, final boolean ax) throws Exception {
final SonarArray.Builder path = new SonarArray.Builder(); final FlipperArray.Builder path = new FlipperArray.Builder();
path.put(trackObject(mApplication)); path.put(trackObject(mApplication));
return new Touch() { return new Touch() {
@@ -462,7 +462,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
@Override @Override
public void finish() { public void finish() {
mConnection.send(ax ? "selectAX" : "select", new SonarObject.Builder().put("path", path).build()); mConnection.send(ax ? "selectAX" : "select", new FlipperObject.Builder().put("path", path).build());
} }
@Override @Override
@@ -521,8 +521,8 @@ public class InspectorSonarPlugin implements SonarPlugin {
descriptor.setHighlighted(obj, highlighted, isAlignmentMode); descriptor.setHighlighted(obj, highlighted, isAlignmentMode);
} }
private boolean hasAXNode(SonarObject node) { private boolean hasAXNode(FlipperObject node) {
SonarObject extraInfo = node.getObject("extraInfo"); FlipperObject extraInfo = node.getObject("extraInfo");
return extraInfo != null && extraInfo.getBoolean("hasAXNode"); return extraInfo != null && extraInfo.getBoolean("hasAXNode");
} }
@@ -544,13 +544,13 @@ public class InspectorSonarPlugin implements SonarPlugin {
if (isMatch || childTrees != null) { if (isMatch || childTrees != null) {
final String id = trackObject(obj); final String id = trackObject(obj);
SonarObject node = getNode(id); FlipperObject node = getNode(id);
return new SearchResultNode(id, isMatch, node, childTrees, axEnabled && hasAXNode(node) ? getAXNode(id) : null); return new SearchResultNode(id, isMatch, node, childTrees, axEnabled && hasAXNode(node) ? getAXNode(id) : null);
} }
return null; return null;
} }
private @Nullable SonarObject getNode(String id) throws Exception { private @Nullable FlipperObject getNode(String id) throws Exception {
final Object obj = mObjectTracker.get(id); final Object obj = mObjectTracker.get(id);
if (obj == null) { if (obj == null) {
return null; return null;
@@ -561,7 +561,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
return null; return null;
} }
final SonarArray.Builder children = new SonarArray.Builder(); final FlipperArray.Builder children = new FlipperArray.Builder();
new ErrorReportingRunnable(mConnection) { new ErrorReportingRunnable(mConnection) {
@Override @Override
protected void runOrThrow() throws Exception { protected void runOrThrow() throws Exception {
@@ -572,23 +572,23 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
}.run(); }.run();
final SonarObject.Builder data = new SonarObject.Builder(); final FlipperObject.Builder data = new FlipperObject.Builder();
new ErrorReportingRunnable(mConnection) { new ErrorReportingRunnable(mConnection) {
@Override @Override
protected void runOrThrow() throws Exception { protected void runOrThrow() throws Exception {
for (Named<SonarObject> props : descriptor.getData(obj)) { for (Named<FlipperObject> props : descriptor.getData(obj)) {
data.put(props.getName(), props.getValue()); data.put(props.getName(), props.getValue());
} }
} }
}.run(); }.run();
final SonarArray.Builder attributes = new SonarArray.Builder(); final FlipperArray.Builder attributes = new FlipperArray.Builder();
new ErrorReportingRunnable(mConnection) { new ErrorReportingRunnable(mConnection) {
@Override @Override
protected void runOrThrow() throws Exception { protected void runOrThrow() throws Exception {
for (Named<String> attribute : descriptor.getAttributes(obj)) { for (Named<String> attribute : descriptor.getAttributes(obj)) {
attributes.put( attributes.put(
new SonarObject.Builder() new FlipperObject.Builder()
.put("name", attribute.getName()) .put("name", attribute.getName())
.put("value", attribute.getValue()) .put("value", attribute.getValue())
.build()); .build());
@@ -596,7 +596,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
}.run(); }.run();
return new SonarObject.Builder() return new FlipperObject.Builder()
.put("id", descriptor.getId(obj)) .put("id", descriptor.getId(obj))
.put("name", descriptor.getName(obj)) .put("name", descriptor.getName(obj))
.put("data", data) .put("data", data)
@@ -607,7 +607,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
.build(); .build();
} }
private @Nullable SonarObject getAXNode(String id) throws Exception { private @Nullable FlipperObject getAXNode(String id) throws Exception {
final Object obj = mObjectTracker.get(id); final Object obj = mObjectTracker.get(id);
if (obj == null) { if (obj == null) {
@@ -619,7 +619,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
return null; return null;
} }
final SonarArray.Builder children = new SonarArray.Builder(); final FlipperArray.Builder children = new FlipperArray.Builder();
new ErrorReportingRunnable(mConnection) { new ErrorReportingRunnable(mConnection) {
@Override @Override
protected void runOrThrow() throws Exception { protected void runOrThrow() throws Exception {
@@ -630,23 +630,23 @@ public class InspectorSonarPlugin implements SonarPlugin {
} }
}.run(); }.run();
final SonarObject.Builder data = new SonarObject.Builder(); final FlipperObject.Builder data = new FlipperObject.Builder();
new ErrorReportingRunnable(mConnection) { new ErrorReportingRunnable(mConnection) {
@Override @Override
protected void runOrThrow() throws Exception { protected void runOrThrow() throws Exception {
for (Named<SonarObject> props : descriptor.getAXData(obj)) { for (Named<FlipperObject> props : descriptor.getAXData(obj)) {
data.put(props.getName(), props.getValue()); data.put(props.getName(), props.getValue());
} }
} }
}.run(); }.run();
final SonarArray.Builder attributes = new SonarArray.Builder(); final FlipperArray.Builder attributes = new FlipperArray.Builder();
new ErrorReportingRunnable(mConnection) { new ErrorReportingRunnable(mConnection) {
@Override @Override
protected void runOrThrow() throws Exception { protected void runOrThrow() throws Exception {
for (Named<String> attribute : descriptor.getAXAttributes(obj)) { for (Named<String> attribute : descriptor.getAXAttributes(obj)) {
attributes.put( attributes.put(
new SonarObject.Builder() new FlipperObject.Builder()
.put("name", attribute.getName()) .put("name", attribute.getName())
.put("value", attribute.getValue()) .put("value", attribute.getValue())
.build()); .build());
@@ -657,7 +657,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
String name = descriptor.getAXName(obj); String name = descriptor.getAXName(obj);
name = name.substring(name.lastIndexOf('.') + 1); name = name.substring(name.lastIndexOf('.') + 1);
return new SonarObject.Builder() return new FlipperObject.Builder()
.put("id", descriptor.getId(obj)) .put("id", descriptor.getId(obj))
.put("name", name) .put("name", name)
.put("data", data) .put("data", data)

10
android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorValue.java
View File

@@ -8,10 +8,10 @@
package com.facebook.flipper.plugins.inspector; package com.facebook.flipper.plugins.inspector;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarValue; import com.facebook.flipper.core.FlipperValue;
public class InspectorValue<T> implements SonarValue { public class InspectorValue<T> implements FlipperValue {
/** /**
* Descrive the type of data this value contains. This will influence how values are parsed and * Descrive the type of data this value contains. This will influence how values are parsed and
@@ -69,8 +69,8 @@ public class InspectorValue<T> implements SonarValue {
} }
@Override @Override
public SonarObject toSonarObject() { public FlipperObject toSonarObject() {
return new SonarObject.Builder() return new FlipperObject.Builder()
.put("__type__", mType) .put("__type__", mType)
.put("__mutable__", mMutable) .put("__mutable__", mMutable)
.put("value", mValue) .put("value", mValue)

38
android/src/main/java/com/facebook/flipper/plugins/inspector/NodeDescriptor.java
View File

@@ -8,10 +8,10 @@
package com.facebook.flipper.plugins.inspector; package com.facebook.flipper.plugins.inspector;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -22,10 +22,10 @@ import javax.annotation.Nullable;
* data can be exposed to the inspector. * data can be exposed to the inspector.
*/ */
public abstract class NodeDescriptor<T> { public abstract class NodeDescriptor<T> {
protected SonarConnection mConnection; protected FlipperConnection mConnection;
private DescriptorMapping mDescriptorMapping; private DescriptorMapping mDescriptorMapping;
void setConnection(SonarConnection connection) { void setConnection(FlipperConnection connection) {
mConnection = connection; mConnection = connection;
} }
@@ -52,11 +52,11 @@ public abstract class NodeDescriptor<T> {
new ErrorReportingRunnable() { new ErrorReportingRunnable() {
@Override @Override
protected void runOrThrow() throws Exception { protected void runOrThrow() throws Exception {
SonarArray array = FlipperArray array =
new SonarArray.Builder() new FlipperArray.Builder()
.put(new SonarObject.Builder().put("id", getId(node)).build()) .put(new FlipperObject.Builder().put("id", getId(node)).build())
.build(); .build();
SonarObject params = new SonarObject.Builder().put("nodes", array).build(); FlipperObject params = new FlipperObject.Builder().put("nodes", array).build();
mConnection.send("invalidate", params); mConnection.send("invalidate", params);
} }
}.run(); }.run();
@@ -72,11 +72,11 @@ public abstract class NodeDescriptor<T> {
new ErrorReportingRunnable() { new ErrorReportingRunnable() {
@Override @Override
protected void runOrThrow() throws Exception { protected void runOrThrow() throws Exception {
SonarArray array = FlipperArray array =
new SonarArray.Builder() new FlipperArray.Builder()
.put(new SonarObject.Builder().put("id", getId(node)).build()) .put(new FlipperObject.Builder().put("id", getId(node)).build())
.build(); .build();
SonarObject params = new SonarObject.Builder().put("nodes", array).build(); FlipperObject params = new FlipperObject.Builder().put("nodes", array).build();
mConnection.send("invalidateAX", params); mConnection.send("invalidateAX", params);
} }
}.run(); }.run();
@@ -137,10 +137,10 @@ public abstract class NodeDescriptor<T> {
* Get the data to show for this node in the sidebar of the inspector. The object will be showen * Get the data to show for this node in the sidebar of the inspector. The object will be showen
* in order and with a header matching the given name. * in order and with a header matching the given name.
*/ */
public abstract List<Named<SonarObject>> getData(T node) throws Exception; public abstract List<Named<FlipperObject>> getData(T node) throws Exception;
/** Gets data for AX tree */ /** Gets data for AX tree */
public List<Named<SonarObject>> getAXData(T node) throws Exception { public List<Named<FlipperObject>> getAXData(T node) throws Exception {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
@@ -149,7 +149,7 @@ public abstract class NodeDescriptor<T> {
* provided by {@link this#getData(Object)} and the value will be of the same type as the value * provided by {@link this#getData(Object)} and the value will be of the same type as the value
* mathcing that path in the returned object. * mathcing that path in the returned object.
*/ */
public abstract void setValue(T node, String[] path, SonarDynamic value) throws Exception; public abstract void setValue(T node, String[] path, FlipperDynamic value) throws Exception;
/** /**
* Get the attributes for this node. This is a list of read-only string:string mapping which show * Get the attributes for this node. This is a list of read-only string:string mapping which show
@@ -205,8 +205,8 @@ public abstract class NodeDescriptor<T> {
* other tree or if it is not represented in the other tree bu has children that should show * other tree or if it is not represented in the other tree bu has children that should show
* up, etc. * up, etc.
*/ */
public SonarObject getExtraInfo(T node) { public FlipperObject getExtraInfo(T node) {
return new SonarObject.Builder().build(); return new FlipperObject.Builder().build();
} }
/** /**

18
android/src/main/java/com/facebook/flipper/plugins/inspector/SearchResultNode.java
View File

@@ -9,21 +9,21 @@
package com.facebook.flipper.plugins.inspector; package com.facebook.flipper.plugins.inspector;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import java.util.List; import java.util.List;
public class SearchResultNode { public class SearchResultNode {
private final String id; private final String id;
private final boolean isMatch; private final boolean isMatch;
private final SonarObject element; private final FlipperObject element;
private final SonarObject axElement; private final FlipperObject axElement;
@Nullable @Nullable
private final List<SearchResultNode> children; private final List<SearchResultNode> children;
SearchResultNode( SearchResultNode(
String id, boolean isMatch, SonarObject element, List<SearchResultNode> children, SonarObject axElement) { String id, boolean isMatch, FlipperObject element, List<SearchResultNode> children, FlipperObject axElement) {
this.id = id; this.id = id;
this.isMatch = isMatch; this.isMatch = isMatch;
this.element = element; this.element = element;
@@ -31,10 +31,10 @@ public class SearchResultNode {
this.axElement = axElement; this.axElement = axElement;
} }
SonarObject toSonarObject() { FlipperObject toSonarObject() {
final SonarArray childArray; final FlipperArray childArray;
if (children != null) { if (children != null) {
final SonarArray.Builder builder = new SonarArray.Builder(); final FlipperArray.Builder builder = new FlipperArray.Builder();
for (SearchResultNode child : children) { for (SearchResultNode child : children) {
builder.put(child.toSonarObject()); builder.put(child.toSonarObject());
} }
@@ -43,7 +43,7 @@ public class SearchResultNode {
childArray = null; childArray = null;
} }
return new SonarObject.Builder() return new FlipperObject.Builder()
.put("id", this.id) .put("id", this.id)
.put("isMatch", this.isMatch) .put("isMatch", this.isMatch)
.put("axElement", this.axElement) .put("axElement", this.axElement)

8
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ActivityDescriptor.java
View File

@@ -10,8 +10,8 @@ package com.facebook.flipper.plugins.inspector.descriptors;
import android.app.Activity; import android.app.Activity;
import android.view.Window; import android.view.Window;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -65,12 +65,12 @@ public class ActivityDescriptor extends NodeDescriptor<Activity> {
} }
@Override @Override
public List<Named<SonarObject>> getData(Activity node) { public List<Named<FlipperObject>> getData(Activity node) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
@Override @Override
public void setValue(Activity node, String[] path, SonarDynamic value) throws Exception {} public void setValue(Activity node, String[] path, FlipperDynamic value) throws Exception {}
@Override @Override
public List<Named<String>> getAttributes(Activity node) { public List<Named<String>> getAttributes(Activity node) {

20
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java
View File

@@ -13,8 +13,8 @@ import android.support.v4.view.ViewCompat;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.ApplicationWrapper; import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
@@ -93,17 +93,17 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
int eventType = event.getEventType(); int eventType = event.getEventType();
if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED) { if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED) {
mConnection.send("axFocusEvent", mConnection.send("axFocusEvent",
new SonarObject.Builder() new FlipperObject.Builder()
.put("isFocus", true) .put("isFocus", true)
.build()); .build());
} else if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED) { } else if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED) {
mConnection.send("axFocusEvent", mConnection.send("axFocusEvent",
new SonarObject.Builder() new FlipperObject.Builder()
.put("isFocus", false) .put("isFocus", false)
.build()); .build());
} else if (eventType == AccessibilityEvent.TYPE_VIEW_CLICKED) { } else if (eventType == AccessibilityEvent.TYPE_VIEW_CLICKED) {
mConnection.send("axFocusEvent", mConnection.send("axFocusEvent",
new SonarObject.Builder() new FlipperObject.Builder()
.put("isFocus", false) .put("isFocus", false)
.put("isClick", true) .put("isClick", true)
.build()); .build());
@@ -115,7 +115,7 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
}); });
editedDelegates.add((ViewGroup) view); editedDelegates.add((ViewGroup) view);
} else if (hasDelegateAlready) { } else if (hasDelegateAlready) {
SonarObject params = new SonarObject.Builder() FlipperObject params = new FlipperObject.Builder()
.put("type", "usage") .put("type", "usage")
.put("eventName", "accessibility:hasDelegateAlready").build(); .put("eventName", "accessibility:hasDelegateAlready").build();
mConnection.send("track", params); mConnection.send("track", params);
@@ -200,12 +200,12 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
} }
@Override @Override
public List<Named<SonarObject>> getData(ApplicationWrapper node) { public List<Named<FlipperObject>> getData(ApplicationWrapper node) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
@Override @Override
public void setValue(ApplicationWrapper node, String[] path, SonarDynamic value) {} public void setValue(ApplicationWrapper node, String[] path, FlipperDynamic value) {}
@Override @Override
public List<Named<String>> getAttributes(ApplicationWrapper node) { public List<Named<String>> getAttributes(ApplicationWrapper node) {
@@ -213,8 +213,8 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
} }
@Override @Override
public SonarObject getExtraInfo(ApplicationWrapper node) { public FlipperObject getExtraInfo(ApplicationWrapper node) {
return new SonarObject.Builder().put("hasAXNode", true).build(); return new FlipperObject.Builder().put("hasAXNode", true).build();
} }
@Override @Override

8
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogDescriptor.java
View File

@@ -10,8 +10,8 @@ package com.facebook.flipper.plugins.inspector.descriptors;
import android.app.Dialog; import android.app.Dialog;
import android.view.Window; import android.view.Window;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -45,12 +45,12 @@ public class DialogDescriptor extends NodeDescriptor<Dialog> {
} }
@Override @Override
public List<Named<SonarObject>> getData(Dialog node) { public List<Named<FlipperObject>> getData(Dialog node) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
@Override @Override
public void setValue(Dialog node, String[] path, SonarDynamic value) {} public void setValue(Dialog node, String[] path, FlipperDynamic value) {}
@Override @Override
public List<Named<String>> getAttributes(Dialog node) { public List<Named<String>> getAttributes(Dialog node) {

10
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogFragmentDescriptor.java
View File

@@ -11,8 +11,8 @@ package com.facebook.flipper.plugins.inspector.descriptors;
import android.app.Dialog; import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.app.Fragment; import android.app.Fragment;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -47,13 +47,13 @@ public class DialogFragmentDescriptor extends NodeDescriptor<DialogFragment> {
} }
@Override @Override
public List<Named<SonarObject>> getData(DialogFragment node) throws Exception { public List<Named<FlipperObject>> getData(DialogFragment node) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(Fragment.class); final NodeDescriptor descriptor = descriptorForClass(Fragment.class);
return descriptor.getData(node); return descriptor.getData(node);
} }
@Override @Override
public void setValue(DialogFragment node, String[] path, SonarDynamic value) throws Exception { public void setValue(DialogFragment node, String[] path, FlipperDynamic value) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(Fragment.class); final NodeDescriptor descriptor = descriptorForClass(Fragment.class);
descriptor.setValue(node, path, value); descriptor.setValue(node, path, value);
} }
@@ -65,7 +65,7 @@ public class DialogFragmentDescriptor extends NodeDescriptor<DialogFragment> {
} }
@Override @Override
public SonarObject getExtraInfo(DialogFragment node) { public FlipperObject getExtraInfo(DialogFragment node) {
final NodeDescriptor descriptor = descriptorForClass(Fragment.class); final NodeDescriptor descriptor = descriptorForClass(Fragment.class);
return descriptor.getExtraInfo(node); return descriptor.getExtraInfo(node);
} }

10
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DrawableDescriptor.java
View File

@@ -12,8 +12,8 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.view.View; import android.view.View;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.HighlightedOverlay; import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.InspectorValue;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
@@ -50,8 +50,8 @@ public class DrawableDescriptor extends NodeDescriptor<Drawable> {
} }
@Override @Override
public List<Named<SonarObject>> getData(Drawable node) { public List<Named<FlipperObject>> getData(Drawable node) {
final SonarObject.Builder props = new SonarObject.Builder(); final FlipperObject.Builder props = new FlipperObject.Builder();
final Rect bounds = node.getBounds(); final Rect bounds = node.getBounds();
props.put("left", InspectorValue.mutable(bounds.left)); props.put("left", InspectorValue.mutable(bounds.left));
@@ -67,7 +67,7 @@ public class DrawableDescriptor extends NodeDescriptor<Drawable> {
} }
@Override @Override
public void setValue(Drawable node, String[] path, SonarDynamic value) { public void setValue(Drawable node, String[] path, FlipperDynamic value) {
final Rect bounds = node.getBounds(); final Rect bounds = node.getBounds();
switch (path[0]) { switch (path[0]) {

14
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/FragmentDescriptor.java
View File

@@ -11,8 +11,8 @@ package com.facebook.flipper.plugins.inspector.descriptors;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -48,13 +48,13 @@ public class FragmentDescriptor extends NodeDescriptor<Fragment> {
} }
@Override @Override
public List<Named<SonarObject>> getData(Fragment node) { public List<Named<FlipperObject>> getData(Fragment node) {
final Bundle args = node.getArguments(); final Bundle args = node.getArguments();
if (args == null || args.isEmpty()) { if (args == null || args.isEmpty()) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
final SonarObject.Builder bundle = new SonarObject.Builder(); final FlipperObject.Builder bundle = new FlipperObject.Builder();
for (String key : args.keySet()) { for (String key : args.keySet()) {
bundle.put(key, args.get(key)); bundle.put(key, args.get(key));
@@ -64,7 +64,7 @@ public class FragmentDescriptor extends NodeDescriptor<Fragment> {
} }
@Override @Override
public void setValue(Fragment node, String[] path, SonarDynamic value) {} public void setValue(Fragment node, String[] path, FlipperDynamic value) {}
@Override @Override
public List<Named<String>> getAttributes(Fragment node) { public List<Named<String>> getAttributes(Fragment node) {
@@ -78,8 +78,8 @@ public class FragmentDescriptor extends NodeDescriptor<Fragment> {
} }
@Override @Override
public SonarObject getExtraInfo(Fragment node) { public FlipperObject getExtraInfo(Fragment node) {
return new SonarObject.Builder().put("nonAXWithAXChild", true).build(); return new FlipperObject.Builder().put("nonAXWithAXChild", true).build();
} }
@Nullable @Nullable

8
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ObjectDescriptor.java
View File

@@ -8,8 +8,8 @@
package com.facebook.flipper.plugins.inspector.descriptors; package com.facebook.flipper.plugins.inspector.descriptors;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -43,12 +43,12 @@ public class ObjectDescriptor extends NodeDescriptor<Object> {
} }
@Override @Override
public List<Named<SonarObject>> getData(Object node) { public List<Named<FlipperObject>> getData(Object node) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
@Override @Override
public void setValue(Object node, String[] path, SonarDynamic value) {} public void setValue(Object node, String[] path, FlipperDynamic value) {}
@Override @Override
public List<Named<String>> getAttributes(Object node) { public List<Named<String>> getAttributes(Object node) {

10
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
View File

@@ -11,8 +11,8 @@ package com.facebook.flipper.plugins.inspector.descriptors;
import android.app.Dialog; import android.app.Dialog;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -47,13 +47,13 @@ public class SupportDialogFragmentDescriptor extends NodeDescriptor<DialogFragme
} }
@Override @Override
public List<Named<SonarObject>> getData(DialogFragment node) throws Exception { public List<Named<FlipperObject>> getData(DialogFragment node) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(Fragment.class); final NodeDescriptor descriptor = descriptorForClass(Fragment.class);
return descriptor.getData(node); return descriptor.getData(node);
} }
@Override @Override
public void setValue(DialogFragment node, String[] path, SonarDynamic value) throws Exception { public void setValue(DialogFragment node, String[] path, FlipperDynamic value) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(Fragment.class); final NodeDescriptor descriptor = descriptorForClass(Fragment.class);
descriptor.setValue(node, path, value); descriptor.setValue(node, path, value);
} }
@@ -65,7 +65,7 @@ public class SupportDialogFragmentDescriptor extends NodeDescriptor<DialogFragme
} }
@Override @Override
public SonarObject getExtraInfo(DialogFragment node) { public FlipperObject getExtraInfo(DialogFragment node) {
final NodeDescriptor descriptor = descriptorForClass(Fragment.class); final NodeDescriptor descriptor = descriptorForClass(Fragment.class);
return descriptor.getExtraInfo(node); return descriptor.getExtraInfo(node);
} }

14
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportFragmentDescriptor.java
View File

@@ -11,8 +11,8 @@ package com.facebook.flipper.plugins.inspector.descriptors;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.View; import android.view.View;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -48,13 +48,13 @@ public class SupportFragmentDescriptor extends NodeDescriptor<Fragment> {
} }
@Override @Override
public List<Named<SonarObject>> getData(Fragment node) { public List<Named<FlipperObject>> getData(Fragment node) {
final Bundle args = node.getArguments(); final Bundle args = node.getArguments();
if (args == null || args.isEmpty()) { if (args == null || args.isEmpty()) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
final SonarObject.Builder bundle = new SonarObject.Builder(); final FlipperObject.Builder bundle = new FlipperObject.Builder();
for (String key : args.keySet()) { for (String key : args.keySet()) {
bundle.put(key, args.get(key)); bundle.put(key, args.get(key));
@@ -64,7 +64,7 @@ public class SupportFragmentDescriptor extends NodeDescriptor<Fragment> {
} }
@Override @Override
public void setValue(Fragment node, String[] path, SonarDynamic value) {} public void setValue(Fragment node, String[] path, FlipperDynamic value) {}
@Override @Override
public List<Named<String>> getAttributes(Fragment node) { public List<Named<String>> getAttributes(Fragment node) {
@@ -79,8 +79,8 @@ public class SupportFragmentDescriptor extends NodeDescriptor<Fragment> {
} }
@Override @Override
public SonarObject getExtraInfo(Fragment node) { public FlipperObject getExtraInfo(Fragment node) {
return new SonarObject.Builder().put("nonAXWithAXChild", true).build(); return new FlipperObject.Builder().put("nonAXWithAXChild", true).build();
} }
@Override @Override

18
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/TextViewDescriptor.java
View File

@@ -14,8 +14,8 @@ import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Text;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.InspectorValue;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
@@ -66,15 +66,15 @@ public class TextViewDescriptor extends NodeDescriptor<TextView> {
} }
@Override @Override
public List<Named<SonarObject>> getData(TextView node) throws Exception { public List<Named<FlipperObject>> getData(TextView node) throws Exception {
final List<Named<SonarObject>> props = new ArrayList<>(); final List<Named<FlipperObject>> props = new ArrayList<>();
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
props.add( props.add(
0, 0,
new Named<>( new Named<>(
"TextView", "TextView",
new SonarObject.Builder() new FlipperObject.Builder()
.put("text", InspectorValue.mutable(Text, node.getText().toString())) .put("text", InspectorValue.mutable(Text, node.getText().toString()))
.put( .put(
"textColor", "textColor",
@@ -88,15 +88,15 @@ public class TextViewDescriptor extends NodeDescriptor<TextView> {
} }
@Override @Override
public List<Named<SonarObject>> getAXData(TextView node) throws Exception { public List<Named<FlipperObject>> getAXData(TextView node) throws Exception {
final List<Named<SonarObject>> props = new ArrayList<>(); final List<Named<FlipperObject>> props = new ArrayList<>();
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
props.addAll(descriptor.getAXData(node)); props.addAll(descriptor.getAXData(node));
return props; return props;
} }
@Override @Override
public void setValue(TextView node, String[] path, SonarDynamic value) throws Exception { public void setValue(TextView node, String[] path, FlipperDynamic value) throws Exception {
switch (path[0]) { switch (path[0]) {
case "TextView": case "TextView":
switch (path[1]) { switch (path[1]) {
@@ -132,7 +132,7 @@ public class TextViewDescriptor extends NodeDescriptor<TextView> {
} }
@Override @Override
public SonarObject getExtraInfo(TextView node) { public FlipperObject getExtraInfo(TextView node) {
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
return descriptor.getExtraInfo(node); return descriptor.getExtraInfo(node);
} }

52
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java
View File

@@ -29,8 +29,8 @@ import android.view.ViewGroup.MarginLayoutParams;
import android.view.ViewParent; import android.view.ViewParent;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.HighlightedOverlay; import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.InspectorValue;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
@@ -113,9 +113,9 @@ public class ViewDescriptor extends NodeDescriptor<View> {
} }
@Override @Override
public List<Named<SonarObject>> getData(View node) { public List<Named<FlipperObject>> getData(View node) {
final SonarObject.Builder viewProps = final FlipperObject.Builder viewProps =
new SonarObject.Builder() new FlipperObject.Builder()
.put("height", InspectorValue.mutable(node.getHeight())) .put("height", InspectorValue.mutable(node.getHeight()))
.put("width", InspectorValue.mutable(node.getWidth())) .put("width", InspectorValue.mutable(node.getWidth()))
.put("alpha", InspectorValue.mutable(node.getAlpha())) .put("alpha", InspectorValue.mutable(node.getAlpha()))
@@ -126,39 +126,39 @@ public class ViewDescriptor extends NodeDescriptor<View> {
.put("layoutParams", getLayoutParams(node)) .put("layoutParams", getLayoutParams(node))
.put( .put(
"state", "state",
new SonarObject.Builder() new FlipperObject.Builder()
.put("enabled", InspectorValue.mutable(node.isEnabled())) .put("enabled", InspectorValue.mutable(node.isEnabled()))
.put("activated", InspectorValue.mutable(node.isActivated())) .put("activated", InspectorValue.mutable(node.isActivated()))
.put("focused", node.isFocused()) .put("focused", node.isFocused())
.put("selected", InspectorValue.mutable(node.isSelected()))) .put("selected", InspectorValue.mutable(node.isSelected())))
.put( .put(
"bounds", "bounds",
new SonarObject.Builder() new FlipperObject.Builder()
.put("left", InspectorValue.mutable(node.getLeft())) .put("left", InspectorValue.mutable(node.getLeft()))
.put("right", InspectorValue.mutable(node.getRight())) .put("right", InspectorValue.mutable(node.getRight()))
.put("top", InspectorValue.mutable(node.getTop())) .put("top", InspectorValue.mutable(node.getTop()))
.put("bottom", InspectorValue.mutable(node.getBottom()))) .put("bottom", InspectorValue.mutable(node.getBottom())))
.put( .put(
"padding", "padding",
new SonarObject.Builder() new FlipperObject.Builder()
.put("left", InspectorValue.mutable(node.getPaddingLeft())) .put("left", InspectorValue.mutable(node.getPaddingLeft()))
.put("top", InspectorValue.mutable(node.getPaddingTop())) .put("top", InspectorValue.mutable(node.getPaddingTop()))
.put("right", InspectorValue.mutable(node.getPaddingRight())) .put("right", InspectorValue.mutable(node.getPaddingRight()))
.put("bottom", InspectorValue.mutable(node.getPaddingBottom()))) .put("bottom", InspectorValue.mutable(node.getPaddingBottom())))
.put( .put(
"rotation", "rotation",
new SonarObject.Builder() new FlipperObject.Builder()
.put("x", InspectorValue.mutable(node.getRotationX())) .put("x", InspectorValue.mutable(node.getRotationX()))
.put("y", InspectorValue.mutable(node.getRotationY())) .put("y", InspectorValue.mutable(node.getRotationY()))
.put("z", InspectorValue.mutable(node.getRotation()))) .put("z", InspectorValue.mutable(node.getRotation())))
.put( .put(
"scale", "scale",
new SonarObject.Builder() new FlipperObject.Builder()
.put("x", InspectorValue.mutable(node.getScaleX())) .put("x", InspectorValue.mutable(node.getScaleX()))
.put("y", InspectorValue.mutable(node.getScaleY()))) .put("y", InspectorValue.mutable(node.getScaleY())))
.put( .put(
"pivot", "pivot",
new SonarObject.Builder() new FlipperObject.Builder()
.put("x", InspectorValue.mutable(node.getPivotX())) .put("x", InspectorValue.mutable(node.getPivotX()))
.put("y", InspectorValue.mutable(node.getPivotY()))); .put("y", InspectorValue.mutable(node.getPivotY())));
@@ -173,8 +173,8 @@ public class ViewDescriptor extends NodeDescriptor<View> {
viewProps.put("elevation", InspectorValue.mutable(node.getElevation())); viewProps.put("elevation", InspectorValue.mutable(node.getElevation()));
} }
SonarObject.Builder translation = FlipperObject.Builder translation =
new SonarObject.Builder() new FlipperObject.Builder()
.put("x", InspectorValue.mutable(node.getTranslationX())) .put("x", InspectorValue.mutable(node.getTranslationX()))
.put("y", InspectorValue.mutable(node.getTranslationY())); .put("y", InspectorValue.mutable(node.getTranslationY()));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -182,8 +182,8 @@ public class ViewDescriptor extends NodeDescriptor<View> {
} }
viewProps.put("translation", translation); viewProps.put("translation", translation);
SonarObject.Builder position = FlipperObject.Builder position =
new SonarObject.Builder() new FlipperObject.Builder()
.put("x", InspectorValue.mutable(node.getX())) .put("x", InspectorValue.mutable(node.getX()))
.put("y", InspectorValue.mutable(node.getY())); .put("y", InspectorValue.mutable(node.getY()));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
@@ -200,7 +200,7 @@ public class ViewDescriptor extends NodeDescriptor<View> {
} }
@Override @Override
public List<Named<SonarObject>> getAXData(View node) { public List<Named<FlipperObject>> getAXData(View node) {
return Arrays.asList( return Arrays.asList(
new Named<>(axNodeInfoPropsTitle, AccessibilityUtil.getAccessibilityNodeInfoData(node)), new Named<>(axNodeInfoPropsTitle, AccessibilityUtil.getAccessibilityNodeInfoData(node)),
new Named<>(axTalkbackPropsTitle, AccessibilityUtil.getTalkbackData(node)), new Named<>(axTalkbackPropsTitle, AccessibilityUtil.getTalkbackData(node)),
@@ -209,7 +209,7 @@ public class ViewDescriptor extends NodeDescriptor<View> {
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
@Override @Override
public void setValue(View node, String[] path, SonarDynamic value) { public void setValue(View node, String[] path, FlipperDynamic value) {
if (path[0].equals(axViewPropsTitle) if (path[0].equals(axViewPropsTitle)
|| path[0].equals(axNodeInfoPropsTitle) || path[0].equals(axNodeInfoPropsTitle)
|| path[0].equals(axTalkbackPropsTitle)) { || path[0].equals(axTalkbackPropsTitle)) {
@@ -381,7 +381,7 @@ public class ViewDescriptor extends NodeDescriptor<View> {
invalidate(node); invalidate(node);
} }
private void setAccessibilityValue(View node, String[] path, SonarDynamic value) { private void setAccessibilityValue(View node, String[] path, FlipperDynamic value) {
switch (path[1]) { switch (path[1]) {
case "focusable": case "focusable":
node.setFocusable(value.asBoolean()); node.setFocusable(value.asBoolean());
@@ -440,8 +440,8 @@ public class ViewDescriptor extends NodeDescriptor<View> {
} }
@Override @Override
public SonarObject getExtraInfo(View node) { public FlipperObject getExtraInfo(View node) {
return new SonarObject.Builder() return new FlipperObject.Builder()
.put("focused", AccessibilityUtil.isAXFocused(node)) .put("focused", AccessibilityUtil.isAXFocused(node))
.put("hasAXNode", true) .put("hasAXNode", true)
.build(); .build();
@@ -542,8 +542,8 @@ public class ViewDescriptor extends NodeDescriptor<View> {
return objectDescriptor.matches(query, node); return objectDescriptor.matches(query, node);
} }
private SonarObject getTags(final View node) { private FlipperObject getTags(final View node) {
final SonarObject.Builder tags = new SonarObject.Builder(); final FlipperObject.Builder tags = new FlipperObject.Builder();
if (sKeyedTagsField == null) { if (sKeyedTagsField == null) {
return tags.build(); return tags.build();
} }
@@ -573,9 +573,9 @@ public class ViewDescriptor extends NodeDescriptor<View> {
return InspectorValue.mutable(Color, 0); return InspectorValue.mutable(Color, 0);
} }
private static SonarObject getLayoutParams(View node) { private static FlipperObject getLayoutParams(View node) {
final LayoutParams layoutParams = node.getLayoutParams(); final LayoutParams layoutParams = node.getLayoutParams();
final SonarObject.Builder params = new SonarObject.Builder(); final FlipperObject.Builder params = new FlipperObject.Builder();
params.put("width", fromSize(layoutParams.width)); params.put("width", fromSize(layoutParams.width));
params.put("height", fromSize(layoutParams.height)); params.put("height", fromSize(layoutParams.height));
@@ -584,7 +584,7 @@ public class ViewDescriptor extends NodeDescriptor<View> {
final MarginLayoutParams marginLayoutParams = (MarginLayoutParams) layoutParams; final MarginLayoutParams marginLayoutParams = (MarginLayoutParams) layoutParams;
params.put( params.put(
"margin", "margin",
new SonarObject.Builder() new FlipperObject.Builder()
.put("left", InspectorValue.mutable(marginLayoutParams.leftMargin)) .put("left", InspectorValue.mutable(marginLayoutParams.leftMargin))
.put("top", InspectorValue.mutable(marginLayoutParams.topMargin)) .put("top", InspectorValue.mutable(marginLayoutParams.topMargin))
.put("right", InspectorValue.mutable(marginLayoutParams.rightMargin)) .put("right", InspectorValue.mutable(marginLayoutParams.rightMargin))
@@ -606,7 +606,7 @@ public class ViewDescriptor extends NodeDescriptor<View> {
return params.build(); return params.build();
} }
private void setLayoutParams(View node, String[] path, SonarDynamic value) { private void setLayoutParams(View node, String[] path, FlipperDynamic value) {
final LayoutParams params = node.getLayoutParams(); final LayoutParams params = node.getLayoutParams();
switch (path[0]) { switch (path[0]) {

18
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptor.java
View File

@@ -17,8 +17,8 @@ import android.os.Build;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.facebook.flipper.R; import com.facebook.flipper.R;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.HiddenNode; import com.facebook.flipper.plugins.inspector.HiddenNode;
import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.InspectorValue;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
@@ -153,11 +153,11 @@ public class ViewGroupDescriptor extends NodeDescriptor<ViewGroup> {
} }
@Override @Override
public List<Named<SonarObject>> getData(ViewGroup node) throws Exception { public List<Named<FlipperObject>> getData(ViewGroup node) throws Exception {
final List<Named<SonarObject>> props = new ArrayList<>(); final List<Named<FlipperObject>> props = new ArrayList<>();
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
final SonarObject.Builder vgProps = new SonarObject.Builder(); final FlipperObject.Builder vgProps = new FlipperObject.Builder();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
vgProps vgProps
@@ -183,15 +183,15 @@ public class ViewGroupDescriptor extends NodeDescriptor<ViewGroup> {
} }
@Override @Override
public List<Named<SonarObject>> getAXData(ViewGroup node) throws Exception { public List<Named<FlipperObject>> getAXData(ViewGroup node) throws Exception {
final List<Named<SonarObject>> props = new ArrayList<>(); final List<Named<FlipperObject>> props = new ArrayList<>();
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
props.addAll(descriptor.getAXData(node)); props.addAll(descriptor.getAXData(node));
return props; return props;
} }
@Override @Override
public void setValue(ViewGroup node, String[] path, SonarDynamic value) throws Exception { public void setValue(ViewGroup node, String[] path, FlipperDynamic value) throws Exception {
switch (path[0]) { switch (path[0]) {
case "ViewGroup": case "ViewGroup":
switch (path[1]) { switch (path[1]) {
@@ -237,7 +237,7 @@ public class ViewGroupDescriptor extends NodeDescriptor<ViewGroup> {
} }
@Override @Override
public SonarObject getExtraInfo(ViewGroup node) { public FlipperObject getExtraInfo(ViewGroup node) {
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
return descriptor.getExtraInfo(node); return descriptor.getExtraInfo(node);
} }

8
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/WindowDescriptor.java
View File

@@ -10,8 +10,8 @@ package com.facebook.flipper.plugins.inspector.descriptors;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -45,12 +45,12 @@ public class WindowDescriptor extends NodeDescriptor<Window> {
} }
@Override @Override
public List<Named<SonarObject>> getData(Window node) { public List<Named<FlipperObject>> getData(Window node) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
@Override @Override
public void setValue(Window node, String[] path, SonarDynamic value) {} public void setValue(Window node, String[] path, FlipperDynamic value) {}
@Override @Override
public List<Named<String>> getAttributes(Window node) { public List<Named<String>> getAttributes(Window node) {

34
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java
View File

@@ -21,8 +21,8 @@ import android.view.ViewGroup;
import android.view.ViewParent; import android.view.ViewParent;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import android.widget.EditText; import android.widget.EditText;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.InspectorValue;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -511,27 +511,27 @@ public final class AccessibilityUtil {
} }
/** /**
* Creates a {@link SonarObject} of useful properties of AccessibilityNodeInfo, to be shown in the * Creates a {@link FlipperObject} of useful properties of AccessibilityNodeInfo, to be shown in the
* Sonar Layout Inspector accessibility extension. All properties are immutable since they are all derived from * Sonar Layout Inspector accessibility extension. All properties are immutable since they are all derived from
* various {@link View} properties. This is a more complete list than * various {@link View} properties. This is a more complete list than
* getAccessibilityNodeInfoProperties returns. * getAccessibilityNodeInfoProperties returns.
* *
* @param view The {@link View} to derive the AccessibilityNodeInfo properties from. * @param view The {@link View} to derive the AccessibilityNodeInfo properties from.
* @return {@link SonarObject} containing the properties. * @return {@link FlipperObject} containing the properties.
*/ */
@Nullable @Nullable
public static SonarObject getAccessibilityNodeInfoData(View view) { public static FlipperObject getAccessibilityNodeInfoData(View view) {
final AccessibilityNodeInfoCompat nodeInfo = final AccessibilityNodeInfoCompat nodeInfo =
ViewAccessibilityHelper.createNodeInfoFromView(view); ViewAccessibilityHelper.createNodeInfoFromView(view);
if (nodeInfo == null) { if (nodeInfo == null) {
return null; return null;
} }
final SonarObject.Builder nodeInfoProps = new SonarObject.Builder(); final FlipperObject.Builder nodeInfoProps = new FlipperObject.Builder();
final Rect bounds = new Rect(); final Rect bounds = new Rect();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
final SonarArray.Builder actionsArrayBuilder = new SonarArray.Builder(); final FlipperArray.Builder actionsArrayBuilder = new FlipperArray.Builder();
for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action : for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action :
nodeInfo.getActionList()) { nodeInfo.getActionList()) {
final String actionLabel = (String) action.getLabel(); final String actionLabel = (String) action.getLabel();
@@ -571,7 +571,7 @@ public final class AccessibilityUtil {
nodeInfo.getBoundsInParent(bounds); nodeInfo.getBoundsInParent(bounds);
nodeInfoProps.put( nodeInfoProps.put(
"parent-bounds", "parent-bounds",
new SonarObject.Builder() new FlipperObject.Builder()
.put("width", bounds.width()) .put("width", bounds.width())
.put("height", bounds.height()) .put("height", bounds.height())
.put("top", bounds.top) .put("top", bounds.top)
@@ -582,7 +582,7 @@ public final class AccessibilityUtil {
nodeInfo.getBoundsInScreen(bounds); nodeInfo.getBoundsInScreen(bounds);
nodeInfoProps.put( nodeInfoProps.put(
"screen-bounds", "screen-bounds",
new SonarObject.Builder() new FlipperObject.Builder()
.put("width", bounds.width()) .put("width", bounds.width())
.put("height", bounds.height()) .put("height", bounds.height())
.put("top", bounds.top) .put("top", bounds.top)
@@ -608,13 +608,13 @@ public final class AccessibilityUtil {
} }
/** /**
* Modifies a {@link SonarObject.Builder} to add Talkback-specific Accessibiltiy properties to be * Modifies a {@link FlipperObject.Builder} to add Talkback-specific Accessibiltiy properties to be
* shown in the Sonar Layout Inspector. * shown in the Sonar Layout Inspector.
* *
* @param props The {@link SonarObject.Builder} to add the properties to. * @param props The {@link FlipperObject.Builder} to add the properties to.
* @param view The {@link View} to derive the properties from. * @param view The {@link View} to derive the properties from.
*/ */
public static void addTalkbackProperties(SonarObject.Builder props, View view) { public static void addTalkbackProperties(FlipperObject.Builder props, View view) {
if (!AccessibilityEvaluationUtil.isTalkbackFocusable(view)) { if (!AccessibilityEvaluationUtil.isTalkbackFocusable(view)) {
props props
.put("talkback-focusable", false) .put("talkback-focusable", false)
@@ -628,8 +628,8 @@ public final class AccessibilityUtil {
} }
} }
public static SonarObject getViewData(View view) { public static FlipperObject getViewData(View view) {
final SonarObject.Builder props = new SonarObject.Builder(); final FlipperObject.Builder props = new FlipperObject.Builder();
// This needs to be an empty string to be mutable. See t20470623. // This needs to be an empty string to be mutable. See t20470623.
CharSequence contentDescription = CharSequence contentDescription =
@@ -656,10 +656,10 @@ public final class AccessibilityUtil {
return props.build(); return props.build();
} }
public static SonarObject getTalkbackData(View view) { public static FlipperObject getTalkbackData(View view) {
if (!AccessibilityEvaluationUtil.isTalkbackFocusable(view)) { if (!AccessibilityEvaluationUtil.isTalkbackFocusable(view)) {
String reason = getTalkbackIgnoredReasons(view); String reason = getTalkbackIgnoredReasons(view);
return new SonarObject.Builder() return new FlipperObject.Builder()
.put("talkback-focusable", false) .put("talkback-focusable", false)
.put("talkback-ignored-reasons", reason == null ? "" : reason) .put("talkback-ignored-reasons", reason == null ? "" : reason)
.build(); .build();
@@ -667,7 +667,7 @@ public final class AccessibilityUtil {
String reason = getTalkbackFocusableReasons(view); String reason = getTalkbackFocusableReasons(view);
CharSequence description = getTalkbackDescription(view); CharSequence description = getTalkbackDescription(view);
CharSequence hint = getTalkbackHint(view); CharSequence hint = getTalkbackHint(view);
return new SonarObject.Builder() return new FlipperObject.Builder()
.put("talkback-focusable", true) .put("talkback-focusable", true)
.put("talkback-focusable-reasons", reason) .put("talkback-focusable-reasons", reason)
.put("talkback-output", description) .put("talkback-output", description)

22
android/src/main/java/com/facebook/flipper/plugins/leakcanary/LeakCanarySonarPlugin.java
View File

@@ -9,18 +9,18 @@
package com.facebook.flipper.plugins.leakcanary; package com.facebook.flipper.plugins.leakcanary;
import android.util.Log; import android.util.Log;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarPlugin; import com.facebook.flipper.core.FlipperPlugin;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class LeakCanarySonarPlugin implements SonarPlugin { public class LeakCanarySonarPlugin implements FlipperPlugin {
private static final String TAG = "LeakCanarySonarPlugin"; private static final String TAG = "LeakCanarySonarPlugin";
@@ -28,7 +28,7 @@ public class LeakCanarySonarPlugin implements SonarPlugin {
private static final String CLEAR_EVENT = "clear"; private static final String CLEAR_EVENT = "clear";
private static final String LEAKS_KEY = "leaks"; private static final String LEAKS_KEY = "leaks";
private SonarConnection mConnection; private FlipperConnection mConnection;
private final List<String> leakList = new ArrayList<>(); private final List<String> leakList = new ArrayList<>();
@@ -38,15 +38,15 @@ public class LeakCanarySonarPlugin implements SonarPlugin {
} }
@Override @Override
public void onConnect(SonarConnection connection) { public void onConnect(FlipperConnection connection) {
mConnection = connection; mConnection = connection;
sendLeakList(); sendLeakList();
mConnection.receive( mConnection.receive(
CLEAR_EVENT, CLEAR_EVENT,
new SonarReceiver() { new FlipperReceiver() {
@Override @Override
public void onReceive(SonarObject params, SonarResponder responder) throws Exception { public void onReceive(FlipperObject params, FlipperResponder responder) throws Exception {
leakList.clear(); leakList.clear();
} }
}); });
@@ -62,7 +62,7 @@ public class LeakCanarySonarPlugin implements SonarPlugin {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
try { try {
obj.put(LEAKS_KEY, new JSONArray(leakList)); obj.put(LEAKS_KEY, new JSONArray(leakList));
mConnection.send(REPORT_LEAK_EVENT, new SonarObject(obj)); mConnection.send(REPORT_LEAK_EVENT, new FlipperObject(obj));
} catch (JSONException e) { } catch (JSONException e) {
Log.w(TAG, "Failure to serialize leak list: ", e); Log.w(TAG, "Failure to serialize leak list: ", e);
} }

4
android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java
View File

@@ -10,7 +10,7 @@ package com.facebook.flipper.plugins.leakcanary;
import static com.squareup.leakcanary.LeakCanary.leakInfo; import static com.squareup.leakcanary.LeakCanary.leakInfo;
import com.facebook.flipper.android.AndroidSonarClient; import com.facebook.flipper.android.AndroidSonarClient;
import com.facebook.flipper.core.SonarClient; import com.facebook.flipper.core.FlipperClient;
import com.squareup.leakcanary.AbstractAnalysisResultService; import com.squareup.leakcanary.AbstractAnalysisResultService;
import com.squareup.leakcanary.AnalysisResult; import com.squareup.leakcanary.AnalysisResult;
import com.squareup.leakcanary.HeapDump; import com.squareup.leakcanary.HeapDump;
@@ -24,7 +24,7 @@ public class RecordLeakService extends AbstractAnalysisResultService {
@Override @Override
protected void onHeapAnalyzed(HeapDump heapDump, AnalysisResult result) { protected void onHeapAnalyzed(HeapDump heapDump, AnalysisResult result) {
final String leakInfo = leakInfo(this, heapDump, result, true); final String leakInfo = leakInfo(this, heapDump, result, true);
final SonarClient client = AndroidSonarClient.getInstance(this); final FlipperClient client = AndroidSonarClient.getInstance(this);
if (client != null) { if (client != null) {
final LeakCanarySonarPlugin plugin = client.getPlugin("LeakCanary"); final LeakCanarySonarPlugin plugin = client.getPlugin("LeakCanary");

60
android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
View File

@@ -20,8 +20,8 @@ import com.facebook.litho.StateContainer;
import com.facebook.litho.annotations.Prop; import com.facebook.litho.annotations.Prop;
import com.facebook.litho.annotations.State; import com.facebook.litho.annotations.State;
import com.facebook.litho.reference.Reference; import com.facebook.litho.reference.Reference;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.HighlightedOverlay; import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.InspectorValue;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
@@ -45,17 +45,17 @@ import javax.annotation.Nullable;
public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> { public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
private Map<String, List<Pair<String[], SonarDynamic>>> mOverrides = new HashMap<>(); private Map<String, List<Pair<String[], FlipperDynamic>>> mOverrides = new HashMap<>();
private DebugComponent.Overrider mOverrider = private DebugComponent.Overrider mOverrider =
new DebugComponent.Overrider() { new DebugComponent.Overrider() {
@Override @Override
public void applyComponentOverrides(String key, Component component) { public void applyComponentOverrides(String key, Component component) {
final List<Pair<String[], SonarDynamic>> overrides = mOverrides.get(key); final List<Pair<String[], FlipperDynamic>> overrides = mOverrides.get(key);
if (overrides == null) { if (overrides == null) {
return; return;
} }
for (Pair<String[], SonarDynamic> override : overrides) { for (Pair<String[], FlipperDynamic> override : overrides) {
if (override.first[0].equals("Props")) { if (override.first[0].equals("Props")) {
applyReflectiveOverride(component, override.first[1], override.second); applyReflectiveOverride(component, override.first[1], override.second);
} }
@@ -65,12 +65,12 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
@Override @Override
public void applyStateOverrides( public void applyStateOverrides(
String key, StateContainer stateContainer) { String key, StateContainer stateContainer) {
final List<Pair<String[], SonarDynamic>> overrides = mOverrides.get(key); final List<Pair<String[], FlipperDynamic>> overrides = mOverrides.get(key);
if (overrides == null) { if (overrides == null) {
return; return;
} }
for (Pair<String[], SonarDynamic> override : overrides) { for (Pair<String[], FlipperDynamic> override : overrides) {
if (override.first[0].equals("State")) { if (override.first[0].equals("State")) {
applyReflectiveOverride(stateContainer, override.first[1], override.second); applyReflectiveOverride(stateContainer, override.first[1], override.second);
} }
@@ -79,12 +79,12 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
@Override @Override
public void applyLayoutOverrides(String key, DebugLayoutNode node) { public void applyLayoutOverrides(String key, DebugLayoutNode node) {
final List<Pair<String[], SonarDynamic>> overrides = mOverrides.get(key); final List<Pair<String[], FlipperDynamic>> overrides = mOverrides.get(key);
if (overrides == null) { if (overrides == null) {
return; return;
} }
for (Pair<String[], SonarDynamic> override : overrides) { for (Pair<String[], FlipperDynamic> override : overrides) {
if (override.first[0].equals("Layout")) { if (override.first[0].equals("Layout")) {
try { try {
applyLayoutOverride( applyLayoutOverride(
@@ -141,25 +141,25 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
} }
@Override @Override
public List<Named<SonarObject>> getData(DebugComponent node) throws Exception { public List<Named<FlipperObject>> getData(DebugComponent node) throws Exception {
NodeDescriptor componentDescriptor = descriptorForClass(node.getComponent().getClass()); NodeDescriptor componentDescriptor = descriptorForClass(node.getComponent().getClass());
if (componentDescriptor.getClass() != ObjectDescriptor.class) { if (componentDescriptor.getClass() != ObjectDescriptor.class) {
return componentDescriptor.getData(node.getComponent()); return componentDescriptor.getData(node.getComponent());
} }
final List<Named<SonarObject>> data = new ArrayList<>(); final List<Named<FlipperObject>> data = new ArrayList<>();
final SonarObject layoutData = getLayoutData(node); final FlipperObject layoutData = getLayoutData(node);
if (layoutData != null) { if (layoutData != null) {
data.add(new Named<>("Layout", layoutData)); data.add(new Named<>("Layout", layoutData));
} }
final SonarObject propData = getPropData(node); final FlipperObject propData = getPropData(node);
if (propData != null) { if (propData != null) {
data.add(new Named<>("Props", propData)); data.add(new Named<>("Props", propData));
} }
final SonarObject stateData = getStateData(node); final FlipperObject stateData = getStateData(node);
if (stateData != null) { if (stateData != null) {
data.add(new Named<>("State", stateData)); data.add(new Named<>("State", stateData));
} }
@@ -168,13 +168,13 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
} }
@Nullable @Nullable
private static SonarObject getLayoutData(DebugComponent node) { private static FlipperObject getLayoutData(DebugComponent node) {
final DebugLayoutNode layout = node.getLayoutNode(); final DebugLayoutNode layout = node.getLayoutNode();
if (layout == null) { if (layout == null) {
return null; return null;
} }
final SonarObject.Builder data = new SonarObject.Builder(); final FlipperObject.Builder data = new FlipperObject.Builder();
data.put("background", fromReference(node.getContext(), layout.getBackground())); data.put("background", fromReference(node.getContext(), layout.getBackground()));
data.put("foreground", fromDrawable(layout.getForeground())); data.put("foreground", fromDrawable(layout.getForeground()));
@@ -203,7 +203,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
data.put( data.put(
"margin", "margin",
new SonarObject.Builder() new FlipperObject.Builder()
.put("left", fromYogaValue(layout.getMargin(YogaEdge.LEFT))) .put("left", fromYogaValue(layout.getMargin(YogaEdge.LEFT)))
.put("top", fromYogaValue(layout.getMargin(YogaEdge.TOP))) .put("top", fromYogaValue(layout.getMargin(YogaEdge.TOP)))
.put("right", fromYogaValue(layout.getMargin(YogaEdge.RIGHT))) .put("right", fromYogaValue(layout.getMargin(YogaEdge.RIGHT)))
@@ -216,7 +216,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
data.put( data.put(
"padding", "padding",
new SonarObject.Builder() new FlipperObject.Builder()
.put("left", fromYogaValue(layout.getPadding(YogaEdge.LEFT))) .put("left", fromYogaValue(layout.getPadding(YogaEdge.LEFT)))
.put("top", fromYogaValue(layout.getPadding(YogaEdge.TOP))) .put("top", fromYogaValue(layout.getPadding(YogaEdge.TOP)))
.put("right", fromYogaValue(layout.getPadding(YogaEdge.RIGHT))) .put("right", fromYogaValue(layout.getPadding(YogaEdge.RIGHT)))
@@ -229,7 +229,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
data.put( data.put(
"border", "border",
new SonarObject.Builder() new FlipperObject.Builder()
.put("left", fromFloat(layout.getBorderWidth(YogaEdge.LEFT))) .put("left", fromFloat(layout.getBorderWidth(YogaEdge.LEFT)))
.put("top", fromFloat(layout.getBorderWidth(YogaEdge.TOP))) .put("top", fromFloat(layout.getBorderWidth(YogaEdge.TOP)))
.put("right", fromFloat(layout.getBorderWidth(YogaEdge.RIGHT))) .put("right", fromFloat(layout.getBorderWidth(YogaEdge.RIGHT)))
@@ -242,7 +242,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
data.put( data.put(
"position", "position",
new SonarObject.Builder() new FlipperObject.Builder()
.put("left", fromYogaValue(layout.getPosition(YogaEdge.LEFT))) .put("left", fromYogaValue(layout.getPosition(YogaEdge.LEFT)))
.put("top", fromYogaValue(layout.getPosition(YogaEdge.TOP))) .put("top", fromYogaValue(layout.getPosition(YogaEdge.TOP)))
.put("right", fromYogaValue(layout.getPosition(YogaEdge.RIGHT))) .put("right", fromYogaValue(layout.getPosition(YogaEdge.RIGHT)))
@@ -257,13 +257,13 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
} }
@Nullable @Nullable
private static SonarObject getPropData(DebugComponent node) { private static FlipperObject getPropData(DebugComponent node) {
if (node.canResolve()) { if (node.canResolve()) {
return null; return null;
} }
final Component component = node.getComponent(); final Component component = node.getComponent();
final SonarObject.Builder props = new SonarObject.Builder(); final FlipperObject.Builder props = new FlipperObject.Builder();
boolean hasProps = false; boolean hasProps = false;
for (Field f : component.getClass().getDeclaredFields()) { for (Field f : component.getClass().getDeclaredFields()) {
@@ -316,7 +316,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
} }
@Nullable @Nullable
private static SonarObject getStateData(DebugComponent node) { private static FlipperObject getStateData(DebugComponent node) {
if (node.canResolve()) { if (node.canResolve()) {
return null; return null;
} }
@@ -326,7 +326,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
return null; return null;
} }
final SonarObject.Builder state = new SonarObject.Builder(); final FlipperObject.Builder state = new FlipperObject.Builder();
boolean hasState = false; boolean hasState = false;
for (Field f : stateContainer.getClass().getDeclaredFields()) { for (Field f : stateContainer.getClass().getDeclaredFields()) {
@@ -367,8 +367,8 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
} }
@Override @Override
public void setValue(DebugComponent node, String[] path, SonarDynamic value) { public void setValue(DebugComponent node, String[] path, FlipperDynamic value) {
List<Pair<String[], SonarDynamic>> overrides = mOverrides.get(node.getGlobalKey()); List<Pair<String[], FlipperDynamic>> overrides = mOverrides.get(node.getGlobalKey());
if (overrides == null) { if (overrides == null) {
overrides = new ArrayList<>(); overrides = new ArrayList<>();
mOverrides.put(node.getGlobalKey(), overrides); mOverrides.put(node.getGlobalKey(), overrides);
@@ -397,8 +397,8 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
} }
@Override @Override
public SonarObject getExtraInfo(DebugComponent node) { public FlipperObject getExtraInfo(DebugComponent node) {
SonarObject.Builder extraInfo = new SonarObject.Builder(); FlipperObject.Builder extraInfo = new FlipperObject.Builder();
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
final View hostView = node.getComponentHost(); final View hostView = node.getComponentHost();
final View lithoView = node.getLithoView(); final View lithoView = node.getLithoView();
@@ -497,7 +497,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
return descriptor.matches(query, node); return descriptor.matches(query, node);
} }
private static void applyLayoutOverride(DebugLayoutNode node, String[] path, SonarDynamic value) { private static void applyLayoutOverride(DebugLayoutNode node, String[] path, FlipperDynamic value) {
switch (path[0]) { switch (path[0]) {
case "background": case "background":
node.setBackgroundColor(value.asInt()); node.setBackgroundColor(value.asInt());
@@ -575,7 +575,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
return YogaEdge.valueOf(s.toUpperCase()); return YogaEdge.valueOf(s.toUpperCase());
} }
private static void applyReflectiveOverride(Object o, String key, SonarDynamic dynamic) { private static void applyReflectiveOverride(Object o, String key, FlipperDynamic dynamic) {
try { try {
final Field field = o.getClass().getDeclaredField(key); final Field field = o.getClass().getDeclaredField(key);
field.setAccessible(true); field.setAccessible(true);

12
android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java
View File

@@ -5,10 +5,10 @@ package com.facebook.flipper.plugins.litho;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.facebook.litho.LithoView; import com.facebook.litho.LithoView;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
import com.facebook.flipper.plugins.common.MainThreadSonarReceiver; import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
import com.facebook.flipper.plugins.inspector.ApplicationWrapper; import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin; import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin;
@@ -24,10 +24,10 @@ public final class GenerateLithoAccessibilityRenderExtensionCommand implements I
} }
@Override @Override
public SonarReceiver receiver(final ObjectTracker tracker, final SonarConnection connection) { public FlipperReceiver receiver(final ObjectTracker tracker, final FlipperConnection connection) {
return new MainThreadSonarReceiver(connection) { return new MainThreadSonarReceiver(connection) {
@Override @Override
public void onReceiveOnMainThread(final SonarObject params, final SonarResponder responder) public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder)
throws Exception { throws Exception {
final String applicationId = params.getString("applicationId"); final String applicationId = params.getString("applicationId");

20
android/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java
View File

@@ -6,8 +6,8 @@ import android.graphics.Rect;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.facebook.litho.DebugComponent; import com.facebook.litho.DebugComponent;
import com.facebook.litho.LithoView; import com.facebook.litho.LithoView;
import com.facebook.flipper.core.SonarDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
@@ -68,8 +68,8 @@ public class LithoViewDescriptor extends NodeDescriptor<LithoView> {
} }
@Override @Override
public List<Named<SonarObject>> getData(LithoView node) throws Exception { public List<Named<FlipperObject>> getData(LithoView node) throws Exception {
final List<Named<SonarObject>> props = new ArrayList<>(); final List<Named<FlipperObject>> props = new ArrayList<>();
final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class);
final Rect mountedBounds = node.getPreviousMountBounds(); final Rect mountedBounds = node.getPreviousMountBounds();
@@ -77,10 +77,10 @@ public class LithoViewDescriptor extends NodeDescriptor<LithoView> {
0, 0,
new Named<>( new Named<>(
"LithoView", "LithoView",
new SonarObject.Builder() new FlipperObject.Builder()
.put( .put(
"mountbounds", "mountbounds",
new SonarObject.Builder() new FlipperObject.Builder()
.put("left", mountedBounds.left) .put("left", mountedBounds.left)
.put("top", mountedBounds.top) .put("top", mountedBounds.top)
.put("right", mountedBounds.right) .put("right", mountedBounds.right)
@@ -93,15 +93,15 @@ public class LithoViewDescriptor extends NodeDescriptor<LithoView> {
} }
@Override @Override
public List<Named<SonarObject>> getAXData(LithoView node) throws Exception { public List<Named<FlipperObject>> getAXData(LithoView node) throws Exception {
final List<Named<SonarObject>> props = new ArrayList<>(); final List<Named<FlipperObject>> props = new ArrayList<>();
final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class);
props.addAll(descriptor.getAXData(node)); props.addAll(descriptor.getAXData(node));
return props; return props;
} }
@Override @Override
public void setValue(LithoView node, String[] path, SonarDynamic value) throws Exception { public void setValue(LithoView node, String[] path, FlipperDynamic value) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class);
descriptor.setValue(node, path, value); descriptor.setValue(node, path, value);
} }
@@ -119,7 +119,7 @@ public class LithoViewDescriptor extends NodeDescriptor<LithoView> {
} }
@Override @Override
public SonarObject getExtraInfo(LithoView node) { public FlipperObject getExtraInfo(LithoView node) {
final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class);
return descriptor.getExtraInfo(node); return descriptor.getExtraInfo(node);
} }

18
android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java
View File

@@ -10,8 +10,8 @@ package com.facebook.flipper.plugins.network;
import android.util.Base64; import android.util.Base64;
import com.facebook.flipper.core.ErrorReportingRunnable; import com.facebook.flipper.core.ErrorReportingRunnable;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.common.BufferingSonarPlugin; import com.facebook.flipper.plugins.common.BufferingSonarPlugin;
import java.util.List; import java.util.List;
@@ -35,8 +35,8 @@ public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkR
@Override @Override
public void reportRequest(RequestInfo requestInfo) { public void reportRequest(RequestInfo requestInfo) {
final SonarObject request = final FlipperObject request =
new SonarObject.Builder() new FlipperObject.Builder()
.put("id", requestInfo.requestId) .put("id", requestInfo.requestId)
.put("timestamp", requestInfo.timeStamp) .put("timestamp", requestInfo.timeStamp)
.put("method", requestInfo.method) .put("method", requestInfo.method)
@@ -58,8 +58,8 @@ public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkR
responseInfo.body = null; responseInfo.body = null;
} }
final SonarObject response = final FlipperObject response =
new SonarObject.Builder() new FlipperObject.Builder()
.put("id", responseInfo.requestId) .put("id", responseInfo.requestId)
.put("timestamp", responseInfo.timeStamp) .put("timestamp", responseInfo.timeStamp)
.put("status", responseInfo.statusCode) .put("status", responseInfo.statusCode)
@@ -99,11 +99,11 @@ public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkR
return new String(Base64.encode(bytes, Base64.DEFAULT)); return new String(Base64.encode(bytes, Base64.DEFAULT));
} }
private SonarArray toSonarObject(List<Header> headers) { private FlipperArray toSonarObject(List<Header> headers) {
final SonarArray.Builder list = new SonarArray.Builder(); final FlipperArray.Builder list = new FlipperArray.Builder();
for (Header header : headers) { for (Header header : headers) {
list.put(new SonarObject.Builder().put("key", header.name).put("value", header.value)); list.put(new FlipperObject.Builder().put("key", header.name).put("value", header.value));
} }
return list.build(); return list.build();

30
android/src/main/java/com/facebook/flipper/plugins/sandbox/SandboxSonarPlugin.java
View File

@@ -7,15 +7,15 @@
*/ */
package com.facebook.flipper.plugins.sandbox; package com.facebook.flipper.plugins.sandbox;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarPlugin; import com.facebook.flipper.core.FlipperPlugin;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
import java.util.Map; import java.util.Map;
public class SandboxSonarPlugin implements SonarPlugin { public class SandboxSonarPlugin implements FlipperPlugin {
public static final String ID = "Sandbox"; public static final String ID = "Sandbox";
private static final String SET_METHOD_NAME = "setSandbox"; private static final String SET_METHOD_NAME = "setSandbox";
@@ -33,13 +33,13 @@ public class SandboxSonarPlugin implements SonarPlugin {
} }
@Override @Override
public void onConnect(SonarConnection connection) { public void onConnect(FlipperConnection connection) {
connection.receive( connection.receive(
GET_METHOD_NAME, GET_METHOD_NAME,
new SonarReceiver() { new FlipperReceiver() {
@Override @Override
public void onReceive(SonarObject params, final SonarResponder responder) { public void onReceive(FlipperObject params, final FlipperResponder responder) {
final SonarArray.Builder sandboxes = new SonarArray.Builder(); final FlipperArray.Builder sandboxes = new FlipperArray.Builder();
Map<String, String> knownSandboxes = mStrategy.getKnownSandboxes(); Map<String, String> knownSandboxes = mStrategy.getKnownSandboxes();
if (knownSandboxes == null) { if (knownSandboxes == null) {
responder.success(sandboxes.build()); responder.success(sandboxes.build());
@@ -47,7 +47,7 @@ public class SandboxSonarPlugin implements SonarPlugin {
} }
for (String sandboxName : knownSandboxes.keySet()) { for (String sandboxName : knownSandboxes.keySet()) {
sandboxes.put( sandboxes.put(
new SonarObject.Builder() new FlipperObject.Builder()
.put("name", sandboxName) .put("name", sandboxName)
.put("value", knownSandboxes.get(sandboxName))); .put("value", knownSandboxes.get(sandboxName)));
} }
@@ -56,12 +56,12 @@ public class SandboxSonarPlugin implements SonarPlugin {
}); });
connection.receive( connection.receive(
SET_METHOD_NAME, SET_METHOD_NAME,
new SonarReceiver() { new FlipperReceiver() {
@Override @Override
public void onReceive(SonarObject params, SonarResponder responder) throws Exception { public void onReceive(FlipperObject params, FlipperResponder responder) throws Exception {
String sandbox = params.getString("sandbox"); String sandbox = params.getString("sandbox");
mStrategy.setSandbox(sandbox); mStrategy.setSandbox(sandbox);
responder.success(new SonarObject.Builder().put("result", true).build()); responder.success(new FlipperObject.Builder().put("result", true).build());
} }
}); });
} }

30
android/src/main/java/com/facebook/flipper/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java
View File

@@ -12,16 +12,16 @@ import static android.content.Context.MODE_PRIVATE;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarPlugin; import com.facebook.flipper.core.FlipperPlugin;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
import java.util.Map; import java.util.Map;
public class SharedPreferencesSonarPlugin implements SonarPlugin { public class SharedPreferencesSonarPlugin implements FlipperPlugin {
private SonarConnection mConnection; private FlipperConnection mConnection;
private final SharedPreferences mSharedPreferences; private final SharedPreferences mSharedPreferences;
private final SharedPreferences.OnSharedPreferenceChangeListener private final SharedPreferences.OnSharedPreferenceChangeListener
onSharedPreferenceChangeListener = onSharedPreferenceChangeListener =
@@ -33,7 +33,7 @@ public class SharedPreferencesSonarPlugin implements SonarPlugin {
} }
mConnection.send( mConnection.send(
"sharedPreferencesChange", "sharedPreferencesChange",
new SonarObject.Builder() new FlipperObject.Builder()
.put("name", key) .put("name", key)
.put("deleted", !mSharedPreferences.contains(key)) .put("deleted", !mSharedPreferences.contains(key))
.put("time", System.currentTimeMillis()) .put("time", System.currentTimeMillis())
@@ -80,8 +80,8 @@ public class SharedPreferencesSonarPlugin implements SonarPlugin {
return "Preferences"; return "Preferences";
} }
private SonarObject getSharedPreferencesObject() { private FlipperObject getSharedPreferencesObject() {
final SonarObject.Builder builder = new SonarObject.Builder(); final FlipperObject.Builder builder = new FlipperObject.Builder();
final Map<String, ?> map = mSharedPreferences.getAll(); final Map<String, ?> map = mSharedPreferences.getAll();
for (Map.Entry<String, ?> entry : map.entrySet()) { for (Map.Entry<String, ?> entry : map.entrySet()) {
@@ -93,23 +93,23 @@ public class SharedPreferencesSonarPlugin implements SonarPlugin {
} }
@Override @Override
public void onConnect(SonarConnection connection) { public void onConnect(FlipperConnection connection) {
mConnection = connection; mConnection = connection;
connection.receive( connection.receive(
"getSharedPreferences", "getSharedPreferences",
new SonarReceiver() { new FlipperReceiver() {
@Override @Override
public void onReceive(SonarObject params, SonarResponder responder) { public void onReceive(FlipperObject params, FlipperResponder responder) {
responder.success(getSharedPreferencesObject()); responder.success(getSharedPreferencesObject());
} }
}); });
connection.receive( connection.receive(
"setSharedPreference", "setSharedPreference",
new SonarReceiver() { new FlipperReceiver() {
@Override @Override
public void onReceive(SonarObject params, SonarResponder responder) public void onReceive(FlipperObject params, FlipperResponder responder)
throws IllegalArgumentException { throws IllegalArgumentException {
String preferenceName = params.getString("preferenceName"); String preferenceName = params.getString("preferenceName");

18
android/src/main/java/com/facebook/flipper/testing/SonarConnectionMock.java
View File

@@ -7,21 +7,21 @@
*/ */
package com.facebook.flipper.testing; package com.facebook.flipper.testing;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarReceiver; import com.facebook.flipper.core.FlipperReceiver;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class SonarConnectionMock implements SonarConnection { public class SonarConnectionMock implements FlipperConnection {
public final Map<String, SonarReceiver> receivers = new HashMap<>(); public final Map<String, FlipperReceiver> receivers = new HashMap<>();
public final Map<String, List<Object>> sent = new HashMap<>(); public final Map<String, List<Object>> sent = new HashMap<>();
@Override @Override
public void send(String method, SonarObject params) { public void send(String method, FlipperObject params) {
final List<Object> paramList; final List<Object> paramList;
if (sent.containsKey(method)) { if (sent.containsKey(method)) {
paramList = sent.get(method); paramList = sent.get(method);
@@ -34,7 +34,7 @@ public class SonarConnectionMock implements SonarConnection {
} }
@Override @Override
public void send(String method, SonarArray params) { public void send(String method, FlipperArray params) {
final List<Object> paramList; final List<Object> paramList;
if (sent.containsKey(method)) { if (sent.containsKey(method)) {
paramList = sent.get(method); paramList = sent.get(method);
@@ -50,7 +50,7 @@ public class SonarConnectionMock implements SonarConnection {
public void reportError(Throwable throwable) {} public void reportError(Throwable throwable) {}
@Override @Override
public void receive(String method, SonarReceiver receiver) { public void receive(String method, FlipperReceiver receiver) {
receivers.put(method, receiver); receivers.put(method, receiver);
} }
} }

18
android/src/main/java/com/facebook/flipper/testing/SonarResponderMock.java
View File

@@ -7,33 +7,33 @@
*/ */
package com.facebook.flipper.testing; package com.facebook.flipper.testing;
import com.facebook.flipper.core.SonarArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.SonarObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.SonarResponder; import com.facebook.flipper.core.FlipperResponder;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
public class SonarResponderMock implements SonarResponder { public class SonarResponderMock implements FlipperResponder {
public final List<Object> successes = new LinkedList<>(); public final List<Object> successes = new LinkedList<>();
public final List<SonarObject> errors = new LinkedList<>(); public final List<FlipperObject> errors = new LinkedList<>();
@Override @Override
public void success(SonarObject response) { public void success(FlipperObject response) {
successes.add(response); successes.add(response);
} }
@Override @Override
public void success(SonarArray response) { public void success(FlipperArray response) {
successes.add(response); successes.add(response);
} }
@Override @Override
public void success() { public void success() {
successes.add(new SonarObject.Builder().build()); successes.add(new FlipperObject.Builder().build());
} }
@Override @Override
public void error(SonarObject response) { public void error(FlipperObject response) {
errors.add(response); errors.add(response);
} }
} }