Commit c4429633 authored by Max Lv's avatar Max Lv

unblock the service callback

parent 110a4eb0
...@@ -7,8 +7,8 @@ interface IShadowsocksService { ...@@ -7,8 +7,8 @@ interface IShadowsocksService {
int getMode(); int getMode();
int getState(); int getState();
void registerCallback(IShadowsocksServiceCallback cb); oneway void registerCallback(IShadowsocksServiceCallback cb);
void unregisterCallback(IShadowsocksServiceCallback cb); oneway void unregisterCallback(IShadowsocksServiceCallback cb);
oneway void start(in Config config); oneway void start(in Config config);
oneway void stop(); oneway void stop();
......
package com.github.shadowsocks.aidl; package com.github.shadowsocks.aidl;
interface IShadowsocksServiceCallback { interface IShadowsocksServiceCallback {
void stateChanged(int state, String msg); oneway void stateChanged(int state, String msg);
} }
\ No newline at end of file
...@@ -106,9 +106,8 @@ trait BaseService { ...@@ -106,9 +106,8 @@ trait BaseService {
override def run() { override def run() {
if (state != s) { if (state != s) {
val n = callbacks.beginBroadcast() val n = callbacks.beginBroadcast()
val m = if (msg != null) msg.substring(0, 64) else null
for (i <- 0 to n - 1) { for (i <- 0 to n - 1) {
callbacks.getBroadcastItem(i).stateChanged(s, m) callbacks.getBroadcastItem(i).stateChanged(s, msg)
} }
callbacks.finishBroadcast() callbacks.finishBroadcast()
state = s state = s
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment