From a9e466406c97e46d2cf07b2e40535b9a1c96d10f Mon Sep 17 00:00:00 2001
From: Nikola Trubitsyn <nikola.trubitsyn@gmail.com>
Date: Tue, 13 Jun 2017 22:28:59 +0300
Subject: [PATCH] Fix #88

---
 .../simplemobiletools/notes/activities/MainActivity.kt   | 2 +-
 .../com/simplemobiletools/notes/extensions/Context.kt    | 9 +++++++--
 .../simplemobiletools/notes/fragments/NoteFragment.kt    | 9 ++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

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 2979e684..01d59cfe 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
@@ -240,7 +240,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
         }
     }
 
-    private fun deleteNote(deleteFile: Boolean) {
+    fun deleteNote(deleteFile: Boolean) {
         if (mNotes.size <= 1)
             return
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt
index ce8f0c43..b0f07f24 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt
@@ -8,6 +8,7 @@ import com.simplemobiletools.notes.R
 import com.simplemobiletools.notes.helpers.*
 import com.simplemobiletools.notes.models.Note
 import java.io.File
+import java.io.FileNotFoundException
 
 fun Context.getTextSize() =
         when (config.fontSize) {
@@ -30,9 +31,13 @@ fun Context.updateWidget() {
 
 val Context.config: Config get() = Config.newInstance(this)
 
-fun Context.getNoteStoredValue(note: Note): String {
+fun Context.getNoteStoredValue(note: Note): String? {
     return if (note.path.isNotEmpty()) {
-        File(note.path).readText()
+        try {
+            return File(note.path).readText()
+        } catch (e: FileNotFoundException) {
+            return null
+        }
     } else {
         note.value
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
index 59084c41..240f009f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
@@ -98,7 +98,14 @@ class NoteFragment : Fragment() {
 
         val config = context.config
         view.notes_view.apply {
-            setText(context.getNoteStoredValue(note))
+            val fileContents = context.getNoteStoredValue(note)
+
+            if (fileContents == null) {
+                (activity as MainActivity).deleteNote(false)
+                return
+            }
+
+            setText(fileContents)
             setColors(config.textColor, config.primaryColor, config.backgroundColor)
             setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getTextSize())
             gravity = getTextGravity()