From f25fa53ca501111809daa815dab2b640098d1d16 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 27 Sep 2017 23:28:56 +0200 Subject: [PATCH] update commons to 2.28.8 --- app/build.gradle | 2 +- .../camera/activities/MainActivity.kt | 18 +----------------- build.gradle | 1 + 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fdaeb2c6..2e655163 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,7 @@ android { } dependencies { - compile 'com.simplemobiletools:commons:2.28.4' + compile 'com.simplemobiletools:commons:2.28.8' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt index f5ff1f48..147c249b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -6,7 +6,6 @@ import android.content.ActivityNotFoundException import android.content.Intent import android.content.pm.PackageManager import android.content.res.Resources -import android.database.Cursor import android.hardware.Camera import android.hardware.SensorManager import android.net.Uri @@ -382,7 +381,7 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave private fun setupPreviewImage(isPhoto: Boolean) { val uri = if (isPhoto) MediaStore.Images.Media.EXTERNAL_CONTENT_URI else MediaStore.Video.Media.EXTERNAL_CONTENT_URI - val lastMediaId = getLastMediaId(uri) + val lastMediaId = getLatestMediaId(uri) if (lastMediaId == 0L) { return } @@ -403,21 +402,6 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave } } - private fun getLastMediaId(uri: Uri): Long { - val projection = arrayOf(MediaStore.Images.ImageColumns._ID) - val sortOrder = "${MediaStore.Images.ImageColumns.DATE_TAKEN} DESC" - var cursor: Cursor? = null - try { - cursor = contentResolver.query(uri, projection, null, null, sortOrder) - if (cursor?.moveToFirst() == true) { - return cursor.getLongValue(MediaStore.Images.ImageColumns._ID) - } - } finally { - cursor?.close() - } - return 0 - } - private fun scheduleFadeOut() = mFadeHandler.postDelayed({ fadeOutButtons() }, FADE_DELAY.toLong()) private fun fadeOutButtons() { diff --git a/build.gradle b/build.gradle index c2eea8e2..1be9f26e 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ buildscript { allprojects { repositories { jcenter() + maven { url 'https://jitpack.io' } } }