From 364f9314f2c448f976e1bddb10b14fa077a554e6 Mon Sep 17 00:00:00 2001 From: ritvik Date: Sat, 22 Aug 2020 12:47:17 +0530 Subject: [PATCH] conflits --- .../kiwixmobile/localFileTransfer/WifiDirectManager.kt | 1 + .../org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/WifiDirectManager.kt b/app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/WifiDirectManager.kt index 0f020420c..d576a57e1 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/WifiDirectManager.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/WifiDirectManager.kt @@ -98,6 +98,7 @@ class WifiDirectManager @Inject constructor( // Whether the device is the file sender or not var isFileSender = false private set + private var hasSenderStartedConnection = false /* Initialisations for using the WiFi P2P API */ 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 e2044fc3c..ff543d282 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 @@ -98,9 +98,9 @@ class ZimManageActivity : BaseActivity() { private fun setUpToolbar() { val toolbar = findViewById(R.id.toolbar) setSupportActionBar(toolbar) - supportActionBar!!.setHomeButtonEnabled(true) - supportActionBar!!.setDisplayHomeAsUpEnabled(true) - supportActionBar!!.setTitle(R.string.library) + supportActionBar?.setHomeButtonEnabled(true) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + supportActionBar?.setTitle(R.string.library) toolbar.setNavigationOnClickListener { onBackPressed() } toolbar.setOnClickListener { if (manageViewPager.currentItem == 1)