gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 22:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1203 from nextcloud/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.5.0

Browse Source 
Bump kotlin-gradle-plugin from 1.4.32 to 1.5.0
This commit is contained in:
Joas Schilling 2021-05-10 11:34:57 +02:00 committed by GitHub
commit 912442f49c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -683,10 +683,11 @@ class ChatController(args: Bundle) :
} }
require(files.isNotEmpty()) require(files.isNotEmpty())
var filenamesWithLinebreaks = "\n" val filenamesWithLinebreaks = StringBuilder("\n")
files.forEach {
var filename = UriUtils.getFileName(Uri.parse(it), context) for (file in files) {
filenamesWithLinebreaks += filename + "\n" val filename = UriUtils.getFileName(Uri.parse(file), context)
filenamesWithLinebreaks.append(filename).append("\n")
} }
val confirmationQuestion = when (files.size) { val confirmationQuestion = when (files.size) {
@ -701,7 +702,7 @@ class ChatController(args: Bundle) :
LovelyStandardDialog(activity) LovelyStandardDialog(activity)
.setPositiveButtonColorRes(R.color.nc_darkGreen) .setPositiveButtonColorRes(R.color.nc_darkGreen)
.setTitle(confirmationQuestion) .setTitle(confirmationQuestion)
.setMessage(filenamesWithLinebreaks) .setMessage(filenamesWithLinebreaks.toString())
.setPositiveButton(R.string.nc_yes) { v -> .setPositiveButton(R.string.nc_yes) { v ->
uploadFiles(files) uploadFiles(files)
Toast.makeText( Toast.makeText(

3
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -485,8 +485,7 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
val bundle = Bundle() val bundle = Bundle()
val existingParticipantsId = arrayListOf<String>() val existingParticipantsId = arrayListOf<String>()
recyclerViewItems.forEach { for (userItem in recyclerViewItems) {
val userItem = it as UserItem
if (userItem.model.getActorType() == USERS) { if (userItem.model.getActorType() == USERS) {
existingParticipantsId.add(userItem.model.getActorId()) existingParticipantsId.add(userItem.model.getActorId())
} }

3
app/src/main/java/com/nextcloud/talk/utils/LoggingUtils.kt
View File

@ -30,10 +30,11 @@ import java.io.FileNotFoundException
import java.io.IOException import java.io.IOException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
import java.util.Locale
object LoggingUtils { object LoggingUtils {
fun writeLogEntryToFile(context: Context, logEntry: String) { fun writeLogEntryToFile(context: Context, logEntry: String) {
val dateFormat = SimpleDateFormat("yyyy/MM/dd HH:mm:ss") val dateFormat = SimpleDateFormat("yyyy/MM/dd HH:mm:ss", Locale.ROOT)
val date = Date() val date = Date()
val logEntryWithDateTime = dateFormat.format(date) + ": " + logEntry + "\n" val logEntryWithDateTime = dateFormat.format(date) + ": " + logEntry + "\n"

2
build.gradle
View File

@ -24,7 +24,7 @@
buildscript { buildscript {
ext { ext {
kotlinVersion = '1.4.32' kotlinVersion = '1.5.0'
} }
repositories { repositories {

2
scripts/analysis/lint-results.txt
View File

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 3 errors and 347 warnings</span> <span class="mdl-layout-title">Lint Report: 3 errors and 346 warnings</span>