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

Refactor logic for using WDM.sendToDevice()

Browse Source
This commit is contained in:
Aditya-Sood 2019-08-11 15:05:48 +05:30
parent 227b5228f8
commit 0f97a2e8e5
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,6 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
private FileListAdapter fileListAdapter; private FileListAdapter fileListAdapter;
private List<WifiP2pDevice> availablePeerDevices = new ArrayList<WifiP2pDevice>(); private List<WifiP2pDevice> availablePeerDevices = new ArrayList<WifiP2pDevice>();
private boolean hasSenderStartedConnection = false;
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
@ -141,11 +140,6 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
@OnItemClick(R.id.list_peer_devices) @OnItemClick(R.id.list_peer_devices)
void onItemClick(int position) { void onItemClick(int position) {
/* Connection can only be initiated by user of the sender device, & only when transfer has not been started */
if (!isFileSender || hasSenderStartedConnection) {
return;
}
WifiP2pDevice senderSelectedPeerDevice = WifiP2pDevice senderSelectedPeerDevice =
(WifiP2pDevice) listViewPeerDevices.getAdapter().getItem(position); (WifiP2pDevice) listViewPeerDevices.getAdapter().getItem(position);
wifiDirectManager.sendToDevice(senderSelectedPeerDevice); wifiDirectManager.sendToDevice(senderSelectedPeerDevice);
@ -222,11 +216,6 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
textViewPeerDevices.setVisibility(View.INVISIBLE); textViewPeerDevices.setVisibility(View.INVISIBLE);
} }
@Override
public void onSenderStartedConnection() {
this.hasSenderStartedConnection = true;
}
@Override @Override
public void onFileStatusChanged(int itemIndex) { public void onFileStatusChanged(int itemIndex) {
fileListAdapter.notifyItemChanged(itemIndex); fileListAdapter.notifyItemChanged(itemIndex);

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

@ -75,6 +75,7 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
private ArrayList<Uri> fileUriArrayList; // For sender device, stores uris of the files private ArrayList<Uri> fileUriArrayList; // For sender device, stores uris of the files
private boolean isFileSender = false; // Whether the device is the file sender or not private boolean isFileSender = false; // Whether the device is the file sender or not
private boolean hasSenderStartedConnection = false;
public WifiDirectManager(@NonNull LocalFileTransferActivity activity) { public WifiDirectManager(@NonNull LocalFileTransferActivity activity) {
this.activity = activity; this.activity = activity;
@ -219,13 +220,18 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
} }
public void sendToDevice(@NonNull WifiP2pDevice senderSelectedPeerDevice) { public void sendToDevice(@NonNull WifiP2pDevice senderSelectedPeerDevice) {
/* Connection can only be initiated by user of the sender device, & only when transfer has not been started */
if (!isFileSender || hasSenderStartedConnection) {
return;
}
this.senderSelectedPeerDevice = senderSelectedPeerDevice; this.senderSelectedPeerDevice = senderSelectedPeerDevice;
alertDialogShower.show( alertDialogShower.show(
new KiwixDialog.FileTransferConfirmation(senderSelectedPeerDevice.deviceName), new KiwixDialog.FileTransferConfirmation(senderSelectedPeerDevice.deviceName),
new Function0<Unit>() { new Function0<Unit>() {
@Override public Unit invoke() { @Override public Unit invoke() {
((Callbacks) activity).onSenderStartedConnection(); hasSenderStartedConnection = true;
connect(); connect();
displayToast(R.string.performing_handshake, Toast.LENGTH_LONG); displayToast(R.string.performing_handshake, Toast.LENGTH_LONG);
return Unit.INSTANCE; return Unit.INSTANCE;
@ -466,8 +472,6 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
void updateListOfAvailablePeers(@NonNull WifiP2pDeviceList peers); void updateListOfAvailablePeers(@NonNull WifiP2pDeviceList peers);
void onSenderStartedConnection();
void onFilesForTransferAvailable(@NonNull ArrayList<FileItem> filesForTransfer); void onFilesForTransferAvailable(@NonNull ArrayList<FileItem> filesForTransfer);
void onFileStatusChanged(int itemIndex); void onFileStatusChanged(int itemIndex);