Skip to content

Commit 18443d3

Browse files
committed
apply theming to user mentions
Signed-off-by: sowjanyakch <[email protected]>
1 parent 2b908bd commit 18443d3

File tree

4 files changed

+29
-11
lines changed

4 files changed

+29
-11
lines changed

app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import io.reactivex.SingleObserver
4848
import io.reactivex.android.schedulers.AndroidSchedulers
4949
import io.reactivex.disposables.Disposable
5050
import io.reactivex.schedulers.Schedulers
51+
import kotlinx.coroutines.Job
5152
import kotlinx.coroutines.launch
5253
import javax.inject.Inject
5354

@@ -60,6 +61,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
6061

6162
@Inject
6263
lateinit var userManager: UserManager
64+
private var job: Job? = null
6365

6466
@Inject
6567
lateinit var userGroupsOrCirclesRepository: UserGroupsCirclesRepository
@@ -92,6 +94,11 @@ class MainActivity : BaseActivity(), ActionBarProvider {
9294

9395
handleIntent(intent)
9496

97+
job = lifecycleScope.launch {
98+
val initialized = userGroupsOrCirclesRepository.initialize()
99+
Log.d("MainActivity", "$initialized")
100+
}
101+
95102
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
96103
}
97104

@@ -144,6 +151,11 @@ class MainActivity : BaseActivity(), ActionBarProvider {
144151
super.onStop()
145152
}
146153

154+
override fun onDestroy() {
155+
super.onDestroy()
156+
job?.cancel()
157+
}
158+
147159
private fun openConversationList() {
148160
val intent = Intent(this, ConversationsListActivity::class.java)
149161
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
@@ -152,10 +164,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
152164
}
153165

154166
private fun handleActionFromContact(intent: Intent) {
155-
lifecycleScope.launch {
156-
val initialized = userGroupsOrCirclesRepository.initialize()
157-
Log.d("MainActivity", "$initialized")
158-
}
167+
159168
if (intent.action == Intent.ACTION_VIEW && intent.data != null) {
160169
val cursor = contentResolver.query(intent.data!!, null, null, null, null)
161170

app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ class RepositoryModule {
199199
fun provideUserGroupsCirclesRepository(
200200
userCirclesOrGroupsDao: UserCirclesOrGroupsDao,
201201
ncApiCoroutines: NcApiCoroutines,
202-
userProvider: CurrentUserProviderNew
202+
currentUserProvider: CurrentUserProviderNew
203203
): UserGroupsCirclesRepository {
204-
return UserGroupsCirclesRepository(userCirclesOrGroupsDao, ncApiCoroutines, userProvider)
204+
return UserGroupsCirclesRepository(userCirclesOrGroupsDao, ncApiCoroutines, currentUserProvider)
205205
}
206206
}

app/src/main/java/com/nextcloud/talk/data/database/dao/UserCirclesOrGroupsDao.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.nextcloud.talk.data.database.model.UserGroupsEntity
1818
interface UserCirclesOrGroupsDao {
1919

2020
@Query("SELECT groups FROM user_groups")
21-
fun getUserGroups(): List<UserGroupsEntity>
21+
fun getUserGroups():List<UserGroupsEntity>
2222

2323
@Insert(onConflict = OnConflictStrategy.REPLACE)
2424
suspend fun insertUserGroups(groups:List<UserGroupsEntity>)
@@ -29,4 +29,10 @@ interface UserCirclesOrGroupsDao {
2929
@Insert(onConflict = OnConflictStrategy.REPLACE)
3030
suspend fun insertUserCircles(circles: List<UserCirclesEntity>)
3131

32+
@Query("DELETE FROM user_groups")
33+
suspend fun deleteAllUserGroups()
34+
35+
@Query("DELETE FROM user_circles")
36+
suspend fun deleteAllUserCircles()
37+
3238
}

app/src/main/java/com/nextcloud/talk/data/database/model/UserGroupsCirclesRepository.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class UserGroupsCirclesRepository @Inject constructor(
3030

3131
coroutineScope {
3232
launch {
33+
userCirclesOrGroupsDao.deleteAllUserGroups()
3334
val response = ncApiCoroutines.getUserGroups(
3435
credentials,
3536
ApiUtils.getUrlForUserGroups(
@@ -38,7 +39,7 @@ class UserGroupsCirclesRepository @Inject constructor(
3839
)
3940
)
4041
val groups = response.ocs?.data?.groups?: emptyList()
41-
42+
Log.d("UserDataRepo","$groups")
4243
userCirclesOrGroupsDao.insertUserGroups(
4344
groups.map{
4445
UserGroupsEntity(it)
@@ -47,12 +48,13 @@ class UserGroupsCirclesRepository @Inject constructor(
4748
}
4849

4950
launch {
50-
51+
userCirclesOrGroupsDao.deleteAllUserCircles()
5152
val response = ncApiCoroutines.getUserCircles(
5253
credentials,
5354
ApiUtils.getUrlForUserCircles(user.baseUrl!!)
5455
)
5556
val circles = response.ocs?.data?.map { it.displayName!! }?: emptyList()
57+
Log.d("UserDataRepo","$circles")
5658
userCirclesOrGroupsDao.insertUserCircles(
5759
circles.map{
5860
UserCirclesEntity(it)
@@ -66,13 +68,14 @@ class UserGroupsCirclesRepository @Inject constructor(
6668
Log.e("UserDataRepo", "Error initializing user data", e)
6769
return@withContext false
6870
}
71+
6972
}
7073

71-
fun getUserGroups(): List<UserGroupsEntity> {
74+
fun getUserGroups(): List<UserGroupsEntity> {
7275
return userCirclesOrGroupsDao.getUserGroups()
7376
}
7477

75-
fun getUserCircles(): List<UserCirclesEntity> {
78+
fun getUserCircles(): List<UserCirclesEntity>{
7679
return userCirclesOrGroupsDao.getUserCircles()
7780
}
7881
}

0 commit comments

Comments
 (0)