Fix build

master
MTRNord 2019-02-04 16:08:17 +01:00
parent dcf074aad0
commit 82e8ebdfc9
No known key found for this signature in database
GPG Key ID: E5B89311FAB91B9F
4 changed files with 5 additions and 11 deletions

View File

@ -6,7 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=false
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048m
# When configured, Gradle will run in incubating parallel mode.

View File

@ -90,6 +90,7 @@ android {
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/notice.txt'
exclude 'META-INF/ASL2.0'
exclude 'androidsupportmultidexversion.txt'
}
sourceSets {
main {

View File

@ -1,25 +1,15 @@
package blog.nordgedanken.simplematrix.data.matrix.sync
import android.content.Context
import android.os.AsyncTask
import android.view.View
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Observer
import androidx.work.*
import blog.nordgedanken.simplematrix.data.matrix.MatrixClient
import blog.nordgedanken.simplematrix.data.matrix.sync.backgroundSync.BackgroundSyncWorker
import blog.nordgedanken.simplematrix.data.matrix.sync.initialSync.InitialSyncWorker
import blog.nordgedanken.simplematrix.roomView.RoomsActivity
import blog.nordgedanken.simplematrix.utils.Notification
import com.orhanobut.logger.Logger
import io.sentry.Sentry
import io.sentry.event.BreadcrumbBuilder
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.launch
import org.jetbrains.anko.runOnUiThread
import java.util.concurrent.TimeUnit
//TODO add backoffStrategy
@ -48,6 +38,7 @@ object SyncStarter {
val workInfoList = statuses.get(10, TimeUnit.SECONDS)
for (workInfo in workInfoList) {
val state = workInfo.state
Logger.d(state)
running = (state == WorkInfo.State.RUNNING) or (state == WorkInfo.State.ENQUEUED)
}
if (!running) {
@ -63,6 +54,8 @@ object SyncStarter {
WorkManager.getInstance()
.beginUniqueWork("backgroundSync", ExistingWorkPolicy.REPLACE, backgroundSyncWork)
.enqueue()
} else {
Logger.d("Sync already runnning")
}
}