Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for compilation error with flutter version 3.29 #84

Merged
merged 19 commits into from
Feb 19, 2025
Merged

Fix for compilation error with flutter version 3.29 #84

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
679bae9
Implemented service aware
rahulmaindargi Aug 4, 2024
94fb423
import fix
rahulmaindargi Aug 4, 2024
66be19b
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Dec 28, 2024
5c8cd55
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Dec 28, 2024
c85feab
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Dec 28, 2024
a154404
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Dec 28, 2024
3faa08c
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Dec 28, 2024
6116558
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Dec 29, 2024
497c7d0
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Dec 29, 2024
68d6d54
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Dec 29, 2024
73f6f08
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Jan 5, 2025
ec8c874
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Jan 5, 2025
6711693
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Jan 5, 2025
1254659
fix for FlutterJNI( 7138): Tried to send a platform message to Flutte…
rahulmaindargi Jan 5, 2025
4be0c94
changes for event channel
rahulmaindargi Jan 7, 2025
de5f20d
changes for event channel
rahulmaindargi Jan 8, 2025
d004237
Refactor: Remove Legacy Plugin Registration and Unused Code in Nearby…
rahulmaindargi Feb 19, 2025
4f2818c
Merge remote-tracking branch 'OriginFork/master'
rahulmaindargi Feb 19, 2025
a54f09f
Refactor: Align Dart code within the `Nearby` class
rahulmaindargi Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 8 additions & 35 deletions android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
import io.flutter.plugin.common.MethodChannel.Result;
import io.flutter.plugin.common.PluginRegistry;
import io.flutter.plugin.common.PluginRegistry.Registrar;
import io.flutter.plugin.common.EventChannel;

/**
Expand All @@ -52,7 +50,6 @@ public class NearbyConnectionsPlugin implements MethodCallHandler, FlutterPlugin
private static final String SERVICE_ID = "com.pkmnapps.nearby_connections";
private static MethodChannel channel;
private static EventChannel eventChannel;
private static PluginRegistry.Registrar pluginRegistrar;
private static EventChannel.EventSink eventSink;
private NearbyConnectionsPlugin(Activity activity) {
this.activity = activity;
Expand All @@ -61,28 +58,6 @@ private NearbyConnectionsPlugin(Activity activity) {
public NearbyConnectionsPlugin() {
}

/**
* Legacy Plugin registration.
*/

public static void registerWith(Registrar registrar) {
pluginRegistrar = registrar;
channel = new MethodChannel(registrar.messenger(), "nearby_connections");
channel.setMethodCallHandler(new NearbyConnectionsPlugin(registrar.activity()));
eventChannel=new EventChannel(registrar.messenger(), "nearby_connections/events");
eventChannel.setStreamHandler(
new EventChannel.StreamHandler() {
@Override
public void onListen(Object arguments, EventChannel.EventSink events) {
eventSink=events;
}
@Override
public void onCancel(Object arguments) {
eventSink=null;
}
});
}

@Override
public void onMethodCall(MethodCall call, final Result result) {

Expand Down Expand Up @@ -298,7 +273,7 @@ public void onConnectionInitiated(@NonNull String endpointId, @NonNull Connectio
args.put("endpointName", connectionInfo.getEndpointName());
args.put("authenticationToken", connectionInfo.getAuthenticationToken());
args.put("isIncomingConnection", connectionInfo.isIncomingConnection());
// channel.invokeMethod("ad.onConnectionInitiated", args);

args.put("method", "ad.onConnectionInitiated");
eventSink.success(args);
}
Expand Down Expand Up @@ -326,7 +301,6 @@ public void onConnectionResult(@NonNull String endpointId, @NonNull ConnectionRe
// Unknown status code
}
args.put("statusCode", statusCode);
//channel.invokeMethod("ad.onConnectionResult", args);
args.put("method", "ad.onConnectionResult");
eventSink.success(args);
}
Expand All @@ -336,7 +310,7 @@ public void onDisconnected(@NonNull String endpointId) {
Log.d("nearby_connections", "ad.onDisconnected");
Map<String, Object> args = new HashMap<>();
args.put("endpointId", endpointId);
//channel.invokeMethod("ad.onDisconnected", args);

args.put("method", "ad.onDisconnected");
eventSink.success(args);
}
Expand All @@ -351,7 +325,7 @@ public void onConnectionInitiated(@NonNull String endpointId, @NonNull Connectio
args.put("endpointName", connectionInfo.getEndpointName());
args.put("authenticationToken", connectionInfo.getAuthenticationToken());
args.put("isIncomingConnection", connectionInfo.isIncomingConnection());
//channel.invokeMethod("dis.onConnectionInitiated", args);

args.put("method", "dis.onConnectionInitiated");
eventSink.success(args);
}
Expand Down Expand Up @@ -379,7 +353,7 @@ public void onConnectionResult(@NonNull String endpointId, @NonNull ConnectionRe
// Unknown status code
}
args.put("statusCode", statusCode);
// channel.invokeMethod("dis.onConnectionResult", args);

args.put("method", "dis.onConnectionResult");
eventSink.success(args);
}
Expand All @@ -389,7 +363,7 @@ public void onDisconnected(@NonNull String endpointId) {
Log.d("nearby_connections", "dis.onDisconnected");
Map<String, Object> args = new HashMap<>();
args.put("endpointId", endpointId);
//channel.invokeMethod("dis.onDisconnected", args);

args.put("method","dis.onDisconnected");
eventSink.success(args);
}
Expand All @@ -416,7 +390,7 @@ public void onPayloadReceived(@NonNull String endpointId, @NonNull Payload paylo
}
}

//channel.invokeMethod("onPayloadReceived", args);

args.put("method","onPayloadReceived");
eventSink.success(args);
}
Expand All @@ -434,7 +408,6 @@ public void onPayloadTransferUpdate(@NonNull String endpointId,
args.put("bytesTransferred", payloadTransferUpdate.getBytesTransferred());
args.put("totalBytes", payloadTransferUpdate.getTotalBytes());

//channel.invokeMethod("onPayloadTransferUpdate", args);
args.put("method","onPayloadTransferUpdate");
eventSink.success(args);
}
Expand All @@ -449,7 +422,7 @@ public void onEndpointFound(@NonNull String endpointId,
args.put("endpointId", endpointId);
args.put("endpointName", discoveredEndpointInfo.getEndpointName());
args.put("serviceId", discoveredEndpointInfo.getServiceId());
//channel.invokeMethod("dis.onEndpointFound", args);

args.put("method","dis.onEndpointFound");
eventSink.success(args);
}
Expand All @@ -459,7 +432,7 @@ public void onEndpointLost(@NonNull String endpointId) {
Log.d("nearby_connections", "onEndpointLost");
Map<String, Object> args = new HashMap<>();
args.put("endpointId", endpointId);
//channel.invokeMethod("dis.onEndpointLost", args);

args.put("method","dis.onEndpointLost");
eventSink.success(args);
}
Expand Down