Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: file access crashes [WPB-7368] #2994

Merged
merged 5 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
import com.datadog.android.rum.tracking.ComponentPredicate
import com.wire.android.datastore.GlobalDataStore
import com.wire.android.ui.WireActivity
import com.wire.android.util.DeviceUtil
import com.wire.android.util.getDeviceIdString
import com.wire.android.util.getGitBuildId
import com.wire.android.util.sha256
Expand Down Expand Up @@ -72,10 +73,15 @@ object ExternalLoggerManager {
.useSite(DatadogSite.EU1)
.build()

val availableMemorySize = DeviceUtil.getAvailableInternalMemorySize()
val totalMemorySize = DeviceUtil.getTotalInternalMemorySize()
val deviceParams = mapOf("available_memory_size" to availableMemorySize, "total_memory_size" to totalMemorySize)

val credentials = Credentials(clientToken, environmentName, appVariantName, applicationId)
val extraInfo = mapOf(
"encrypted_proteus_storage_enabled" to runBlocking { globalDataStore.isEncryptedProteusStorageEnabled().first() },
"git_commit_hash" to context.getGitBuildId()
"git_commit_hash" to context.getGitBuildId(),
"device_params" to deviceParams
)

Datadog.initialize(context, credentials, configuration, TrackingConsent.GRANTED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import okio.Path
import java.io.FileNotFoundException
import javax.inject.Inject

@HiltViewModel
Expand Down Expand Up @@ -113,24 +114,30 @@ class AvatarPickerViewModel @Inject constructor(
pictureState = PictureState.Uploading(imgUri)

val avatarPath = defaultAvatarPath
val imageDataSize = imgUri.toByteArray(appContext, dispatchers).size.toLong()
when (val result = uploadUserAvatar(avatarPath, imageDataSize)) {
is UploadAvatarResult.Success -> {
dataStore.updateUserAvatarAssetId(result.userAssetId.toString())
onComplete(dataStore.avatarAssetId.first())
}
is UploadAvatarResult.Failure -> {
when (result.coreFailure) {
is NetworkFailure.NoNetworkConnection -> showInfoMessage(InfoMessageType.NoNetworkError)
else -> showInfoMessage(InfoMessageType.UploadAvatarError)
try {
val imageDataSize = imgUri.toByteArray(appContext, dispatchers).size.toLong()

when (val result = uploadUserAvatar(avatarPath, imageDataSize)) {
is UploadAvatarResult.Success -> {
dataStore.updateUserAvatarAssetId(result.userAssetId.toString())
onComplete(dataStore.avatarAssetId.first())
}
with(initialPictureLoadingState) {
pictureState = when (this) {
is InitialPictureLoadingState.Loaded -> PictureState.Initial(avatarUri)
else -> PictureState.Empty

is UploadAvatarResult.Failure -> {
when (result.coreFailure) {
is NetworkFailure.NoNetworkConnection -> showInfoMessage(InfoMessageType.NoNetworkError)
else -> showInfoMessage(InfoMessageType.UploadAvatarError)
}
with(initialPictureLoadingState) {
pictureState = when (this) {
is InitialPictureLoadingState.Loaded -> PictureState.Initial(avatarUri)
else -> PictureState.Empty
}
}
}
}
} catch (e: FileNotFoundException) {
showInfoMessage(InfoMessageType.ImageProcessError)
}
}
}
Expand All @@ -157,5 +164,6 @@ class AvatarPickerViewModel @Inject constructor(
sealed class InfoMessageType(override val uiText: UIText) : SnackBarMessage {
data object UploadAvatarError : InfoMessageType(UIText.StringResource(R.string.error_uploading_user_avatar))
data object NoNetworkError : InfoMessageType(UIText.StringResource(R.string.error_no_network_message))
data object ImageProcessError : InfoMessageType(UIText.StringResource(R.string.error_process_user_avatar))
}
}
74 changes: 74 additions & 0 deletions app/src/main/kotlin/com/wire/android/util/DeviceUtil.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/*
* Wire
* Copyright (C) 2024 Wire Swiss GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
package com.wire.android.util

import android.os.Environment
import android.os.StatFs

class DeviceUtil {
companion object {
fun getAvailableInternalMemorySize(): String {
return try {
val path = Environment.getDataDirectory()
val stat = StatFs(path.path)
val blockSize = stat.blockSizeLong
val availableBlocks = stat.availableBlocksLong
formatSize(availableBlocks * blockSize)
} catch (e: IllegalArgumentException) {
""
}
}

fun getTotalInternalMemorySize(): String {
return try {
val path = Environment.getDataDirectory()
val stat = StatFs(path.path)
val blockSize = stat.blockSizeLong
val totalBlocks = stat.blockCountLong
formatSize(totalBlocks * blockSize)
} catch (e: IllegalArgumentException) {
""
}
}

private fun formatSize(sizeInBytes: Long): String {
var size = sizeInBytes
var suffix: String? = null
if (size >= 1024) {
suffix = "KB"
size /= 1024
if (size >= 1024) {
suffix = "MB"
size /= 1024
if (size >= 1024) {
suffix = "GB"
size /= 1024
}
}
}
val resultBuffer = StringBuilder(size.toString())
var commaOffset = resultBuffer.length - 3
while (commaOffset > 0) {
resultBuffer.insert(commaOffset, ',')
commaOffset -= 3
}
if (suffix != null) resultBuffer.append(suffix)
return resultBuffer.toString()
}
}
}
52 changes: 12 additions & 40 deletions app/src/main/kotlin/com/wire/android/util/FileUtil.kt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.database.Cursor
import android.graphics.drawable.Drawable
import android.media.MediaMetadataRetriever
import android.net.Uri
import android.os.Build
Expand All @@ -42,10 +41,7 @@ import android.provider.MediaStore.MediaColumns.SIZE
import android.provider.OpenableColumns
import android.provider.Settings
import android.webkit.MimeTypeMap
import androidx.annotation.AnyRes
import androidx.annotation.NonNull
import androidx.annotation.VisibleForTesting
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
import com.wire.android.R
import com.wire.android.appLogger
Expand All @@ -62,50 +58,18 @@ import kotlinx.serialization.json.Json
import okio.Path
import java.io.File
import java.io.FileNotFoundException
import java.io.IOException
import java.io.InputStream
import java.util.Locale
import kotlin.time.Duration.Companion.milliseconds

/**
* Gets the uri of any drawable or given resource
* @param context - context
* @param drawableId - drawable res id
* @return - uri
*/
fun getUriFromDrawable(
@NonNull context: Context,
@AnyRes drawableId: Int
): Uri {
return Uri.parse(
ContentResolver.SCHEME_ANDROID_RESOURCE +
"://" + context.resources.getResourcePackageName(drawableId) +
'/' + context.resources.getResourceTypeName(drawableId) +
'/' + context.resources.getResourceEntryName(drawableId)
)
}

@Suppress("MagicNumber")
suspend fun Uri.toByteArray(context: Context, dispatcher: DispatcherProvider = DefaultDispatcherProvider()): ByteArray {
return withContext(dispatcher.io()) {
context.contentResolver.openInputStream(this@toByteArray)?.use { it.readBytes() } ?: ByteArray(16)
}
}

suspend fun Uri.toDrawable(context: Context, dispatcher: DispatcherProvider = DefaultDispatcherProvider()): Drawable? {
val dataUri = this
return withContext(dispatcher.io()) {
try {
context.contentResolver.openInputStream(dataUri).use { inputStream ->
Drawable.createFromStream(inputStream, dataUri.toString())
}
} catch (e: FileNotFoundException) {
defaultGalleryIcon(context)
}
}
}

private fun defaultGalleryIcon(context: Context) = ContextCompat.getDrawable(context, R.drawable.ic_gallery)

fun getTempWritableAttachmentUri(context: Context, attachmentPath: Path): Uri {
val file = attachmentPath.toFile()
file.setWritable(true)
Expand Down Expand Up @@ -243,9 +207,17 @@ suspend fun Uri.resampleImageAndCopyToTempPath(

ImageUtil.resample(originalImage, sizeClass).let { processedImage ->
val file = tempCachePath.toFile()
size = processedImage.size.toLong()
file.setWritable(true)
file.outputStream().use { it.write(processedImage) }
try {
size = processedImage.size.toLong()
file.setWritable(true)
file.outputStream().use { it.write(processedImage) }
} catch (e: FileNotFoundException) {
appLogger.e("[ResampleImage] Cannot find file ${file.path}", e)
throw e
} catch (e: IOException) {
appLogger.e("[ResampleImage] I/O error while writing the image", e)
throw e
}
}

size
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,7 @@
<string name="error_no_network_message">Please check your Internet connection and try again</string>
<string name="error_downloading_self_user_profile_picture">There was an error downloading your profile picture. Please check your Internet connection</string>
<string name="error_uploading_user_avatar">Picture could not be uploaded</string>
<string name="error_process_user_avatar">Picture could not be processed</string>
<string name="error_uploading_image_message">Image upload failed</string>
<string name="error_downloading_image_message">Image download failed</string>
<string name="error_updating_muting_setting">Notifications could not be updated</string>
Expand Down
Loading