From 0cc72f56c4d9b5ebb780efc406752a06f2ec4e39 Mon Sep 17 00:00:00 2001 From: Adeel Zafar Date: Wed, 7 Aug 2019 05:07:43 +0500 Subject: [PATCH] Remove onHostButtonClickedListener --- .../kiwixmobile/webserver/ZimHostActivity.java | 7 +------ .../fileselect_view/ZimFileSelectFragment.kt | 18 ------------------ .../effects/StartMultiSelection.kt | 5 +---- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java index 80b8159ae..ac07c1989 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java @@ -48,7 +48,7 @@ import static org.kiwix.kiwixmobile.webserver.WebServerHelper.stopAndroidWebServ import static org.kiwix.kiwixmobile.wifi_hotspot.HotspotService.checkHotspotState; public class ZimHostActivity extends AppCompatActivity implements - ZimFileSelectFragment.OnHostActionButtonClickedListener, ServerStateListener { + ServerStateListener { Button startServerButton; TextView serverTextView; @@ -235,11 +235,6 @@ public class ZimHostActivity extends AppCompatActivity implements toolbar.setNavigationOnClickListener(v -> onBackPressed()); } - @Override public void onHostActionButtonClicked() { - Log.v("DANG", "Action button clicked"); - Toast.makeText(this, "Host action button has been clicked", Toast.LENGTH_LONG).show(); - } - private void setupLocationServices() { LocationRequest mLocationRequest = new LocationRequest(); mLocationRequest.setInterval(10); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt index fecaa94e3..797317719 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt @@ -22,7 +22,6 @@ package org.kiwix.kiwixmobile.zim_manager.fileselect_view import android.Manifest import android.content.pm.PackageManager import android.os.Bundle -import android.util.Log import android.view.ActionMode import android.view.LayoutInflater import android.view.View @@ -159,22 +158,5 @@ class ZimFileSelectFragment : BaseFragment() { private fun requestFileSystemCheck() { zimManageViewModel.requestFileSystemCheck.onNext(Unit) } - - interface OnHostActionButtonClickedListener { - fun onHostActionButtonClicked() - } - - inner class Test() { - private var listener: OnHostActionButtonClickedListener? = null - - init { - listener = context as? OnHostActionButtonClickedListener - listener?.onHostActionButtonClicked() - if (listener == null) - Log.v("DANG", "Listener is null") - if (context == null) - Log.v("DANG", "Context is null") - } - } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/StartMultiSelection.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/StartMultiSelection.kt index 06315352d..8f31c75e4 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/StartMultiSelection.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/StartMultiSelection.kt @@ -8,8 +8,6 @@ import org.kiwix.kiwixmobile.extensions.startActionMode import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RequestDeleteMultiSelection import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RequestShareMultiSelection -import org.kiwix.kiwixmobile.zim_manager.fileselect_view.ZimFileSelectFragment -import org.kiwix.kiwixmobile.zim_manager.fileselect_view.ZimFileSelectFragment.Test import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BooksOnDiskListItem data class StartMultiSelection( @@ -21,8 +19,7 @@ data class StartMultiSelection( R.menu.menu_zim_files_contextual, mapOf( R.id.zim_file_delete_item to { fileSelectActions.offer(RequestDeleteMultiSelection) }, - R.id.zim_file_share_item to { fileSelectActions.offer(RequestShareMultiSelection) }, - R.id.zim_file_host_item to { ZimFileSelectFragment().Test() } + R.id.zim_file_share_item to { fileSelectActions.offer(RequestShareMultiSelection) } ) ) { fileSelectActions.offer(FileSelectActions.MultiModeFinished) } }