Skip to content

Commit b2020cf

Browse files
committed
ktlintformat
Signed-off-by: sowjanyakch <[email protected]>
1 parent 94c487b commit b2020cf

File tree

7 files changed

+50
-52
lines changed

7 files changed

+50
-52
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ class MainActivity : BaseActivity(), ActionBarProvider {
164164
}
165165

166166
private fun handleActionFromContact(intent: Intent) {
167-
168167
if (intent.action == Intent.ACTION_VIEW && intent.data != null) {
169168
val cursor = contentResolver.query(intent.data!!, null, null, null, null)
170169

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ 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)
24-
suspend fun insertUserGroups(groups:List<UserGroupsEntity>)
24+
suspend fun insertUserGroups(groups: List<UserGroupsEntity>)
2525

2626
@Query("SELECT displayName FROM user_circles")
2727
fun getUserCircles(): List<UserCirclesEntity>
@@ -34,5 +34,4 @@ interface UserCirclesOrGroupsDao {
3434

3535
@Query("DELETE FROM user_circles")
3636
suspend fun deleteAllUserCircles()
37-
3837
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ import androidx.room.PrimaryKey
1515
data class UserCirclesEntity(
1616
@PrimaryKey
1717
@ColumnInfo(name = "displayName")
18-
var displayName: String,
18+
var displayName: String
1919
)

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

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -24,58 +24,58 @@ class UserGroupsCirclesRepository @Inject constructor(
2424
private val currentUserProvider: CurrentUserProviderNew
2525
) {
2626
val user = currentUserProvider.currentUser.blockingGet()
27-
suspend fun initialize(): Boolean = withContext(Dispatchers.IO) {
28-
try {
29-
val credentials: String = ApiUtils.getCredentials(user.username, user.token)!!
27+
suspend fun initialize(): Boolean =
28+
withContext(Dispatchers.IO) {
29+
try {
30+
val credentials: String = ApiUtils.getCredentials(user.username, user.token)!!
3031

31-
coroutineScope {
32-
launch {
33-
userCirclesOrGroupsDao.deleteAllUserGroups()
34-
val response = ncApiCoroutines.getUserGroups(
35-
credentials,
36-
ApiUtils.getUrlForUserGroups(
37-
user.baseUrl!!,
38-
user.userId!!
32+
coroutineScope {
33+
launch {
34+
userCirclesOrGroupsDao.deleteAllUserGroups()
35+
val response = ncApiCoroutines.getUserGroups(
36+
credentials,
37+
ApiUtils.getUrlForUserGroups(
38+
user.baseUrl!!,
39+
user.userId!!
40+
)
3941
)
40-
)
41-
val groups = response.ocs?.data?.groups?: emptyList()
42-
Log.d("UserDataRepo","$groups")
43-
userCirclesOrGroupsDao.insertUserGroups(
44-
groups.map{
45-
UserGroupsEntity(it)
46-
}
47-
)
48-
}
42+
val groups = response.ocs?.data?.groups ?: emptyList()
43+
Log.d("UserDataRepo", "$groups")
44+
userCirclesOrGroupsDao.insertUserGroups(
45+
groups.map {
46+
UserGroupsEntity(it)
47+
}
48+
)
49+
}
4950

50-
launch {
51-
userCirclesOrGroupsDao.deleteAllUserCircles()
52-
val response = ncApiCoroutines.getUserCircles(
53-
credentials,
54-
ApiUtils.getUrlForUserCircles(user.baseUrl!!)
55-
)
56-
val circles = response.ocs?.data?.map { it.displayName!! }?: emptyList()
57-
Log.d("UserDataRepo","$circles")
58-
userCirclesOrGroupsDao.insertUserCircles(
59-
circles.map{
60-
UserCirclesEntity(it)
61-
}
62-
)
51+
launch {
52+
userCirclesOrGroupsDao.deleteAllUserCircles()
53+
val response = ncApiCoroutines.getUserCircles(
54+
credentials,
55+
ApiUtils.getUrlForUserCircles(user.baseUrl!!)
56+
)
57+
val circles = response.ocs?.data?.map { it.displayName!! } ?: emptyList()
58+
Log.d("UserDataRepo", "$circles")
59+
userCirclesOrGroupsDao.insertUserCircles(
60+
circles.map {
61+
UserCirclesEntity(it)
62+
}
63+
)
64+
}
6365
}
64-
}
6566

66-
return@withContext true
67-
} catch (e: Exception) {
68-
Log.e("UserDataRepo", "Error initializing user data", e)
69-
return@withContext false
67+
return@withContext true
68+
} catch (e: Exception) {
69+
Log.e("UserDataRepo", "Error initializing user data", e)
70+
return@withContext false
71+
}
7072
}
7173

72-
}
73-
74-
fun getUserGroups(): List<UserGroupsEntity> {
74+
fun getUserGroups(): List<UserGroupsEntity> {
7575
return userCirclesOrGroupsDao.getUserGroups()
7676
}
7777

78-
fun getUserCircles(): List<UserCirclesEntity>{
78+
fun getUserCircles(): List<UserCirclesEntity> {
7979
return userCirclesOrGroupsDao.getUserCircles()
8080
}
8181
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ import androidx.room.PrimaryKey
1414
@Entity(tableName = "user_groups")
1515
data class UserGroupsEntity(
1616
@PrimaryKey
17-
@ColumnInfo (name="groups") var groups: String,
17+
@ColumnInfo(name = "groups") var groups: String
1818
)

app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import java.util.Locale
5151
ConversationEntity::class,
5252
ChatMessageEntity::class,
5353
ChatBlockEntity::class,
54-
UserCirclesEntity:: class,
54+
UserCirclesEntity::class,
5555
UserGroupsEntity::class
5656
],
5757
version = 13,

app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class MessageUtils @Inject constructor(val context: Context) {
102102
return processedMessageText
103103
}
104104

105-
@Suppress("NestedBlockDepth", "LongParameterList")
105+
@Suppress("NestedBlockDepth", "LongParameterList", "Detekt.LongMethod")
106106
private fun processMessageParameters(
107107
themingContext: Context,
108108
viewThemeUtils: ViewThemeUtils,
@@ -113,10 +113,10 @@ class MessageUtils @Inject constructor(val context: Context) {
113113
): Spanned {
114114
var messageStringInternal = messageString
115115

116-
val userGroups = userGroupsCirclesRepository.getUserGroups().map{
116+
val userGroups = userGroupsCirclesRepository.getUserGroups().map {
117117
it.groups
118118
}
119-
val userCircles = userGroupsCirclesRepository.getUserCircles().map{
119+
val userCircles = userGroupsCirclesRepository.getUserCircles().map {
120120
it.displayName
121121
}
122122
for (key in messageParameters.keys) {

0 commit comments

Comments
 (0)