migrate IOUtils to Kotlin (#2763)
* migrate `IOUtils` to Kotlin * Fix ktlint * change functions inside IOUtils to extension function
This commit is contained in:
parent
07b314266c
commit
c0a06f7188
6 changed files with 77 additions and 81 deletions
|
|
@ -20,8 +20,8 @@ import android.graphics.Bitmap
|
|||
import android.graphics.Bitmap.CompressFormat
|
||||
import android.graphics.BitmapFactory
|
||||
import android.net.Uri
|
||||
import com.keylesspalace.tusky.util.IOUtils
|
||||
import com.keylesspalace.tusky.util.calculateInSampleSize
|
||||
import com.keylesspalace.tusky.util.closeQuietly
|
||||
import com.keylesspalace.tusky.util.getImageOrientation
|
||||
import com.keylesspalace.tusky.util.reorientBitmap
|
||||
import java.io.File
|
||||
|
|
@ -51,7 +51,7 @@ fun downsizeImage(
|
|||
val options = BitmapFactory.Options()
|
||||
options.inJustDecodeBounds = true
|
||||
BitmapFactory.decodeStream(decodeBoundsInputStream, null, options)
|
||||
IOUtils.closeQuietly(decodeBoundsInputStream)
|
||||
decodeBoundsInputStream.closeQuietly()
|
||||
// Get EXIF data, for orientation info.
|
||||
val orientation = getImageOrientation(uri, contentResolver)
|
||||
/* Unfortunately, there isn't a determined worst case compression ratio for image
|
||||
|
|
@ -78,7 +78,7 @@ fun downsizeImage(
|
|||
} catch (error: OutOfMemoryError) {
|
||||
return false
|
||||
} finally {
|
||||
IOUtils.closeQuietly(decodeBitmapInputStream)
|
||||
decodeBitmapInputStream.closeQuietly()
|
||||
} ?: return false
|
||||
|
||||
val reorientedBitmap = reorientBitmap(scaledBitmap, orientation)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import com.keylesspalace.tusky.db.DraftEntity
|
|||
import com.keylesspalace.tusky.entity.Attachment
|
||||
import com.keylesspalace.tusky.entity.NewPoll
|
||||
import com.keylesspalace.tusky.entity.Status
|
||||
import com.keylesspalace.tusky.util.IOUtils
|
||||
import com.keylesspalace.tusky.util.copyToFile
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import okhttp3.OkHttpClient
|
||||
|
|
@ -194,7 +194,7 @@ class DraftHelper @Inject constructor(
|
|||
return null
|
||||
}
|
||||
} else {
|
||||
IOUtils.copyToFile(contentResolver, this, file)
|
||||
this.copyToFile(contentResolver, file)
|
||||
}
|
||||
return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", file)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue