TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-05 09:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up logic

Browse Source 
Fixed randomly found timeunit error
This commit is contained in:
ThomasSession 2024-07-30 13:30:58 +10:00
parent d3990572a0
commit 42733c910d
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View File

@ -250,7 +250,7 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
resubmitProfilePictureIfNeeded(); resubmitProfilePictureIfNeeded();
loadEmojiSearchIndexIfNeeded(); loadEmojiSearchIndexIfNeeded();
EmojiSource.refresh(); EmojiSource.refresh();
versionUtil = new VersionUtil(this, textSecurePreferences); versionUtil = new VersionUtil(textSecurePreferences);
NetworkConstraint networkConstraint = new NetworkConstraint.Factory(this).create(); NetworkConstraint networkConstraint = new NetworkConstraint.Factory(this).create();
HTTP.INSTANCE.setConnectedToNetwork(networkConstraint::isMet); HTTP.INSTANCE.setConnectedToNetwork(networkConstraint::isMet);
@ -278,8 +278,7 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
OpenGroupManager.INSTANCE.startPolling(); OpenGroupManager.INSTANCE.startPolling();
}); });
// try to fetch last version now and start the version polling // fetch last version data
versionUtil.fetchVersionData();
versionUtil.startTimedVersionCheck(); versionUtil.startTimedVersionCheck();
} }

2
app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt
View File

@ -18,7 +18,7 @@ fun showMuteDialog(
private enum class Option(@StringRes val stringRes: Int, val getTime: () -> Long) { private enum class Option(@StringRes val stringRes: Int, val getTime: () -> Long) {
ONE_HOUR(R.string.arrays__mute_for_one_hour, duration = TimeUnit.HOURS.toMillis(1)), ONE_HOUR(R.string.arrays__mute_for_one_hour, duration = TimeUnit.HOURS.toMillis(1)),
TWO_HOURS(R.string.arrays__mute_for_two_hours, duration = TimeUnit.DAYS.toMillis(2)), TWO_HOURS(R.string.arrays__mute_for_two_hours, duration = TimeUnit.HOURS.toMillis(2)),
ONE_DAY(R.string.arrays__mute_for_one_day, duration = TimeUnit.DAYS.toMillis(1)), ONE_DAY(R.string.arrays__mute_for_one_day, duration = TimeUnit.DAYS.toMillis(1)),
SEVEN_DAYS(R.string.arrays__mute_for_seven_days, duration = TimeUnit.DAYS.toMillis(7)), SEVEN_DAYS(R.string.arrays__mute_for_seven_days, duration = TimeUnit.DAYS.toMillis(7)),
FOREVER(R.string.arrays__mute_forever, getTime = { Long.MAX_VALUE }); FOREVER(R.string.arrays__mute_forever, getTime = { Long.MAX_VALUE });

32
app/src/main/java/org/thoughtcrime/securesms/util/VersionUtil.kt
View File

@ -1,20 +1,19 @@
package org.thoughtcrime.securesms.util package org.thoughtcrime.securesms.util
import android.content.Context
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.Log
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.session.libsession.messaging.file_server.FileServerApi import org.session.libsession.messaging.file_server.FileServerApi
import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.TextSecurePreferences
import java.util.concurrent.TimeUnit
class VersionUtil( class VersionUtil(
private val context: Context,
private val prefs: TextSecurePreferences private val prefs: TextSecurePreferences
) { ) {
private val FOUR_HOURS: Long = TimeUnit.HOURS.toMillis(4)
private val handler = Handler(Looper.getMainLooper()) private val handler = Handler(Looper.getMainLooper())
private val runnable: Runnable private val runnable: Runnable
@ -24,12 +23,8 @@ class VersionUtil(
init { init {
runnable = Runnable { runnable = Runnable {
// Task to be executed every 4 hours fetchAndScheduleNextVersionCheck()
fetchVersionData()
} }
// Re-schedule the task
handler.postDelayed(runnable, FOUR_HOURS)
} }
fun startTimedVersionCheck() { fun startTimedVersionCheck() {
@ -45,26 +40,25 @@ class VersionUtil(
stopTimedVersionCheck() stopTimedVersionCheck()
} }
fun fetchVersionData() { private fun fetchAndScheduleNextVersionCheck() {
Log.d("", "***** Trying to fetch version. Last check: ${prefs.getLastVersionCheck()}") fetchVersionData()
// only perform this if at least 4h has elapsed since th last successful check handler.postDelayed(runnable, FOUR_HOURS)
if(prefs.getLastVersionCheck() < FOUR_HOURS) return }
private fun fetchVersionData() {
// only perform this if at least 4h has elapsed since th last successful check
val lastCheck = System.currentTimeMillis() - prefs.getLastVersionCheck()
if(lastCheck < FOUR_HOURS) return
job?.cancel()
job = scope.launch { job = scope.launch {
try { try {
// perform the version check // perform the version check
Log.d("", "***** Fetching last version")
val clientVersion = FileServerApi.getClientVersion() val clientVersion = FileServerApi.getClientVersion()
Log.d("", "***** Got version: $clientVersion")
prefs.setLastVersionCheck() prefs.setLastVersionCheck()
} catch (e: Exception) { } catch (e: Exception) {
// we can silently ignore the error // we can silently ignore the error
Log.e("", "***** Error fetching version", e)
} }
} }
} }
companion object {
private const val FOUR_HOURS = 4 * 60 * 60 * 1000L // 4 hours in milliseconds
}
} }