From ca8266dddacbdb60cfae5d5188b435347eebb0d7 Mon Sep 17 00:00:00 2001 From: Frans-Lukas Date: Mon, 10 Aug 2020 14:33:01 +0200 Subject: [PATCH] #2112 removed unused side effect --- .../zim_manager/ZimManageViewModel.kt | 4 -- .../fileselect_view/effects/OpenFile.kt | 45 ------------------- .../zim_manager/ZimManageViewModelTest.kt | 1 - 3 files changed, 50 deletions(-) delete mode 100644 app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/OpenFile.kt diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt index 16da47ec2..230a40d33 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt @@ -55,7 +55,6 @@ import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.Mu import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RequestDeleteMultiSelection import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RequestMultiSelection import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RequestNavigateTo -import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RequestOpen import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RequestSelect import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RequestShareMultiSelection import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.RestartActionMode @@ -64,7 +63,6 @@ import org.kiwix.kiwixmobile.zim_manager.fileselect_view.FileSelectListState import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.DeleteFiles import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.NavigateToDownloads import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.None -import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.OpenFile import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.OpenFileWithNavigation import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.ShareFiles import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.StartMultiSelection @@ -92,7 +90,6 @@ class ZimManageViewModel @Inject constructor( private val dataSource: DataSource ) : ViewModel() { sealed class FileSelectActions { - data class RequestOpen(val bookOnDisk: BookOnDisk) : FileSelectActions() data class RequestNavigateTo(val bookOnDisk: BookOnDisk) : FileSelectActions() data class RequestSelect(val bookOnDisk: BookOnDisk) : FileSelectActions() data class RequestMultiSelection(val bookOnDisk: BookOnDisk) : FileSelectActions() @@ -153,7 +150,6 @@ class ZimManageViewModel @Inject constructor( sideEffects.offer( when (it) { is RequestNavigateTo -> OpenFileWithNavigation(it.bookOnDisk) - is RequestOpen -> OpenFile(it.bookOnDisk) is RequestMultiSelection -> startMultiSelectionAndSelectBook(it.bookOnDisk) RequestDeleteMultiSelection -> DeleteFiles(selectionsFromState()) RequestShareMultiSelection -> ShareFiles(selectionsFromState()) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/OpenFile.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/OpenFile.kt deleted file mode 100644 index 50eb4da72..000000000 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/OpenFile.kt +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Kiwix Android - * Copyright (c) 2019 Kiwix - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ -package org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects - -import android.content.Intent -import androidx.appcompat.app.AppCompatActivity -import androidx.core.net.toUri -import org.kiwix.kiwixmobile.core.R -import org.kiwix.kiwixmobile.core.base.SideEffect -import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.start -import org.kiwix.kiwixmobile.core.extensions.toast -import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk -import org.kiwix.kiwixmobile.main.KiwixMainActivity - -data class OpenFile(private val bookOnDisk: BookOnDisk) : - SideEffect { - - override fun invokeWith(activity: AppCompatActivity) { - val file = bookOnDisk.file - if (!file.canRead()) { - activity.toast(R.string.error_file_not_found) - } else { - activity.finish() - activity.start { - data = file.toUri() - flags = Intent.FLAG_ACTIVITY_CLEAR_TOP - } - } - } -} diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt index 533784bf3..52866145d 100644 --- a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt +++ b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt @@ -63,7 +63,6 @@ import org.kiwix.kiwixmobile.zim_manager.ZimManageViewModel.FileSelectActions.Re import org.kiwix.kiwixmobile.zim_manager.fileselect_view.FileSelectListState import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.DeleteFiles import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.None -import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.OpenFile import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.ShareFiles import org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects.StartMultiSelection import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.LibraryListItem