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 exit from LocalFileTransferActivity

Browse Source 
- Separate device disconnection to separate method
- Override back button
This commit is contained in:
Aditya-Sood 2019-06-27 00:47:14 +05:30
parent c474d02391
commit 99b93659f2
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
View File

@ -367,7 +367,9 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
void connect(WifiP2pDevice peerDevice); void connect(WifiP2pDevice peerDevice);
void disconnect(); //void disconnect();
void closeLocalFileTransferActivity();
} }
public static class EditDeviceNameDialog extends DialogFragment { public static class EditDeviceNameDialog extends DialogFragment {
@ -717,7 +719,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
super.onPostExecute(s); super.onPostExecute(s);
Toast.makeText(context, "File transfer complete", Toast.LENGTH_LONG).show(); Toast.makeText(context, "File transfer complete", Toast.LENGTH_LONG).show();
Log.d(LocalFileTransferActivity.TAG, "File transfer complete"); Log.d(LocalFileTransferActivity.TAG, "File transfer complete");
((LocalFileTransferActivity) deviceListFragment.getActivity()).disconnect(); ((LocalFileTransferActivity) deviceListFragment.getActivity()).closeLocalFileTransferActivity();
/*File recvFile = new File(filePath); /*File recvFile = new File(filePath);
Uri fileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID+".fileprovider",recvFile); Uri fileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID+".fileprovider",recvFile);

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

@ -108,7 +108,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
actionBar.setNavigationOnClickListener(new View.OnClickListener(){ actionBar.setNavigationOnClickListener(new View.OnClickListener(){
@Override @Override
public void onClick(View v) { public void onClick(View v) {
disconnect(); closeLocalFileTransferActivity();
} }
}); });
@ -591,9 +591,13 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
} }
@Override @Override
public void disconnect() { public void closeLocalFileTransferActivity() {
fileSendingDevice = false; fileSendingDevice = false;
disconnect();
this.finish();
}
public void disconnect() {
//TODO //TODO
manager.removeGroup(channel, new WifiP2pManager.ActionListener() { manager.removeGroup(channel, new WifiP2pManager.ActionListener() {
@ -609,8 +613,12 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
} }
}); });
}
this.finish(); @Override
public void onBackPressed() {
super.onBackPressed();
closeLocalFileTransferActivity();
} }
} }
/* /*