6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

review

Browse Source
This commit is contained in:
Valere 2019-07-09 15:36:12 +02:00
parent fa81d1a9c7
commit 1a4157a663
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
View File

@ -1,3 +1,18 @@
/*
* Copyright 2019 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.matrix.android.api.session package im.vector.matrix.android.api.session


import androidx.annotation.StringRes import androidx.annotation.StringRes

16
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultInitialSyncProgressService.kt
View File

@ -1,3 +1,18 @@
/*
* Copyright 2019 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.matrix.android.internal.session package im.vector.matrix.android.internal.session


import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
@ -51,6 +66,7 @@ class DefaultInitialSyncProgressService @Inject constructor() : InitialSyncProgr
} }


fun endAll() { fun endAll() {
rootTask = null
this@DefaultInitialSyncProgressService.status.postValue(null) this@DefaultInitialSyncProgressService.status.postValue(null)
} }



1
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTask.kt
View File

@ -63,6 +63,7 @@ internal class DefaultSyncTask @Inject constructor(private val syncAPI: SyncAPI,


val isInitialSync = token == null val isInitialSync = token == null
if (isInitialSync) { if (isInitialSync) {
initialSyncProgressService.endAll()
initialSyncProgressService.startTask(R.string.initial_sync_start_importing_account, 100) initialSyncProgressService.startTask(R.string.initial_sync_start_importing_account, 100)
} }
return executeRequest<SyncResponse> { return executeRequest<SyncResponse> {