mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-07 22:31:17 -04:00
Changes after review
This commit is contained in:
parent
e4476cb6c7
commit
2ef2fdba15
@ -22,7 +22,6 @@ import android.Manifest
|
|||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.pm.PackageManager
|
|
||||||
import android.content.pm.PackageManager.PERMISSION_GRANTED
|
import android.content.pm.PackageManager.PERMISSION_GRANTED
|
||||||
import android.net.ConnectivityManager
|
import android.net.ConnectivityManager
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
@ -114,12 +113,6 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
|
|||||||
|
|
||||||
private val isNotConnected get() = conMan.activeNetworkInfo?.isConnected == false
|
private val isNotConnected get() = conMan.activeNetworkInfo?.isConnected == false
|
||||||
|
|
||||||
private val isWriteStoragePermissionAllowed
|
|
||||||
get() = ContextCompat.checkSelfPermission(
|
|
||||||
requireActivity(),
|
|
||||||
Manifest.permission.WRITE_EXTERNAL_STORAGE
|
|
||||||
) == PackageManager.PERMISSION_GRANTED
|
|
||||||
|
|
||||||
override fun inject(baseActivity: BaseActivity) {
|
override fun inject(baseActivity: BaseActivity) {
|
||||||
baseActivity.cachedComponent.inject(this)
|
baseActivity.cachedComponent.inject(this)
|
||||||
}
|
}
|
||||||
@ -330,12 +323,16 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
|
|||||||
grantResults.isNotEmpty() &&
|
grantResults.isNotEmpty() &&
|
||||||
grantResults[0] != PERMISSION_GRANTED
|
grantResults[0] != PERMISSION_GRANTED
|
||||||
) {
|
) {
|
||||||
|
context.toast(R.string.request_storage)
|
||||||
requestExternalStoragePermission()
|
requestExternalStoragePermission()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun hasPermission(permission: String): Boolean =
|
||||||
|
ContextCompat.checkSelfPermission(requireActivity(), permission) == PERMISSION_GRANTED
|
||||||
|
|
||||||
private fun onBookItemClick(item: LibraryListItem.BookItem) {
|
private fun onBookItemClick(item: LibraryListItem.BookItem) {
|
||||||
if (isWriteStoragePermissionAllowed) {
|
if (hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
|
||||||
when {
|
when {
|
||||||
isNotConnected -> {
|
isNotConnected -> {
|
||||||
noInternetSnackbar()
|
noInternetSnackbar()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user