diff --git a/app/build.gradle b/app/build.gradle index 957752fc..55b792cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.2" defaultConfig { applicationId "com.simplemobiletools.notes" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 50 versionName "4.2.0" setProperty("archivesBaseName", "notes") @@ -40,16 +40,9 @@ android { } } -ext { - leakCanaryVersion = '1.5.4' -} - dependencies { - implementation 'com.simplemobiletools:commons:4.6.5' + implementation 'com.simplemobiletools:commons:4.7.5' implementation 'com.facebook.stetho:stetho:1.5.0' - - debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" - releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion" } Properties props = new Properties() diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/App.kt b/app/src/main/kotlin/com/simplemobiletools/notes/App.kt index ffc697e8..73197703 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/App.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/App.kt @@ -3,16 +3,11 @@ package com.simplemobiletools.notes import android.app.Application import com.facebook.stetho.Stetho import com.simplemobiletools.commons.extensions.checkUseEnglish -import com.squareup.leakcanary.LeakCanary class App : Application() { override fun onCreate() { super.onCreate() if (BuildConfig.DEBUG) { - if (LeakCanary.isInAnalyzerProcess(this)) { - return - } - LeakCanary.install(this) Stetho.initializeWithDefaults(this) } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt index cc47d856..78fc0a01 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -310,7 +310,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { private fun openFile(path: String, checkTitle: Boolean, onChecksPassed: (file: File) -> Unit) { val file = File(path) - if (path.isImageVideoGif()) { + if (path.isMediaFile()) { toast(R.string.invalid_file_format) } else if (file.length() > 10 * 1000 * 1000) { toast(R.string.file_too_large) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt index 76b240cc..e072f854 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt @@ -4,7 +4,7 @@ import android.support.v7.app.AlertDialog import android.view.ViewGroup import com.simplemobiletools.commons.extensions.getFilenameFromPath import com.simplemobiletools.commons.extensions.humanizePath -import com.simplemobiletools.commons.extensions.isImageVideoGif +import com.simplemobiletools.commons.extensions.isMediaFile import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.notes.R import com.simplemobiletools.notes.activities.SimpleActivity @@ -42,7 +42,7 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal val filename = file.path.getFilenameFromPath() when { file.isDirectory -> false - filename.isImageVideoGif() -> false + filename.isMediaFile() -> false file.length() > 10 * 1000 * 1000 -> false activity.dbHelper.doesTitleExist(filename) -> false else -> true diff --git a/build.gradle b/build.gradle index b7a33234..e89c3e94 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.60' + ext.kotlin_version = '1.2.61' repositories { jcenter()