Skip to content

Commit adfcd95

Browse files
committed
use output stream with auto close and check nullability of parent dir, remove unused values
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 93de8d7 commit adfcd95

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

app/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import com.owncloud.android.R
2626
import com.owncloud.android.ui.notifications.NotificationUtils
2727
import com.owncloud.android.utils.FileExportUtils
2828
import java.io.File
29-
import java.io.FileWriter
3029
import java.security.SecureRandom
3130
import java.util.TimeZone
3231

@@ -44,13 +43,17 @@ class LogsEmailSender(private val context: Context, private val clock: Clock, pr
4443
) : Function0<Uri?> {
4544

4645
override fun invoke(): Uri? {
47-
file.parentFile.mkdirs()
48-
val fo = FileWriter(file, false)
49-
logs.forEach {
50-
fo.write(it.toString(tz))
51-
fo.write("\n")
46+
file.parentFile?.mkdirs()
47+
48+
file.outputStream().use { outputStream ->
49+
outputStream.writer(Charsets.UTF_8).buffered().use { writer ->
50+
logs.forEach {
51+
writer.write(it.toString(tz))
52+
writer.newLine()
53+
}
54+
}
5255
}
53-
fo.close()
56+
5457
return FileProvider.getUriForFile(context, context.getString(R.string.file_provider_authority), file)
5558
}
5659
}
@@ -149,12 +152,12 @@ class LogsEmailSender(private val context: Context, private val clock: Clock, pr
149152

150153
intent.putExtra(Intent.EXTRA_TEXT, getPhoneInfo())
151154

152-
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
155+
intent.flags = FLAG_ACTIVITY_NEW_TASK
153156
intent.type = LOGS_MIME_TYPE
154157
intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, arrayListOf(uri))
155158
try {
156159
context.startActivity(intent)
157-
} catch (ex: ActivityNotFoundException) {
160+
} catch (_: ActivityNotFoundException) {
158161
Toast.makeText(context, R.string.log_send_no_mail_app, Toast.LENGTH_SHORT).show()
159162
}
160163
}

0 commit comments

Comments
 (0)