Skip to content

Commit a060f4b

Browse files
committed
list changes
1 parent 87e643a commit a060f4b

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

p2psdk/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish {
66
repoName = 'android'
77
groupId = 'com.aslam'
88
artifactId = 'p2p'
9-
publishVersion = '1.2.3'
9+
publishVersion = '1.2.4'
1010
desc = 'P2P library provides instant integration (PnP) support for WIFI-Direct P2P for any Android projects plus it remembers the recently connected device and reconnects it automatically when it is available.'
1111
website = 'https://github.com/aslamanver/p2p'
1212
}
@@ -18,8 +18,8 @@ android {
1818
defaultConfig {
1919
minSdkVersion 15
2020
targetSdkVersion 28
21-
versionCode 123
22-
versionName "1.2.3"
21+
versionCode 124
22+
versionName "1.2.4"
2323
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2424
consumerProguardFiles "consumer-rules.pro"
2525
}

p2psdk/src/main/java/com/aslam/p2p/services/P2PService.java

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import android.net.wifi.p2p.WifiP2pDevice;
55
import android.net.wifi.p2p.WifiP2pInfo;
66

7+
import androidx.annotation.CallSuper;
8+
79
import com.aslam.p2p.R;
810

911
import java.util.ArrayList;
@@ -15,13 +17,15 @@ public class P2PService extends BaseForegroundService implements P2PControllerLi
1517
private final List<P2PControllerListener> controllerListeners = new ArrayList<>();
1618

1719
@Override
20+
@CallSuper
1821
public void onCreate() {
1922
super.onCreate();
2023
p2pController = new P2PController(this, this);
2124
p2pController.registerConnection();
2225
}
2326

2427
@Override
28+
@CallSuper
2529
public void onDestroy() {
2630
super.onDestroy();
2731
p2pController.destroy();
@@ -34,15 +38,15 @@ protected ServiceBuilder serviceBuilder() {
3438
return serviceBuilder.build(notification);
3539
}
3640

37-
public P2PController getP2PController() {
41+
public final P2PController getP2PController() {
3842
return p2pController;
3943
}
4044

41-
public void addListener(P2PControllerListener controllerListener) {
45+
public final void addListener(P2PControllerListener controllerListener) {
4246
controllerListeners.add(controllerListener);
4347
}
4448

45-
public void removeListener(P2PControllerListener controllerListener) {
49+
public final void removeListener(P2PControllerListener controllerListener) {
4650
if (controllerListener == null) {
4751
controllerListeners.clear();
4852
} else {
@@ -51,104 +55,119 @@ public void removeListener(P2PControllerListener controllerListener) {
5155
}
5256

5357
@Override
58+
@CallSuper
5459
public void onDiscoverChanged(int state) {
5560
for (P2PControllerListener controllerListener : controllerListeners) {
5661
controllerListener.onDiscoverChanged(state);
5762
}
5863
}
5964

6065
@Override
66+
@CallSuper
6167
public void onP2PStateChanged(int state) {
6268
for (P2PControllerListener controllerListener : controllerListeners) {
6369
controllerListener.onP2PStateChanged(state);
6470
}
6571
}
6672

6773
@Override
74+
@CallSuper
6875
public void onDeviceChanged(WifiP2pDevice device) {
6976
for (P2PControllerListener controllerListener : controllerListeners) {
7077
controllerListener.onDeviceChanged(device);
7178
}
7279
}
7380

7481
@Override
82+
@CallSuper
7583
public void onConnectionInfoAvailable(WifiP2pInfo info) {
7684
for (P2PControllerListener controllerListener : controllerListeners) {
7785
controllerListener.onConnectionInfoAvailable(info);
7886
}
7987
}
8088

8189
@Override
90+
@CallSuper
8291
public void onDeviceNameChanged(int state) {
8392
for (P2PControllerListener controllerListener : controllerListeners) {
8493
controllerListener.onDeviceNameChanged(state);
8594
}
8695
}
8796

8897
@Override
98+
@CallSuper
8999
public void onGroupCreated(int state) {
90100
for (P2PControllerListener controllerListener : controllerListeners) {
91101
controllerListener.onGroupCreated(state);
92102
}
93103
}
94104

95105
@Override
106+
@CallSuper
96107
public void onGroupRemoved(int state) {
97108
for (P2PControllerListener controllerListener : controllerListeners) {
98109
controllerListener.onGroupRemoved(state);
99110
}
100111
}
101112

102113
@Override
114+
@CallSuper
103115
public void onDeviceConnected(WifiP2pDevice device) {
104116
for (P2PControllerListener controllerListener : controllerListeners) {
105117
controllerListener.onDeviceConnected(device);
106118
}
107119
}
108120

109121
@Override
122+
@CallSuper
110123
public void onDeviceNotConnected(int reason) {
111124
for (P2PControllerListener controllerListener : controllerListeners) {
112125
controllerListener.onDeviceNotConnected(reason);
113126
}
114127
}
115128

116129
@Override
130+
@CallSuper
117131
public void onDeviceDisconnected(WifiP2pDevice device) {
118132
for (P2PControllerListener controllerListener : controllerListeners) {
119133
controllerListener.onDeviceDisconnected(device);
120134
}
121135
}
122136

123137
@Override
138+
@CallSuper
124139
public void onDeviceNotDisconnected(int reason) {
125140
for (P2PControllerListener controllerListener : controllerListeners) {
126141
controllerListener.onDeviceNotDisconnected(reason);
127142
}
128143
}
129144

130145
@Override
146+
@CallSuper
131147
public void onSocketServerStarted() {
132148
for (P2PControllerListener controllerListener : controllerListeners) {
133149
controllerListener.onSocketServerStarted();
134150
}
135151
}
136152

137153
@Override
154+
@CallSuper
138155
public void onSocketServerNewConnection(String host) {
139156
for (P2PControllerListener controllerListener : controllerListeners) {
140157
controllerListener.onSocketServerNewConnection(host);
141158
}
142159
}
143160

144161
@Override
162+
@CallSuper
145163
public void onSocketServerConnectionClosed(String host, int code, String reason, boolean remote) {
146164
for (P2PControllerListener controllerListener : controllerListeners) {
147165
controllerListener.onSocketServerConnectionClosed(host, code, reason, remote);
148166
}
149167
}
150168

151169
@Override
170+
@CallSuper
152171
public void onSocketServerMessage(String host, String message) {
153172
for (P2PControllerListener controllerListener : controllerListeners) {
154173
controllerListener.onSocketServerMessage(host, message);
@@ -158,34 +177,39 @@ public void onSocketServerMessage(String host, String message) {
158177
//
159178

160179
@Override
180+
@CallSuper
161181
public void onPeersChanged(List<WifiP2pDevice> peers) {
162182
for (P2PControllerListener controllerListener : controllerListeners) {
163183
controllerListener.onPeersChanged(peers);
164184
}
165185
}
166186

167187
@Override
188+
@CallSuper
168189
public void onSocketClientOpened(String host) {
169190
for (P2PControllerListener controllerListener : controllerListeners) {
170191
controllerListener.onSocketClientOpened(host);
171192
}
172193
}
173194

174195
@Override
196+
@CallSuper
175197
public void onSocketClientClosed(String host, int code, String reason, boolean remote) {
176198
for (P2PControllerListener controllerListener : controllerListeners) {
177199
controllerListener.onSocketClientClosed(host, code, reason, remote);
178200
}
179201
}
180202

181203
@Override
204+
@CallSuper
182205
public void onSocketClientMessage(String host, String message) {
183206
for (P2PControllerListener controllerListener : controllerListeners) {
184207
controllerListener.onSocketClientMessage(host, message);
185208
}
186209
}
187210

188211
@Override
212+
@CallSuper
189213
public void onConsoleLog(String message) {
190214
for (P2PControllerListener controllerListener : controllerListeners) {
191215
controllerListener.onConsoleLog(message);

0 commit comments

Comments
 (0)