Mastodon/nextpush-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move companions to the end of the classes

Browse Source
This commit is contained in:
sim 2023-02-25 13:40:00 +01:00
parent 2e6672db4f
commit c9d4e2fd13
4 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/unifiedpush/distributor/nextpush/api/SSEListener.kt
View File

@ -19,11 +19,6 @@ import java.util.Calendar
class SSEListener(val context: Context) : EventSourceListener() {
companion object {
var lastEventDate: Calendar? = null
var keepalive = 900
}
override fun onOpen(eventSource: EventSource, response: Response) {
FailureHandler.newEventSource(context, eventSource)
StartService.wakeLock?.let {
@ -101,4 +96,10 @@ class SSEListener(val context: Context) : EventSourceListener() {
Log.d(TAG, "Retrying in $delay s")
RestartWorker.start(context, delay = delay)
}
companion object {
var lastEventDate: Calendar? = null
var keepalive = 900
private set
}
}

9
app/src/main/java/org/unifiedpush/distributor/nextpush/receivers/RegisterBroadcastReceiver.kt
View File

@ -30,10 +30,7 @@ private val delQueue = emptyList<String>().toMutableList()
class RegisterBroadcastReceiver : BroadcastReceiver() {
companion object {
private const val WAKE_LOCK_TAG = "NextPush:RegisterBroadcastReceiver:lock"
private var wakeLock: PowerManager.WakeLock? = null
}
private val WAKE_LOCK_TAG = "NextPush:RegisterBroadcastReceiver:lock"
override fun onReceive(context: Context, intent: Intent?) {
wakeLock = (context.getSystemService(Context.POWER_SERVICE) as PowerManager).run {
@ -118,4 +115,8 @@ class RegisterBroadcastReceiver : BroadcastReceiver() {
list.remove(token)
}
}
companion object {
private var wakeLock: PowerManager.WakeLock? = null
}
}

32
app/src/main/java/org/unifiedpush/distributor/nextpush/services/RestartWorker.kt
View File

@ -13,22 +13,6 @@ private const val UNIQUE_WORK_TAG = "nextpush::RestartWorker::unique"
class RestartWorker(ctx: Context, params: WorkerParameters) : Worker(ctx, params) {
companion object {
fun start(context: Context, delay: Long? = null) {
val work = PeriodicWorkRequestBuilder<RestartWorker>(16, TimeUnit.MINUTES)
if (delay != null) {
lastEventDate = null
work.setInitialDelay(delay, TimeUnit.SECONDS)
}
val workManager = WorkManager.getInstance(context)
workManager.enqueueUniquePeriodicWork(
UNIQUE_WORK_TAG,
ExistingPeriodicWorkPolicy.REPLACE,
work.build()
)
}
}
override fun doWork(): Result {
Log.d(TAG, "Working")
val currentDate = Calendar.getInstance()
@ -48,4 +32,20 @@ class RestartWorker(ctx: Context, params: WorkerParameters) : Worker(ctx, params
}
return Result.success()
}
companion object {
fun start(context: Context, delay: Long? = null) {
val work = PeriodicWorkRequestBuilder<RestartWorker>(16, TimeUnit.MINUTES)
if (delay != null) {
lastEventDate = null
work.setInitialDelay(delay, TimeUnit.SECONDS)
}
val workManager = WorkManager.getInstance(context)
workManager.enqueueUniquePeriodicWork(
UNIQUE_WORK_TAG,
ExistingPeriodicWorkPolicy.REPLACE,
work.build()
)
}
}
}

60
app/src/main/java/org/unifiedpush/distributor/nextpush/services/StartService.kt
View File

@ -20,36 +20,6 @@ import org.unifiedpush.distributor.nextpush.utils.TAG
class StartService : Service() {
companion object StartServiceCompanion {
private const val WAKE_LOCK_TAG = "NextPush:StartService:lock"
private var service: StartService? = null
var isServiceStarted = false
private set
var wakeLock: PowerManager.WakeLock? = null
private set
fun startListener(context: Context) {
if (isServiceStarted && !FailureHandler.hasFailed()) return
Log.d(TAG, "Starting the Listener")
Log.d(TAG, "Service is started: $isServiceStarted")
Log.d(TAG, "nFails: ${FailureHandler.nFails}")
val serviceIntent = Intent(context, StartService::class.java)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
context.startForegroundService(serviceIntent)
} else {
context.startService(serviceIntent)
}
}
fun stopService(block: () -> Unit = {}) {
Log.d(TAG, "Stopping Service")
isServiceStarted = false
service?.stopSelf()
block()
}
}
private val networkCallback = RestartNetworkCallback(this)
override fun onBind(intent: Intent?): IBinder? {
@ -109,4 +79,34 @@ class StartService : Service() {
apiSync()
}
companion object StartServiceCompanion {
private const val WAKE_LOCK_TAG = "NextPush:StartService:lock"
private var service: StartService? = null
var isServiceStarted = false
private set
var wakeLock: PowerManager.WakeLock? = null
private set
fun startListener(context: Context) {
if (isServiceStarted && !FailureHandler.hasFailed()) return
Log.d(TAG, "Starting the Listener")
Log.d(TAG, "Service is started: $isServiceStarted")
Log.d(TAG, "nFails: ${FailureHandler.nFails}")
val serviceIntent = Intent(context, StartService::class.java)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
context.startForegroundService(serviceIntent)
} else {
context.startService(serviceIntent)
}
}
fun stopService(block: () -> Unit = {}) {
Log.d(TAG, "Stopping Service")
isServiceStarted = false
service?.stopSelf()
block()
}
}
}