kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 12:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor WDM.Callbacks interface

Browse Source
This commit is contained in:
Aditya-Sood 2019-08-12 00:18:03 +05:30
parent c1288e6766
commit f071ad60b7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
View File

@ -188,7 +188,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
} }
@Override @Override
public void clearListOfAvailablePeers() { public void onConnectionToPeersLost() {
availablePeerDevices.clear(); availablePeerDevices.clear();
((WifiPeerListAdapter) listViewPeerDevices.getAdapter()).notifyDataSetChanged(); ((WifiPeerListAdapter) listViewPeerDevices.getAdapter()).notifyDataSetChanged();
} }
@ -231,7 +231,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
} }
@Override @Override
public void onFileTransferComplete(boolean wereAllFilesTransferred) { public void onFileTransferComplete() {
finish(); finish();
} }

14
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java
View File

@ -139,7 +139,7 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
if(!isWifiP2pEnabled) { if(!isWifiP2pEnabled) {
displayToast(R.string.discovery_needs_wifi, Toast.LENGTH_SHORT); displayToast(R.string.discovery_needs_wifi, Toast.LENGTH_SHORT);
callbacks.clearListOfAvailablePeers(); callbacks.onConnectionToPeersLost();
} }
Log.d(TAG, "WiFi P2P state changed - " + isWifiP2pEnabled); Log.d(TAG, "WiFi P2P state changed - " + isWifiP2pEnabled);
@ -166,7 +166,7 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
manager.requestConnectionInfo(channel, this); manager.requestConnectionInfo(channel, this);
} else { } else {
// Not connected after connection change -> Disconnected // Not connected after connection change -> Disconnected
callbacks.clearListOfAvailablePeers(); callbacks.onConnectionToPeersLost();
} }
} }
@ -186,7 +186,7 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
// Upon disconnection, retry one more time // Upon disconnection, retry one more time
if (manager != null && !retryChannel) { if (manager != null && !retryChannel) {
Log.d(TAG, "Channel lost, trying again"); Log.d(TAG, "Channel lost, trying again");
callbacks.clearListOfAvailablePeers(); callbacks.onConnectionToPeersLost();
retryChannel = true; retryChannel = true;
manager.initialize(activity, getMainLooper(), this); manager.initialize(activity, getMainLooper(), this);
} else { } else {
@ -324,7 +324,7 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
if (clientAddress == null) { if (clientAddress == null) {
// null is returned only in case of a failed handshake // null is returned only in case of a failed handshake
displayToast(R.string.device_not_cooperating, Toast.LENGTH_LONG); displayToast(R.string.device_not_cooperating, Toast.LENGTH_LONG);
callbacks.onFileTransferComplete(false); callbacks.onFileTransferComplete();
return; return;
} }
@ -465,13 +465,13 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
} else { } else {
displayToast(R.string.error_during_transfer, Toast.LENGTH_LONG); displayToast(R.string.error_during_transfer, Toast.LENGTH_LONG);
} }
callbacks.onFileTransferComplete(wereAllFilesTransferred); callbacks.onFileTransferComplete();
} }
public interface Callbacks { public interface Callbacks {
void onUserDeviceDetailsAvailable(@Nullable WifiP2pDevice userDevice); void onUserDeviceDetailsAvailable(@Nullable WifiP2pDevice userDevice);
void clearListOfAvailablePeers(); void onConnectionToPeersLost();
void updateListOfAvailablePeers(@NonNull WifiP2pDeviceList peers); void updateListOfAvailablePeers(@NonNull WifiP2pDeviceList peers);
@ -479,6 +479,6 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
void onFileStatusChanged(int itemIndex); void onFileStatusChanged(int itemIndex);
void onFileTransferComplete(boolean wereAllFilesTransferred); void onFileTransferComplete();
} }
} }