allow syncing note with content uris

tibbi · tibbi · commit 4f1bb56d00f9 · 2021-03-21T11:50:02.000+01:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
@@ -239,7 +239,7 @@ class MainActivity : SimpleActivity() {
         if (requestCode == PICK_OPEN_FILE_INTENT && resultCode == RESULT_OK && resultData != null && resultData.data != null) {
             importUri(resultData.data!!)
         } else if (requestCode == PICK_EXPORT_FILE_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null && mNotes.isNotEmpty()) {
-            tryExportNoteValueToFile(resultData.dataString!!, getCurrentNoteValue(), true)
+            showExportFilePickUpdateDialog(resultData.dataString!!, getCurrentNoteValue())
         }
     }
 
@@ -752,7 +752,7 @@ class MainActivity : SimpleActivity() {
                         if (!filename.isAValidFilename()) {
                             toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename)))
                         } else {
-                            val noteStoredValue = note.getNoteStoredValue() ?: ""
+                            val noteStoredValue = note.getNoteStoredValue(this) ?: ""
                             tryExportNoteValueToFile(file.absolutePath, note.value, false) {
                                 if (syncFile) {
                                     note.path = file.absolutePath
@@ -786,7 +786,7 @@ class MainActivity : SimpleActivity() {
 
     fun tryExportNoteValueToFile(path: String, content: String, showSuccessToasts: Boolean, callback: ((success: Boolean) -> Unit)? = null) {
         if (path.startsWith("content://")) {
-            exportNoteValueToUri(Uri.parse(path), content)
+            exportNoteValueToUri(Uri.parse(path), content, callback)
         } else {
             handlePermission(PERMISSION_WRITE_STORAGE) {
                 if (it) {
@@ -841,15 +841,17 @@ class MainActivity : SimpleActivity() {
         }
     }
 
-    private fun exportNoteValueToUri(uri: Uri, content: String) {
+    private fun exportNoteValueToUri(uri: Uri, content: String, callback: ((success: Boolean) -> Unit)? = null) {
         try {
             val outputStream = contentResolver.openOutputStream(uri)
             outputStream!!.bufferedWriter().use { out ->
                 out.write(content)
             }
             noteExportedSuccessfully(mCurrentNote.title)
+            callback?.invoke(true)
         } catch (e: Exception) {
             showErrorToast(e)
+            callback?.invoke(false)
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt
@@ -56,7 +56,7 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi
             }
         } else {
             remoteView = RemoteViews(context.packageName, R.layout.widget_text_layout).apply {
-                val noteText = note!!.getNoteStoredValue() ?: ""
+                val noteText = note!!.getNoteStoredValue(context) ?: ""
                 for (id in textIds) {
                     setText(id, noteText)
                     setTextColor(id, widgetTextColor)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
@@ -119,7 +119,7 @@ class TextFragment : NoteFragment() {
         view.text_note_view.apply {
             typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT
 
-            val fileContents = note!!.getNoteStoredValue()
+            val fileContents = note!!.getNoteStoredValue(context)
             if (fileContents == null) {
                 (activity as MainActivity).deleteNote(false, note!!)
                 return
@@ -193,7 +193,7 @@ class TextFragment : NoteFragment() {
             return
         }
 
-        if (note!!.path.isNotEmpty() && !File(note!!.path).exists()) {
+        if (note!!.path.isNotEmpty() && !note!!.path.startsWith("content://") && !File(note!!.path).exists()) {
             return
         }
 
@@ -202,15 +202,15 @@ class TextFragment : NoteFragment() {
         }
 
         val newText = getCurrentNoteViewText()
-        val oldText = note!!.getNoteStoredValue()
+        val oldText = note!!.getNoteStoredValue(context!!)
         if (newText != null && (newText != oldText || force)) {
             note!!.value = newText
             saveNoteValue(note!!)
             context!!.updateWidgets()
         }
     }
 
-    fun hasUnsavedChanges() = getCurrentNoteViewText() != note!!.getNoteStoredValue()
+    fun hasUnsavedChanges() = getCurrentNoteViewText() != note!!.getNoteStoredValue(context!!)
 
     fun focusEditText() {
         view.text_note_view.requestFocus()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt
@@ -1,6 +1,7 @@
 package com.simplemobiletools.notes.pro.helpers
 
 import android.content.Context
+import android.net.Uri
 import android.os.Handler
 import android.os.Looper
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
@@ -22,9 +23,11 @@ class NotesHelper(val context: Context) {
             val notes = context.notesDB.getNotes() as ArrayList<Note>
             val notesToDelete = ArrayList<Note>(notes.size)
             notes.forEach {
-                if (it.path.isNotEmpty() && !File(it.path).exists()) {
-                    context.notesDB.deleteNote(it)
-                    notesToDelete.add(it)
+                if (it.path.isNotEmpty()) {
+                    if (!it.path.startsWith("content://") && !File(it.path).exists()) {
+                        context.notesDB.deleteNote(it)
+                        notesToDelete.add(it)
+                    }
                 }
             }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Note.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Note.kt
@@ -1,11 +1,12 @@
 package com.simplemobiletools.notes.pro.models
 
+import android.content.Context
+import android.net.Uri
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import java.io.File
-import java.io.FileNotFoundException
 
 @Entity(tableName = "notes", indices = [(Index(value = ["id"], unique = true))])
 data class Note(
@@ -15,11 +16,16 @@ data class Note(
     @ColumnInfo(name = "type") var type: Int,
     @ColumnInfo(name = "path") var path: String = "") {
 
-    fun getNoteStoredValue(): String? {
+    fun getNoteStoredValue(context: Context): String? {
         return if (path.isNotEmpty()) {
             try {
-                File(path).readText()
-            } catch (e: FileNotFoundException) {
+                if (path.startsWith("content://")) {
+                    val inputStream = context.contentResolver.openInputStream(Uri.parse(path))
+                    inputStream?.bufferedReader().use { it!!.readText() }
+                } else {
+                    File(path).readText()
+                }
+            } catch (e: Exception) {
                 null
             }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ class MainActivity : SimpleActivity() {`
`239`	`239`	`if (requestCode == PICK_OPEN_FILE_INTENT && resultCode == RESULT_OK && resultData != null && resultData.data != null) {`
`240`	`240`	`importUri(resultData.data!!)`
`241`	`241`	`} else if (requestCode == PICK_EXPORT_FILE_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null && mNotes.isNotEmpty()) {`
`242`		`- tryExportNoteValueToFile(resultData.dataString!!, getCurrentNoteValue(), true)`
	`242`	`+ showExportFilePickUpdateDialog(resultData.dataString!!, getCurrentNoteValue())`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`
`@@ -752,7 +752,7 @@ class MainActivity : SimpleActivity() {`
`752`	`752`	`if (!filename.isAValidFilename()) {`
`753`	`753`	`toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename)))`
`754`	`754`	`} else {`
`755`		`- val noteStoredValue = note.getNoteStoredValue() ?: ""`
	`755`	`+ val noteStoredValue = note.getNoteStoredValue(this) ?: ""`
`756`	`756`	`tryExportNoteValueToFile(file.absolutePath, note.value, false) {`
`757`	`757`	`if (syncFile) {`
`758`	`758`	`note.path = file.absolutePath`
`@@ -786,7 +786,7 @@ class MainActivity : SimpleActivity() {`
`786`	`786`
`787`	`787`	`fun tryExportNoteValueToFile(path: String, content: String, showSuccessToasts: Boolean, callback: ((success: Boolean) -> Unit)? = null) {`
`788`	`788`	`if (path.startsWith("content://")) {`
`789`		`- exportNoteValueToUri(Uri.parse(path), content)`
	`789`	`+ exportNoteValueToUri(Uri.parse(path), content, callback)`
`790`	`790`	`} else {`
`791`	`791`	`handlePermission(PERMISSION_WRITE_STORAGE) {`
`792`	`792`	`if (it) {`
`@@ -841,15 +841,17 @@ class MainActivity : SimpleActivity() {`
`841`	`841`	`}`
`842`	`842`	`}`
`843`	`843`
`844`		`- private fun exportNoteValueToUri(uri: Uri, content: String) {`
	`844`	`+ private fun exportNoteValueToUri(uri: Uri, content: String, callback: ((success: Boolean) -> Unit)? = null) {`
`845`	`845`	`try {`
`846`	`846`	`val outputStream = contentResolver.openOutputStream(uri)`
`847`	`847`	`outputStream!!.bufferedWriter().use { out ->`
`848`	`848`	`out.write(content)`
`849`	`849`	`}`
`850`	`850`	`noteExportedSuccessfully(mCurrentNote.title)`
	`851`	`+ callback?.invoke(true)`
`851`	`852`	`} catch (e: Exception) {`
`852`	`853`	`showErrorToast(e)`
	`854`	`+ callback?.invoke(false)`
`853`	`855`	`}`
`854`	`856`	`}`
`855`	`857`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi`
`56`	`56`	`}`
`57`	`57`	`} else {`
`58`	`58`	`remoteView = RemoteViews(context.packageName, R.layout.widget_text_layout).apply {`
`59`		`- val noteText = note!!.getNoteStoredValue() ?: ""`
	`59`	`+ val noteText = note!!.getNoteStoredValue(context) ?: ""`
`60`	`60`	`for (id in textIds) {`
`61`	`61`	`setText(id, noteText)`
`62`	`62`	`setTextColor(id, widgetTextColor)`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class TextFragment : NoteFragment() {`
`119`	`119`	`view.text_note_view.apply {`
`120`	`120`	`typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT`
`121`	`121`
`122`		`- val fileContents = note!!.getNoteStoredValue()`
	`122`	`+ val fileContents = note!!.getNoteStoredValue(context)`
`123`	`123`	`if (fileContents == null) {`
`124`	`124`	`(activity as MainActivity).deleteNote(false, note!!)`
`125`	`125`	`return`
`@@ -193,7 +193,7 @@ class TextFragment : NoteFragment() {`
`193`	`193`	`return`
`194`	`194`	`}`
`195`	`195`
`196`		`- if (note!!.path.isNotEmpty() && !File(note!!.path).exists()) {`
	`196`	`+ if (note!!.path.isNotEmpty() && !note!!.path.startsWith("content://") && !File(note!!.path).exists()) {`
`197`	`197`	`return`
`198`	`198`	`}`
`199`	`199`
`@@ -202,15 +202,15 @@ class TextFragment : NoteFragment() {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`val newText = getCurrentNoteViewText()`
`205`		`- val oldText = note!!.getNoteStoredValue()`
	`205`	`+ val oldText = note!!.getNoteStoredValue(context!!)`
`206`	`206`	`if (newText != null && (newText != oldText \|\| force)) {`
`207`	`207`	`note!!.value = newText`
`208`	`208`	`saveNoteValue(note!!)`
`209`	`209`	`context!!.updateWidgets()`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
`213`		`- fun hasUnsavedChanges() = getCurrentNoteViewText() != note!!.getNoteStoredValue()`
	`213`	`+ fun hasUnsavedChanges() = getCurrentNoteViewText() != note!!.getNoteStoredValue(context!!)`
`214`	`214`
`215`	`215`	`fun focusEditText() {`
`216`	`216`	`view.text_note_view.requestFocus()`