From 58c936b4fec2f7589cac2249f324c1d74146667a Mon Sep 17 00:00:00 2001
From: Aditya-Sood <sood.aditya.08@gmail.com>
Date: Wed, 31 Jul 2019 09:11:40 +0530
Subject: [PATCH] Refactor

---
 app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt | 1 -
 .../org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt   | 5 +----
 .../local_file_transfer/LocalFileTransferActivity.java       | 1 -
 .../local_file_transfer/PeerGroupHandshakeAsyncTask.java     | 2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt
index 689fc25b3..4eeaa78b0 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt
@@ -1,6 +1,5 @@
 package org.kiwix.kiwixmobile.utils
 
-import android.net.wifi.p2p.WifiP2pDevice
 import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
 
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt
index c572919ac..cab2542de 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt
@@ -129,10 +129,7 @@ class ZimManageActivity : BaseActivity() {
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     when (item.itemId) {
       R.id.select_language -> start<LanguageActivity>()
-      
-      R.id.get_zim_nearby_device -> {
-        startActivity(Intent(this, LocalFileTransferActivity::class.java));
-      }
+      R.id.get_zim_nearby_device -> start<LocalFileTransferActivity>()
     }
     return super.onOptionsItemSelected(item)
   }
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 89c02e48f..6f69585f4 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
@@ -573,7 +573,6 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
 
   @Override
   public void onBackPressed() {
-    super.onBackPressed();
     wifiDirectManager.closeLocalFileTransferActivity();
   }
 }
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java
index 1e975b994..87e8c3673 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java
@@ -100,7 +100,7 @@ class PeerGroupHandshakeAsyncTask extends AsyncTask<Void, Void, InetAddress> {
   }
 
   private boolean isKiwixHandshake(Object object) {
-    return (object.getClass().equals(String.class) && object.equals(HANDSHAKE_MESSAGE));
+    return HANDSHAKE_MESSAGE.equals(object);
   }
 
   private void exchangeFileTransferMetadata(OutputStream outputStream, InputStream inputStream) {