Update ignore feature added
Bug fixed
This commit is contained in:
tom5079
@@ -25,14 +25,16 @@ import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.IntentFilter
|
||||
import android.content.pm.PackageManager
|
||||
import android.graphics.drawable.Animatable
|
||||
import android.net.Uri
|
||||
import android.os.Bundle
|
||||
import android.os.Environment
|
||||
import android.text.*
|
||||
import android.text.style.AlignmentSpan
|
||||
import android.view.*
|
||||
import android.view.KeyEvent
|
||||
import android.view.MotionEvent
|
||||
import android.view.View
|
||||
import android.view.WindowManager
|
||||
import android.widget.EditText
|
||||
import android.widget.ImageView
|
||||
import android.widget.LinearLayout
|
||||
@@ -54,7 +56,6 @@ import com.google.android.material.appbar.AppBarLayout
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
import kotlinx.android.synthetic.main.activity_main_content.*
|
||||
import kotlinx.android.synthetic.main.dialog_galleryblock.view.*
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.serialization.ImplicitReflectionSerializer
|
||||
import kotlinx.serialization.json.Json
|
||||
@@ -243,6 +244,12 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
private fun checkUpdate() {
|
||||
|
||||
val preferences = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
val ignoreUpdateUntil = preferences.getLong("ignore_update_until", 0)
|
||||
|
||||
if (ignoreUpdateUntil > System.currentTimeMillis())
|
||||
return
|
||||
|
||||
fun extractReleaseNote(update: JsonObject, locale: String) : String {
|
||||
val markdown = update["body"]!!.content
|
||||
|
||||
@@ -297,6 +304,16 @@ class MainActivity : AppCompatActivity() {
|
||||
val msg = extractReleaseNote(update, Locale.getDefault().language)
|
||||
setMessage(Markwon.create(context).toMarkdown(msg))
|
||||
setPositiveButton(android.R.string.yes) { _, _ ->
|
||||
if (!this@MainActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
|
||||
AlertDialog.Builder(this@MainActivity).apply {
|
||||
setTitle(R.string.warning)
|
||||
setMessage(R.string.update_no_permission)
|
||||
setPositiveButton(android.R.string.ok) { _, _ -> }
|
||||
}.show()
|
||||
|
||||
return@setPositiveButton
|
||||
}
|
||||
|
||||
val request = DownloadManager.Request(Uri.parse(url)).apply {
|
||||
setDescription(getString(R.string.update_notification_description))
|
||||
setTitle(getString(R.string.app_name))
|
||||
@@ -308,17 +325,29 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
registerReceiver(object: BroadcastReceiver() {
|
||||
override fun onReceive(context: Context?, intent: Intent?) {
|
||||
val install = Intent(Intent.ACTION_VIEW).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION
|
||||
setDataAndType(manager.getUriForDownloadedFile(id), manager.getMimeTypeForDownloadedFile(id))
|
||||
}
|
||||
try {
|
||||
val install = Intent(Intent.ACTION_VIEW).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION
|
||||
setDataAndType(manager.getUriForDownloadedFile(id), manager.getMimeTypeForDownloadedFile(id))
|
||||
}
|
||||
|
||||
startActivity(install)
|
||||
unregisterReceiver(this)
|
||||
startActivity(install)
|
||||
unregisterReceiver(this)
|
||||
} catch (e: Exception) {
|
||||
AlertDialog.Builder(this@MainActivity).apply {
|
||||
setTitle(R.string.update_failed)
|
||||
setMessage(R.string.update_failed_message)
|
||||
setPositiveButton(android.R.string.ok) { _, _ -> }
|
||||
}.show()
|
||||
}
|
||||
}
|
||||
}, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
|
||||
}
|
||||
setNegativeButton(android.R.string.no) { _, _ ->}
|
||||
setNegativeButton(R.string.ignore_update) { _, _ ->
|
||||
preferences.edit()
|
||||
.putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
|
||||
.apply()
|
||||
}
|
||||
}
|
||||
|
||||
launch(Dispatchers.Main) {
|
||||
@@ -328,7 +357,7 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun checkPermissions() {
|
||||
if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
|
||||
if (this.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE))
|
||||
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 13489)
|
||||
}
|
||||
|
||||
@@ -507,66 +536,15 @@ class MainActivity : AppCompatActivity() {
|
||||
startActivity(intent)
|
||||
|
||||
histories.add(gallery.id)
|
||||
}.setOnItemLongClickListener { recyclerView, position, v ->
|
||||
}.setOnItemLongClickListener { _, position, v ->
|
||||
|
||||
if (v !is CardView)
|
||||
return@setOnItemLongClickListener true
|
||||
|
||||
val gallery = galleries[position].first
|
||||
val view = LayoutInflater.from(this@MainActivity)
|
||||
.inflate(R.layout.dialog_galleryblock, recyclerView, false)
|
||||
val galleryID = galleries[position].first.id
|
||||
|
||||
val dialog = AlertDialog.Builder(this@MainActivity).apply {
|
||||
setView(view)
|
||||
}.create()
|
||||
|
||||
with(view.main_dialog_download) {
|
||||
text = when(GalleryDownloader.get(gallery.id)) {
|
||||
null -> getString(R.string.reader_fab_download)
|
||||
else -> getString(R.string.reader_fab_download_cancel)
|
||||
}
|
||||
isEnabled = !(adapter as GalleryBlockAdapter).completeFlag.get(gallery.id, false)
|
||||
setOnClickListener {
|
||||
val downloader = GalleryDownloader.get(gallery.id)
|
||||
if (downloader == null)
|
||||
GalleryDownloader(context, gallery.id, true).start()
|
||||
else {
|
||||
downloader.cancel()
|
||||
downloader.clearNotification()
|
||||
}
|
||||
|
||||
dialog.dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
view.main_dialog_delete.setOnClickListener {
|
||||
CoroutineScope(Dispatchers.Default).launch {
|
||||
with(GalleryDownloader[gallery.id]) {
|
||||
this?.cancelAndJoin()
|
||||
this?.clearNotification()
|
||||
}
|
||||
val cache = File(cacheDir, "imageCache/${gallery.id}")
|
||||
val data = getCachedGallery(context, gallery.id)
|
||||
cache.deleteRecursively()
|
||||
data.deleteRecursively()
|
||||
|
||||
downloads.remove(gallery.id)
|
||||
|
||||
if (mode == Mode.DOWNLOAD) {
|
||||
runOnUiThread {
|
||||
cancelFetch()
|
||||
clearGalleries()
|
||||
fetchGalleries(query, sortMode)
|
||||
loadBlocks()
|
||||
}
|
||||
}
|
||||
|
||||
(adapter as GalleryBlockAdapter).completeFlag.put(gallery.id, false)
|
||||
}
|
||||
dialog.dismiss()
|
||||
}
|
||||
|
||||
dialog.show()
|
||||
GalleryDialog(this@MainActivity, galleryID)
|
||||
.show()
|
||||
|
||||
true
|
||||
}
|
||||
@@ -722,6 +700,7 @@ class MainActivity : AppCompatActivity() {
|
||||
val text = next.findViewById<TextView>(R.id.text_next).apply {
|
||||
text = getString(R.string.main_move, currentPage+2)
|
||||
}
|
||||
|
||||
if (absDist < 360) {
|
||||
next.layoutParams.height = (absDist/2).roundToInt()
|
||||
icon.layoutParams.height = (absDist/2).roundToInt()
|
||||
@@ -729,8 +708,7 @@ class MainActivity : AppCompatActivity() {
|
||||
text.layoutParams.width = absDist.roundToInt()
|
||||
|
||||
target = -1
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
next.layoutParams.height = 180
|
||||
icon.layoutParams.height = 180
|
||||
icon.rotation = 0f
|
||||
@@ -905,8 +883,6 @@ class MainActivity : AppCompatActivity() {
|
||||
rotation = 0f
|
||||
isEnabled = true
|
||||
|
||||
setColorFilter(ContextCompat.getColor(context, R.color.material_orange_500))
|
||||
|
||||
isClickable = true
|
||||
setOnClickListener {
|
||||
val favorites = Tags(json.parse(serializer, favoritesFile.readText()))
|
||||
|
||||
Reference in New Issue
Block a user