From 26c19f7aaa02481ab6d0abe34ac908971245d0a6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 16 May 2018 23:11:25 +0200 Subject: [PATCH] update strings url to https --- .../notes/dialogs/ImportFolderDialog.kt | 16 +++++++++------- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 22 files changed, 30 insertions(+), 28 deletions(-) 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 77ab7816..63a39711 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt @@ -2,7 +2,10 @@ package com.simplemobiletools.notes.dialogs import android.support.v7.app.AlertDialog import android.view.ViewGroup -import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.extensions.getFilenameFromPath +import com.simplemobiletools.commons.extensions.humanizePath +import com.simplemobiletools.commons.extensions.isImageVideoGif +import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.notes.R import com.simplemobiletools.notes.activities.SimpleActivity import com.simplemobiletools.notes.extensions.dbHelper @@ -34,8 +37,8 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal private fun saveFolder(updateFilesOnEdit: Boolean) { val folder = File(path) - var lastSavedNoteId = -1; - folder.listFiles({ file -> + var lastSavedNoteId = -1 + folder.listFiles { file -> val filename = file.path.getFilenameFromPath() when { filename.isImageVideoGif() -> false @@ -43,7 +46,7 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal activity.dbHelper.doesTitleExist(filename) -> false else -> true } - }).forEach { + }.forEach { val storePath = if (updateFilesOnEdit) it.path else "" val storeContent = if (updateFilesOnEdit) "" else it.readText() @@ -66,7 +69,6 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal private fun saveNote(storeContent: String, storePath: String): Int { val filename = storePath.getFilenameFromPath() val note = Note(0, filename, storeContent, TYPE_NOTE, storePath) - val id = activity.dbHelper.insertNote(note) - return id + return activity.dbHelper.insertNote(note) } -} \ No newline at end of file +} diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 8c863cf3..ea3f48ee 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -57,7 +57,7 @@ Uden reklamer og unødvendige tilladelser. Den er helt igennem open source, og du kan selv bestemme farverne. - Denne app er en del af en større serie. Du kan finde dem alle på siden http://www.simplemobiletools.com + Denne app er en del af en større serie. Du kan finde dem alle på siden https://www.simplemobiletools.com