From 99b93659f25f7c6a702dddd77cb113a2f1e33877 Mon Sep 17 00:00:00 2001
From: Aditya-Sood <sood.aditya.08@gmail.com>
Date: Thu, 27 Jun 2019 00:47:14 +0530
Subject: [PATCH] Refactor exit from LocalFileTransferActivity

- Separate device disconnection to separate method
- Override back button
---
 .../local_file_transfer/DeviceListFragment.java    |  6 ++++--
 .../LocalFileTransferActivity.java                 | 14 +++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
index 698baa940..c35c1ebfc 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
@@ -367,7 +367,9 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
 
     void connect(WifiP2pDevice peerDevice);
 
-    void disconnect();
+    //void disconnect();
+
+    void closeLocalFileTransferActivity();
   }
 
   public static class EditDeviceNameDialog extends DialogFragment {
@@ -717,7 +719,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
       super.onPostExecute(s);
       Toast.makeText(context, "File transfer complete", Toast.LENGTH_LONG).show();
       Log.d(LocalFileTransferActivity.TAG, "File transfer complete");
-      ((LocalFileTransferActivity) deviceListFragment.getActivity()).disconnect();
+      ((LocalFileTransferActivity) deviceListFragment.getActivity()).closeLocalFileTransferActivity();
 
       /*File recvFile = new File(filePath);
       Uri fileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID+".fileprovider",recvFile);
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
index c2a46b836..766e92c13 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
@@ -108,7 +108,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
     actionBar.setNavigationOnClickListener(new View.OnClickListener(){
       @Override
       public void onClick(View v) {
-        disconnect();
+        closeLocalFileTransferActivity();
       }
     });
 
@@ -591,9 +591,13 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
   }
 
   @Override
-  public void disconnect() {
+  public void closeLocalFileTransferActivity() {
     fileSendingDevice = false;
+    disconnect();
+    this.finish();
+  }
 
+  public void disconnect() {
     //TODO
     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();
   }
 }
 /*