Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82f829de authored by Charlie Boutier's avatar Charlie Boutier Committed by Gerrit Code Review
Browse files

Merge "Rfcomm.proto: Rename ServerOptions" into main

parents 2bfd91e3 0eeccc60

android/pandora/server/src/Rfcomm.kt

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class Rfcomm(val context: Context) : RFCOMMImplBase(), Closeable { 
    }



    override fun startServer(

        request: ServerOptions,

        request: StartServerRequest,

        responseObserver: StreamObserver<StartServerResponse>,

    ) {

        grpcUnary(scope, responseObserver) {

floss/pandora/server/rfcomm.py

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ class RFCOMMService(rfcomm_grpc_aio.RFCOMMServicer): 


        return empty_pb2.Empty()



    async def StartServer(self, request: rfcomm_pb2.ServerOptions,

    async def StartServer(self, request: rfcomm_pb2.StartServerRequest,

                          context: grpc.ServicerContext) -> rfcomm_pb2.StartServerResponse:



        class StartServerObserver(socket_manager.SocketManagerCallbacks):

pandora/interfaces/pandora_experimental/rfcomm.proto

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ package pandora; 
// Service to trigger RFCOMM procedures.

service RFCOMM {

  rpc ConnectToServer(ConnectionRequest) returns (ConnectionResponse);

  rpc StartServer(ServerOptions) returns (StartServerResponse);

  rpc StartServer(StartServerRequest) returns (StartServerResponse);

  rpc AcceptConnection(AcceptConnectionRequest) returns (AcceptConnectionResponse);

  rpc Disconnect(DisconnectionRequest) returns (DisconnectionResponse);

  rpc StopServer(StopServerRequest) returns (StopServerResponse);
@@ -28,7 +28,7 @@ message ConnectionResponse { 
  RfcommConnection connection = 1;

}



message ServerOptions {

message StartServerRequest {

  string name = 1;

  string uuid = 2;

}