From 3f6b78ed0804b478b31c5cf5f241a09ade6936c0 Mon Sep 17 00:00:00 2001
From: Jonathan Fisher <jonathanfisher@mb000258.lan>
Date: Mon, 16 Nov 2020 14:02:56 +0000
Subject: [PATCH] history rewrite, plus tls client cert wip

---
 .idea/.name                                   |   2 +-
 .idea/gradle.xml                              |   2 +-
 .../ariane/io/gemini/GeminiDatasourceTests.kt |   5 +-
 .../oppen/ariane/io/bookmarks/BookmarksDB.kt  |   9 --
 .../io/bookmarks/BookmarksDatasource.kt       |  20 ----
 .../ariane/io/bookmarks/RoomBookmarks.kt      |  83 -------------
 .../io/database/ArianeAbstractDatabase.kt     |  14 +++
 .../ariane/io/database/ArianeDatabase.kt      |  14 +++
 .../io/database/bookmarks/ArianeBookmarks.kt  |  80 +++++++++++++
 .../bookmarks/BookmarkEntity.kt               |   2 +-
 .../bookmarks/BookmarkEntry.kt}               |   4 +-
 .../{ => database}/bookmarks/BookmarksDao.kt  |   2 +-
 .../database/bookmarks/BookmarksDatasource.kt |  12 ++
 .../io/database/history/ArianeHistory.kt      |  70 +++++++++++
 .../ariane/io/database/history/HistoryDao.kt  |  24 ++++
 .../io/database/history/HistoryDatasource.kt  |  12 ++
 .../io/database/history/HistoryEntity.kt      |  14 +++
 .../io/database/history/HistoryEntry.kt       |   9 ++
 .../java/oppen/ariane/io/gemini/Datasource.kt |   5 +-
 .../ariane/io/gemini/GeminiDatasource.kt      |  13 +-
 .../ariane/io/keymanager/ArianeKeyManager.kt  |  14 ++-
 .../main/java/oppen/ariane/ui/GemActivity.kt  | 113 +++++++++---------
 .../main/java/oppen/ariane/ui/GemViewModel.kt |  12 +-
 .../ariane/ui/bookmarks/BookmarkDialog.kt     |   6 +-
 .../ariane/ui/bookmarks/BookmarksAdapter.kt   |  28 ++---
 .../ariane/ui/bookmarks/BookmarksDialog.kt    |  32 ++---
 .../ui/modals_menus/history/HistoryAdapter.kt |   5 +-
 .../ui/modals_menus/history/HistoryDialog.kt  |  32 ++---
 app/src/main/res/raw/cert.pfx                 | Bin 0 -> 3941 bytes
 29 files changed, 401 insertions(+), 237 deletions(-)
 delete mode 100644 app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDB.kt
 delete mode 100644 app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDatasource.kt
 delete mode 100644 app/src/main/java/oppen/ariane/io/bookmarks/RoomBookmarks.kt
 create mode 100644 app/src/main/java/oppen/ariane/io/database/ArianeAbstractDatabase.kt
 create mode 100644 app/src/main/java/oppen/ariane/io/database/ArianeDatabase.kt
 create mode 100644 app/src/main/java/oppen/ariane/io/database/bookmarks/ArianeBookmarks.kt
 rename app/src/main/java/oppen/ariane/io/{ => database}/bookmarks/BookmarkEntity.kt (90%)
 rename app/src/main/java/oppen/ariane/io/{bookmarks/Bookmark.kt => database/bookmarks/BookmarkEntry.kt} (65%)
 rename app/src/main/java/oppen/ariane/io/{ => database}/bookmarks/BookmarksDao.kt (94%)
 create mode 100644 app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarksDatasource.kt
 create mode 100644 app/src/main/java/oppen/ariane/io/database/history/ArianeHistory.kt
 create mode 100644 app/src/main/java/oppen/ariane/io/database/history/HistoryDao.kt
 create mode 100644 app/src/main/java/oppen/ariane/io/database/history/HistoryDatasource.kt
 create mode 100644 app/src/main/java/oppen/ariane/io/database/history/HistoryEntity.kt
 create mode 100644 app/src/main/java/oppen/ariane/io/database/history/HistoryEntry.kt
 create mode 100644 app/src/main/res/raw/cert.pfx

diff --git a/.idea/.name b/.idea/.name
index 30976af..c90a0bc 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Två
\ No newline at end of file
+a.kt
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 23a89bb..26ce786 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/androidTest/java/oppen/ariane/io/gemini/GeminiDatasourceTests.kt b/app/src/androidTest/java/oppen/ariane/io/gemini/GeminiDatasourceTests.kt
index fa6883c..0cb470d 100644
--- a/app/src/androidTest/java/oppen/ariane/io/gemini/GeminiDatasourceTests.kt
+++ b/app/src/androidTest/java/oppen/ariane/io/gemini/GeminiDatasourceTests.kt
@@ -32,7 +32,10 @@ class GeminiDatasourceTests {
         val capsule = capsules.random()
         println("Using $capsule for Gemini tests")
         capsuleIndex = capsules.indexOf(capsule)
-        gemini = Datasource.factory(InstrumentationRegistry.getInstrumentation().targetContext)
+        gemini = Datasource.factory(
+            InstrumentationRegistry.getInstrumentation().targetContext,
+            db.history()
+        )
     }
 
     @Test
diff --git a/app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDB.kt b/app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDB.kt
deleted file mode 100644
index a0eb374..0000000
--- a/app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDB.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package oppen.ariane.io.bookmarks
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-
-@Database(entities = [BookmarkEntity::class], version = 2)
-abstract class BookmarksDB: RoomDatabase() {
-    abstract fun bookmarksDao(): BookmarksDao
-}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDatasource.kt b/app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDatasource.kt
deleted file mode 100644
index 86aae5f..0000000
--- a/app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDatasource.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package oppen.ariane.io.bookmarks
-
-import android.content.Context
-
-interface BookmarksDatasource {
-
-    fun get(onBookmarks: (List<Bookmark>) -> Unit)
-    fun add(bookmark: Bookmark, onAdded: () -> Unit)
-    fun delete(bookmark: Bookmark, onDelete: () -> Unit)
-
-    fun moveUp(bookmark: Bookmark, onMoved: () -> Unit)
-    fun moveDown(bookmark: Bookmark, onMoved: () -> Unit)
-    fun update(bookmark: Bookmark, label: String?, uri: String?, onUpdate: () -> Unit)
-
-    companion object{
-        fun getDefault(applicationContext: Context): BookmarksDatasource{
-            return RoomBookmarks(applicationContext)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/bookmarks/RoomBookmarks.kt b/app/src/main/java/oppen/ariane/io/bookmarks/RoomBookmarks.kt
deleted file mode 100644
index 49bae13..0000000
--- a/app/src/main/java/oppen/ariane/io/bookmarks/RoomBookmarks.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package oppen.ariane.io.bookmarks
-
-import android.content.Context
-import androidx.room.Room
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import java.net.URI
-
-class RoomBookmarks(applicationContext: Context): BookmarksDatasource {
-
-    private val db: BookmarksDB = Room.databaseBuilder(applicationContext, BookmarksDB::class.java, "tva_bookmarks").build()
-
-    override fun get(onBookmarks: (List<Bookmark>) -> Unit) {
-        GlobalScope.launch(Dispatchers.IO){
-            val dbBookmarks = db.bookmarksDao().getAll()
-            val bookmarks = mutableListOf<Bookmark>()
-
-            dbBookmarks.forEach { bookmarkEntity ->
-                bookmarks.add(
-                    Bookmark(
-                        uid = bookmarkEntity.uid,
-                        label = bookmarkEntity.label ?: "Unknown",
-                        uri = URI.create(bookmarkEntity.uri),
-                        index = bookmarkEntity.uiIndex ?: 0)
-                )
-            }
-            onBookmarks(bookmarks)
-        }
-    }
-
-    override fun add(bookmark: Bookmark, onAdded: () -> Unit) {
-        GlobalScope.launch(Dispatchers.IO){
-            val bookmarkEntity = BookmarkEntity(
-                label = bookmark.label,
-                uri = bookmark.uri.toString(),
-                uiIndex = bookmark.index,
-                folder = "~/")
-
-            db.bookmarksDao().insertAll(bookmarkEntity)
-            onAdded()
-        }
-    }
-
-    override fun moveUp(bookmark: Bookmark, onMoved: () -> Unit) {
-        GlobalScope.launch(Dispatchers.IO){
-
-            //todo - this method is broken:
-            val prev = db.bookmarksDao().getBookmark(bookmark.index -1)
-            val target = db.bookmarksDao().getBookmark(bookmark.index)
-
-            db.bookmarksDao().updateUIIndex(prev.uid, bookmark.index)
-            db.bookmarksDao().updateUIIndex(target.uid, bookmark.index - 1)
-            onMoved()
-        }
-    }
-
-    override fun moveDown(bookmark: Bookmark, onMoved: () -> Unit) {
-        GlobalScope.launch(Dispatchers.IO){
-            val next = db.bookmarksDao().getBookmark(bookmark.index + 1)
-            val target = db.bookmarksDao().getBookmark(bookmark.index)
-
-            db.bookmarksDao().updateUIIndex(next.uid, bookmark.index)
-            db.bookmarksDao().updateUIIndex(target.uid, bookmark.index + 1)
-            onMoved()
-        }
-    }
-
-    override fun update(bookmark: Bookmark, label: String?, uri: String?, onUpdate: () -> Unit) {
-        GlobalScope.launch(Dispatchers.IO){
-            db.bookmarksDao().updateContent(bookmark.uid, label ?: "", uri ?: "")
-            onUpdate()
-        }
-    }
-
-    override fun delete(bookmark: Bookmark, onDelete: () -> Unit) {
-        GlobalScope.launch(Dispatchers.IO){
-            val entity = db.bookmarksDao().getBookmark(bookmark.index)
-            db.bookmarksDao().delete(entity)
-            onDelete()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/database/ArianeAbstractDatabase.kt b/app/src/main/java/oppen/ariane/io/database/ArianeAbstractDatabase.kt
new file mode 100644
index 0000000..f5cf97c
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/ArianeAbstractDatabase.kt
@@ -0,0 +1,14 @@
+package oppen.ariane.io.database
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import oppen.ariane.io.database.bookmarks.BookmarkEntity
+import oppen.ariane.io.database.bookmarks.BookmarksDao
+import oppen.ariane.io.database.history.HistoryDao
+import oppen.ariane.io.database.history.HistoryEntity
+
+@Database(entities = [BookmarkEntity::class, HistoryEntity::class], version = 3)
+abstract class ArianeAbstractDatabase: RoomDatabase() {
+    abstract fun bookmarks(): BookmarksDao
+    abstract fun history(): HistoryDao
+}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/database/ArianeDatabase.kt b/app/src/main/java/oppen/ariane/io/database/ArianeDatabase.kt
new file mode 100644
index 0000000..e7e2f3d
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/ArianeDatabase.kt
@@ -0,0 +1,14 @@
+package oppen.ariane.io.database
+
+import android.content.Context
+import androidx.room.Room
+import oppen.ariane.io.database.bookmarks.ArianeBookmarks
+import oppen.ariane.io.database.history.ArianeHistory
+
+class ArianeDatabase(context: Context) {
+
+    private val db: ArianeAbstractDatabase = Room.databaseBuilder(context, ArianeAbstractDatabase::class.java, "ariane_database_v1").build()
+
+    fun bookmarks(): ArianeBookmarks = ArianeBookmarks(db)
+    fun history(): ArianeHistory = ArianeHistory(db)
+}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/database/bookmarks/ArianeBookmarks.kt b/app/src/main/java/oppen/ariane/io/database/bookmarks/ArianeBookmarks.kt
new file mode 100644
index 0000000..e77c020
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/bookmarks/ArianeBookmarks.kt
@@ -0,0 +1,80 @@
+package oppen.ariane.io.database.bookmarks
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import oppen.ariane.io.database.ArianeAbstractDatabase
+import java.net.URI
+
+class ArianeBookmarks(private val db: ArianeAbstractDatabase): BookmarksDatasource {
+
+    override fun get(onBookmarks: (List<BookmarkEntry>) -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            val dbBookmarks = db.bookmarks().getAll()
+            val bookmarks = mutableListOf<BookmarkEntry>()
+
+            dbBookmarks.forEach { bookmarkEntity ->
+                bookmarks.add(
+                    BookmarkEntry(
+                        uid = bookmarkEntity.uid,
+                        label = bookmarkEntity.label ?: "Unknown",
+                        uri = URI.create(bookmarkEntity.uri),
+                        index = bookmarkEntity.uiIndex ?: 0)
+                )
+            }
+            onBookmarks(bookmarks)
+        }
+    }
+
+    override fun add(bookmarkEntry: BookmarkEntry, onAdded: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            val bookmarkEntity = BookmarkEntity(
+                label = bookmarkEntry.label,
+                uri = bookmarkEntry.uri.toString(),
+                uiIndex = bookmarkEntry.index,
+                folder = "~/")
+
+            db.bookmarks().insertAll(bookmarkEntity)
+            onAdded()
+        }
+    }
+
+    override fun moveUp(bookmarkEntry: BookmarkEntry, onMoved: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+
+            //todo - this method is broken:
+            val prev = db.bookmarks().getBookmark(bookmarkEntry.index -1)
+            val target = db.bookmarks().getBookmark(bookmarkEntry.index)
+
+            db.bookmarks().updateUIIndex(prev.uid, bookmarkEntry.index)
+            db.bookmarks().updateUIIndex(target.uid, bookmarkEntry.index - 1)
+            onMoved()
+        }
+    }
+
+    override fun moveDown(bookmarkEntry: BookmarkEntry, onMoved: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            val next = db.bookmarks().getBookmark(bookmarkEntry.index + 1)
+            val target = db.bookmarks().getBookmark(bookmarkEntry.index)
+
+            db.bookmarks().updateUIIndex(next.uid, bookmarkEntry.index)
+            db.bookmarks().updateUIIndex(target.uid, bookmarkEntry.index + 1)
+            onMoved()
+        }
+    }
+
+    override fun update(bookmarkEntry: BookmarkEntry, label: String?, uri: String?, onUpdate: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            db.bookmarks().updateContent(bookmarkEntry.uid, label ?: "", uri ?: "")
+            onUpdate()
+        }
+    }
+
+    override fun delete(bookmarkEntry: BookmarkEntry, onDelete: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            val entity = db.bookmarks().getBookmark(bookmarkEntry.index)
+            db.bookmarks().delete(entity)
+            onDelete()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/bookmarks/BookmarkEntity.kt b/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarkEntity.kt
similarity index 90%
rename from app/src/main/java/oppen/ariane/io/bookmarks/BookmarkEntity.kt
rename to app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarkEntity.kt
index c45dc5d..600f053 100644
--- a/app/src/main/java/oppen/ariane/io/bookmarks/BookmarkEntity.kt
+++ b/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarkEntity.kt
@@ -1,4 +1,4 @@
-package oppen.ariane.io.bookmarks
+package oppen.ariane.io.database.bookmarks
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/java/oppen/ariane/io/bookmarks/Bookmark.kt b/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarkEntry.kt
similarity index 65%
rename from app/src/main/java/oppen/ariane/io/bookmarks/Bookmark.kt
rename to app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarkEntry.kt
index 27b1aa0..400ac56 100644
--- a/app/src/main/java/oppen/ariane/io/bookmarks/Bookmark.kt
+++ b/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarkEntry.kt
@@ -1,8 +1,8 @@
-package oppen.ariane.io.bookmarks
+package oppen.ariane.io.database.bookmarks
 
 import java.net.URI
 
-class Bookmark(
+class BookmarkEntry(
     val uid: Int,
     val label: String,
     val uri: URI,
diff --git a/app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDao.kt b/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarksDao.kt
similarity index 94%
rename from app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDao.kt
rename to app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarksDao.kt
index ea5ee37..b21ba26 100644
--- a/app/src/main/java/oppen/ariane/io/bookmarks/BookmarksDao.kt
+++ b/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarksDao.kt
@@ -1,4 +1,4 @@
-package oppen.ariane.io.bookmarks
+package oppen.ariane.io.database.bookmarks
 
 import androidx.room.*
 
diff --git a/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarksDatasource.kt b/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarksDatasource.kt
new file mode 100644
index 0000000..95fb3dd
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/bookmarks/BookmarksDatasource.kt
@@ -0,0 +1,12 @@
+package oppen.ariane.io.database.bookmarks
+
+interface BookmarksDatasource {
+
+    fun get(onBookmarks: (List<BookmarkEntry>) -> Unit)
+    fun add(bookmarkEntry: BookmarkEntry, onAdded: () -> Unit)
+    fun delete(bookmarkEntry: BookmarkEntry, onDelete: () -> Unit)
+
+    fun moveUp(bookmarkEntry: BookmarkEntry, onMoved: () -> Unit)
+    fun moveDown(bookmarkEntry: BookmarkEntry, onMoved: () -> Unit)
+    fun update(bookmarkEntry: BookmarkEntry, label: String?, uri: String?, onUpdate: () -> Unit)
+}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/database/history/ArianeHistory.kt b/app/src/main/java/oppen/ariane/io/database/history/ArianeHistory.kt
new file mode 100644
index 0000000..2c949b8
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/history/ArianeHistory.kt
@@ -0,0 +1,70 @@
+package oppen.ariane.io.database.history
+
+import android.net.Uri
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import oppen.ariane.io.database.ArianeAbstractDatabase
+
+class ArianeHistory(private val db: ArianeAbstractDatabase): HistoryDatasource {
+
+    override fun get(onHistory: (List<HistoryEntry>) -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            val dbBookmarks = db.history().getAll()
+            val history = mutableListOf<HistoryEntry>()
+
+            dbBookmarks.forEach { entity ->
+                history.add(HistoryEntry(entity.uid, entity.timestamp ?: 0L, Uri.parse(entity.uri)))
+            }
+            onHistory(history)
+        }
+    }
+
+    override fun add(entry: HistoryEntry, onAdded: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            val lastAdded = db.history().getLastAdded()
+            val entity = HistoryEntity(entry.uri.toString(), System.currentTimeMillis())
+
+            when (lastAdded) {
+                null -> db.history().insert(entity)
+                else -> {
+                    when {
+                        lastAdded.uri.toString() != entry.uri.toString() -> db.history().insert(entity)
+                    }
+                }
+            }
+
+            onAdded()
+        }
+    }
+
+    override fun add(uri: Uri, onAdded: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            val lastAdded = db.history().getLastAdded()
+            val entity = HistoryEntity(uri.toString(), System.currentTimeMillis())
+
+            when (lastAdded) {
+                null -> db.history().insert(entity)
+                else -> {
+                    when {
+                        lastAdded.uri.toString() != uri.toString() -> db.history().insert(entity)
+                    }
+                }
+            }
+
+            onAdded()
+        }
+    }
+
+    override fun clear(onClear: () -> Unit) {
+        //todo
+    }
+
+    override fun delete(entry: HistoryEntry, onDelete: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO){
+            val entity = db.history().getEntry(entry.uid)
+            db.history().delete(entity)
+            onDelete()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/database/history/HistoryDao.kt b/app/src/main/java/oppen/ariane/io/database/history/HistoryDao.kt
new file mode 100644
index 0000000..bfbe6c8
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/history/HistoryDao.kt
@@ -0,0 +1,24 @@
+package oppen.ariane.io.database.history
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+
+@Dao
+interface HistoryDao {
+    @Query("SELECT * FROM history ORDER BY timestamp DESC")
+    suspend fun getAll(): List<HistoryEntity>
+
+    @Query("SELECT * FROM history WHERE uid = :uid LIMIT 1")
+    fun getEntry(uid: Int): HistoryEntity
+
+    @Query("SELECT * FROM history ORDER BY timestamp DESC LIMIT 1")
+    fun getLastAdded(): HistoryEntity?
+
+    @Insert
+    fun insert(vararg history: HistoryEntity)
+
+    @Delete
+    fun delete(history: HistoryEntity)
+}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/database/history/HistoryDatasource.kt b/app/src/main/java/oppen/ariane/io/database/history/HistoryDatasource.kt
new file mode 100644
index 0000000..52541f1
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/history/HistoryDatasource.kt
@@ -0,0 +1,12 @@
+package oppen.ariane.io.database.history
+
+import android.net.Uri
+
+interface HistoryDatasource {
+
+    fun get(onHistory: (List<HistoryEntry>) -> Unit)
+    fun add(entry: HistoryEntry, onAdded: () -> Unit)
+    fun add(uri: Uri, onAdded: () -> Unit)
+    fun clear(onClear: () -> Unit)
+    fun delete(entry: HistoryEntry, onDelete: () -> Unit)
+}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/database/history/HistoryEntity.kt b/app/src/main/java/oppen/ariane/io/database/history/HistoryEntity.kt
new file mode 100644
index 0000000..ab6336b
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/history/HistoryEntity.kt
@@ -0,0 +1,14 @@
+package oppen.ariane.io.database.history
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "history")
+class HistoryEntity(
+    @ColumnInfo(name = "uri") val uri: String?,
+    @ColumnInfo(name = "timestamp") val timestamp: Long?
+){
+    @PrimaryKey(autoGenerate = true)
+    var uid: Int = 0
+}
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/database/history/HistoryEntry.kt b/app/src/main/java/oppen/ariane/io/database/history/HistoryEntry.kt
new file mode 100644
index 0000000..8d63e48
--- /dev/null
+++ b/app/src/main/java/oppen/ariane/io/database/history/HistoryEntry.kt
@@ -0,0 +1,9 @@
+package oppen.ariane.io.database.history
+
+import android.net.Uri
+
+class HistoryEntry(
+    val uid: Int,
+    val timestamp: Long,
+    val uri: Uri
+)
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/gemini/Datasource.kt b/app/src/main/java/oppen/ariane/io/gemini/Datasource.kt
index 6652de1..ef8e83c 100644
--- a/app/src/main/java/oppen/ariane/io/gemini/Datasource.kt
+++ b/app/src/main/java/oppen/ariane/io/gemini/Datasource.kt
@@ -2,6 +2,7 @@ package oppen.ariane.io.gemini
 
 import android.content.Context
 import oppen.ariane.io.GemState
+import oppen.ariane.io.database.history.ArianeHistory
 import java.net.URI
 
 interface Datasource {
@@ -11,8 +12,8 @@ interface Datasource {
     fun goBack(onUpdate: (state: GemState) -> Unit)
 
     companion object{
-        fun factory(context: Context): Datasource {
-            return GeminiDatasource(context)
+        fun factory(context: Context, history: ArianeHistory): Datasource {
+            return GeminiDatasource(context, history)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/io/gemini/GeminiDatasource.kt b/app/src/main/java/oppen/ariane/io/gemini/GeminiDatasource.kt
index 0e51e05..fc5c570 100644
--- a/app/src/main/java/oppen/ariane/io/gemini/GeminiDatasource.kt
+++ b/app/src/main/java/oppen/ariane/io/gemini/GeminiDatasource.kt
@@ -6,6 +6,8 @@ import androidx.preference.PreferenceManager
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import oppen.ariane.io.GemState
+import oppen.ariane.io.database.history.ArianeHistory
+import oppen.ariane.io.database.history.HistoryEntry
 import oppen.ariane.io.keymanager.ArianeKeyManager
 import oppen.isGemini
 import oppen.toURI
@@ -18,7 +20,7 @@ import javax.net.ssl.*
 
 const val GEMINI_SCHEME = "gemini"
 
-class GeminiDatasource(private val context: Context): Datasource {
+class GeminiDatasource(private val context: Context, val history: ArianeHistory): Datasource {
 
     private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
     private val addressBuilder = AddressBuilder()
@@ -88,7 +90,7 @@ class GeminiDatasource(private val context: Context): Datasource {
             else -> SSLContext.getInstance(protocol)
         }
 
-        sslContext.init(arianeKeyManager.getFactory()?.keyManagers, DummyTrustManager.get(), null)
+        sslContext.init(arianeKeyManager.getFactory(context)?.keyManagers, DummyTrustManager.get(), null)
         val factory: SSLSocketFactory = sslContext.socketFactory
 
         //todo to here  ----------------------------------------------------------------------------
@@ -140,6 +142,11 @@ class GeminiDatasource(private val context: Context): Datasource {
 
         println("Ariane: response header: $headerLine")
 
+        if(headerLine == null){
+            onUpdate(GemState.ResponseError(GeminiResponse.Header(-2, "Server did not respond with a Gemini header")))
+            return
+        }
+
         val header = GeminiResponse.parseHeader(headerLine)
 
         when {
@@ -197,6 +204,8 @@ class GeminiDatasource(private val context: Context): Datasource {
             runtimeHistory.add(uri)
             println("Ariane added $uri to runtime history (size ${runtimeHistory.size})")
         }
+
+        history.add(uri.toUri()){}
     }
 
     private fun getString(socket: SSLSocket?, uri: URI, header: GeminiResponse.Header, onUpdate: (state: GemState) -> Unit){
diff --git a/app/src/main/java/oppen/ariane/io/keymanager/ArianeKeyManager.kt b/app/src/main/java/oppen/ariane/io/keymanager/ArianeKeyManager.kt
index 3e71d60..ae95608 100644
--- a/app/src/main/java/oppen/ariane/io/keymanager/ArianeKeyManager.kt
+++ b/app/src/main/java/oppen/ariane/io/keymanager/ArianeKeyManager.kt
@@ -1,7 +1,7 @@
 package oppen.ariane.io.keymanager
 
-import android.R
 import android.content.Context
+import oppen.ariane.R
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.security.KeyStore
@@ -17,7 +17,7 @@ class ArianeKeyManager {
         val hasLoadedKey = false
         return when {
             hasLoadedKey -> {
-                val keyStore: KeyStore = KeyStore.getInstance("BKS")
+                val keyStore: KeyStore = KeyStore.getInstance("BKS")//or "pkcs12"v?
                 val inputStream: InputStream = ByteArrayInputStream("dummy".toByteArray())
                 keyStore.load(inputStream, "yourKeyStorePassword".toCharArray())
                 inputStream.close()
@@ -30,4 +30,14 @@ class ArianeKeyManager {
             else -> null
         }
     }
+
+    fun getFactoryDemo(context: Context): KeyManagerFactory? {
+        val keyStore: KeyStore = KeyStore.getInstance("pkcs12")//or "pkcs12"v?
+        keyStore.load(context.resources.openRawResource(R.raw.cert), "PASSWORD".toCharArray())
+
+        val keyManagerFactory: KeyManagerFactory = KeyManagerFactory.getInstance("X509")
+        keyManagerFactory.init(keyStore, "PASSWORD".toCharArray())
+
+        return keyManagerFactory
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/ui/GemActivity.kt b/app/src/main/java/oppen/ariane/ui/GemActivity.kt
index 2133dd4..3538a63 100644
--- a/app/src/main/java/oppen/ariane/ui/GemActivity.kt
+++ b/app/src/main/java/oppen/ariane/ui/GemActivity.kt
@@ -2,7 +2,6 @@ package oppen.ariane.ui
 
 import android.app.DownloadManager
 import android.content.ActivityNotFoundException
-import android.content.DialogInterface
 import android.content.Intent
 import android.media.MediaPlayer
 import android.net.Uri
@@ -19,11 +18,11 @@ import oppen.ariane.Ariane
 import oppen.ariane.R
 import oppen.ariane.databinding.ActivityGemBinding
 import oppen.ariane.io.GemState
-import oppen.ariane.io.bookmarks.BookmarksDatasource
+import oppen.ariane.io.database.ArianeDatabase
+import oppen.ariane.io.database.bookmarks.BookmarksDatasource
 import oppen.ariane.io.gemini.Datasource
 import oppen.ariane.io.gemini.GeminiResponse
 import oppen.ariane.io.gemini.RuntimeCache
-import oppen.ariane.io.history.uris.HistoryInterface
 import oppen.ariane.ui.audio_player.AudioPlayer
 import oppen.ariane.ui.bookmarks.BookmarkDialog
 import oppen.ariane.ui.bookmarks.BookmarksDialog
@@ -36,7 +35,6 @@ import oppen.ariane.ui.modals_menus.input.InputDialog
 import oppen.ariane.ui.modals_menus.overflow.OverflowPopup
 import oppen.ariane.ui.settings.SettingsActivity
 import oppen.hideKeyboard
-import oppen.toURI
 import oppen.visibleRetainingSpace
 import java.io.File
 import java.io.FileInputStream
@@ -50,14 +48,12 @@ const val CREATE_BINARY_FILE_REQ = 630
 class GemActivity : AppCompatActivity() {
 
     private var inSearch = false
-
     private val mediaPlayer = MediaPlayer()
 
     private lateinit var bookmarkDatasource: BookmarksDatasource
-
     private val model by viewModels<GemViewModel>()
     private lateinit var binding: ActivityGemBinding
-    private lateinit var history: HistoryInterface
+
     private val adapter = GemtextAdapter { adapter, uri, longTap, position: Int, view ->
         if(longTap){
             LinkPopup.show(view, uri){ menuId ->
@@ -89,6 +85,7 @@ class GemActivity : AppCompatActivity() {
                 binding.addressEdit.hint = getString(R.string.main_input_hint)
                 inSearch = false
             }
+
             model.request(uri)
         }
     }
@@ -96,7 +93,8 @@ class GemActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        bookmarkDatasource = BookmarksDatasource.getDefault(applicationContext)
+        val db = ArianeDatabase(applicationContext)
+        bookmarkDatasource = db.bookmarks()
 
         binding = DataBindingUtil.setContentView(this, R.layout.activity_gem)
         binding.viewmodel = model
@@ -105,52 +103,11 @@ class GemActivity : AppCompatActivity() {
         binding.gemtextRecycler.layoutManager = LinearLayoutManager(this)
         binding.gemtextRecycler.adapter = adapter
 
-        history = HistoryInterface.default(this)
-
         model.initialise(
             home = PreferenceManager.getDefaultSharedPreferences(this).getString("home_capsule", Ariane.DEFAULT_HOME_CAPSULE) ?: Ariane.DEFAULT_HOME_CAPSULE,
-            gemini = Datasource.factory(this),
-            bookmarks = BookmarksDatasource.getDefault(applicationContext)
-        ){ state ->
-
-            binding.pullToRefresh.isRefreshing = false
-
-            when(state){
-                is GemState.AppQuery -> runOnUiThread { showAlert("App backdoor/query not implemented yet") }
-                is GemState.ResponseInput -> runOnUiThread {
-                    loadingView(false)
-                    InputDialog.show(this, state) { queryAddress ->
-                        model.request(queryAddress)
-                    }
-                }
-                is GemState.Requesting -> loadingView(true)
-                is GemState.NotGeminiRequest -> externalProtocol(state)
-                is GemState.ResponseError -> showAlert("${GeminiResponse.getCodeString(state.header.code)}: ${state.header.meta}")
-                is GemState.ResponseGemtext -> renderGemtext(state)
-                is GemState.ResponseText -> renderText(state)
-                is GemState.ResponseImage -> renderImage(state)
-                is GemState.ResponseAudio -> renderAudio(state)
-                is GemState.ResponseBinary -> renderBinary(state)
-                is GemState.Blank -> {
-                    binding.addressEdit.setText("")
-                    adapter.render(arrayListOf())
-                }
-                is GemState.ResponseUnknownMime -> {
-                    runOnUiThread {
-                        loadingView(false)
-                        AlertDialog.Builder(this, R.style.AppDialogTheme)
-                            .setTitle(R.string.unknown_mime_dialog_title)
-                            .setMessage("Address: ${state.uri}\nMeta: ${state.header.meta}")
-                            .setPositiveButton("Download") { _, _ ->
-                                loadingView(true)
-                                model.requestBinaryDownload(state.uri)
-                            }
-                            .setNegativeButton("Cancel") { _, _ -> }
-                            .show()
-                    }
-                }
-            }
-        }
+            gemini = Datasource.factory(this, db.history()),
+            db = db,
+            onState = this::handleState)
 
         binding.addressEdit.setOnEditorActionListener { _, actionId, _ ->
             when (actionId) {
@@ -210,7 +167,7 @@ class GemActivity : AppCompatActivity() {
                             startActivity(Intent.createChooser(this, null))
                         }
                     }
-                    R.id.overflow_menu_history -> HistoryDialog.show(this) { historyAddress ->
+                    R.id.overflow_menu_history -> HistoryDialog.show(this, db.history()) { historyAddress ->
                         model.request(historyAddress)
                     }
                     R.id.overflow_menu_about -> AboutDialog.show(this)
@@ -235,6 +192,46 @@ class GemActivity : AppCompatActivity() {
         checkIntentExtras(intent)
     }
 
+    private fun handleState(state: GemState) {
+        binding.pullToRefresh.isRefreshing = false
+
+        when (state) {
+            is GemState.AppQuery -> runOnUiThread { showAlert("App backdoor/query not implemented yet") }
+            is GemState.ResponseInput -> runOnUiThread {
+                loadingView(false)
+                InputDialog.show(this, state) { queryAddress ->
+                    model.request(queryAddress)
+                }
+            }
+            is GemState.Requesting -> loadingView(true)
+            is GemState.NotGeminiRequest -> externalProtocol(state)
+            is GemState.ResponseError -> showAlert("${GeminiResponse.getCodeString(state.header.code)}: ${state.header.meta}")
+            is GemState.ResponseGemtext -> renderGemtext(state)
+            is GemState.ResponseText -> renderText(state)
+            is GemState.ResponseImage -> renderImage(state)
+            is GemState.ResponseAudio -> renderAudio(state)
+            is GemState.ResponseBinary -> renderBinary(state)
+            is GemState.Blank -> {
+                binding.addressEdit.setText("")
+                adapter.render(arrayListOf())
+            }
+            is GemState.ResponseUnknownMime -> {
+                runOnUiThread {
+                    loadingView(false)
+                    AlertDialog.Builder(this, R.style.AppDialogTheme)
+                        .setTitle(R.string.unknown_mime_dialog_title)
+                        .setMessage("Address: ${state.uri}\nMeta: ${state.header.meta}")
+                        .setPositiveButton("Download") { _, _ ->
+                            loadingView(true)
+                            model.requestBinaryDownload(state.uri)
+                        }
+                        .setNegativeButton("Cancel") { _, _ -> }
+                        .show()
+                }
+            }
+        }
+    }
+
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
 
@@ -305,8 +302,6 @@ class GemActivity : AppCompatActivity() {
         binding.gemtextRecycler.post {
             binding.gemtextRecycler.scrollToPosition(0)
         }
-
-        history.add(state.uri.toString())
     }
 
     private fun renderText(state: GemState.ResponseText) = runOnUiThread {
@@ -401,10 +396,14 @@ class GemActivity : AppCompatActivity() {
         if(visible) binding.appBar.setExpanded(true)
     }
 
-    @ExperimentalStdlibApi
     override fun onBackPressed() {
         if(model.canGoBack()){
-            model.goBack()
+            model.goBack{ state ->
+                /*
+                    Passing the callback here so we can eventually add a mechanism to restore scroll position
+                */
+                handleState(state)
+            }
         }else{
             println("Ariane history is empty - exiting")
             super.onBackPressed()
diff --git a/app/src/main/java/oppen/ariane/ui/GemViewModel.kt b/app/src/main/java/oppen/ariane/ui/GemViewModel.kt
index 29f786c..197cff3 100644
--- a/app/src/main/java/oppen/ariane/ui/GemViewModel.kt
+++ b/app/src/main/java/oppen/ariane/ui/GemViewModel.kt
@@ -2,21 +2,21 @@ package oppen.ariane.ui
 
 import android.net.Uri
 import androidx.lifecycle.ViewModel
-import oppen.ariane.Ariane
 import oppen.ariane.io.gemini.Datasource
 import oppen.ariane.io.GemState
-import oppen.ariane.io.bookmarks.BookmarksDatasource
+import oppen.ariane.io.database.ArianeDatabase
+import oppen.ariane.io.database.bookmarks.BookmarksDatasource
 import java.net.URI
 
 class GemViewModel: ViewModel() {
 
     private lateinit var gemini: Datasource
-    private lateinit var bookmarks: BookmarksDatasource
+    private lateinit var db: ArianeDatabase
     private var onState: (state: GemState) -> Unit = {}
 
-    fun initialise(home: String, gemini: Datasource, bookmarks: BookmarksDatasource, onState: (state: GemState) -> Unit){
+    fun initialise(home: String, gemini: Datasource, db: ArianeDatabase, onState: (state: GemState) -> Unit){
         this.gemini = gemini
-        this.bookmarks = bookmarks
+        this.db = db
         this.onState = onState
 
         request(home)
@@ -49,5 +49,5 @@ class GemViewModel: ViewModel() {
     }
 
     fun canGoBack(): Boolean = gemini.canGoBack()
-    fun goBack() = gemini.goBack(onState)
+    fun goBack(onGoBack: (state: GemState) -> Unit) = gemini.goBack(onGoBack)
 }
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarkDialog.kt b/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarkDialog.kt
index 7719ad0..eded755 100644
--- a/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarkDialog.kt
+++ b/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarkDialog.kt
@@ -7,8 +7,8 @@ import android.view.View
 import androidx.appcompat.app.AppCompatDialog
 import kotlinx.android.synthetic.main.fragment_bookmark_dialog.view.*
 import oppen.ariane.R
-import oppen.ariane.io.bookmarks.Bookmark
-import oppen.ariane.io.bookmarks.BookmarksDatasource
+import oppen.ariane.io.database.bookmarks.BookmarkEntry
+import oppen.ariane.io.database.bookmarks.BookmarksDatasource
 import java.net.URI
 
 
@@ -55,7 +55,7 @@ class BookmarkDialog(
 
                         bookmarkDatasource.add(
 
-                            Bookmark(
+                            BookmarkEntry(
                                 uid = -1,
                                 label = view.bookmark_name.text.toString(),
                                 uri = URI.create(view.bookmark_uri.text.toString()),
diff --git a/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarksAdapter.kt b/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarksAdapter.kt
index 8789c2f..95026b2 100644
--- a/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarksAdapter.kt
+++ b/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarksAdapter.kt
@@ -6,18 +6,18 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.bookmark.view.*
 import oppen.ariane.R
-import oppen.ariane.io.bookmarks.Bookmark
+import oppen.ariane.io.database.bookmarks.BookmarkEntry
 import oppen.visible
 
-class BookmarksAdapter(val onBookmark: (bookmark: Bookmark) -> Unit, val onOverflow: (view: View, bookmark: Bookmark, isFirst: Boolean, isLast: Boolean) -> Unit): RecyclerView.Adapter<BookmarksAdapter.ViewHolder>() {
+class BookmarksAdapter(val onBookmark: (bookmarkEntry: BookmarkEntry) -> Unit, val onOverflow: (view: View, bookmarkEntry: BookmarkEntry, isFirst: Boolean, isLast: Boolean) -> Unit): RecyclerView.Adapter<BookmarksAdapter.ViewHolder>() {
 
-    val bookmarks = mutableListOf<Bookmark>()
+    val bookmarks = mutableListOf<BookmarkEntry>()
 
     class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
-    fun update(bookmarks: List<Bookmark>){
+    fun update(bookmarkEntries: List<BookmarkEntry>){
         this.bookmarks.clear()
-        this.bookmarks.addAll(bookmarks)
+        this.bookmarks.addAll(bookmarkEntries)
         notifyDataSetChanged()
     }
 
@@ -51,19 +51,19 @@ class BookmarksAdapter(val onBookmark: (bookmark: Bookmark) -> Unit, val onOverf
 
     override fun getItemCount(): Int = bookmarks.size
 
-    fun hide(bookmark: Bookmark) {
-        bookmark.visible = false
-        notifyItemChanged(bookmarks.indexOf(bookmark))
+    fun hide(bookmarkEntry: BookmarkEntry) {
+        bookmarkEntry.visible = false
+        notifyItemChanged(bookmarks.indexOf(bookmarkEntry))
     }
 
-    fun show(bookmark: Bookmark) {
-        bookmark.visible = true
-        notifyItemChanged(bookmarks.indexOf(bookmark))
+    fun show(bookmarkEntry: BookmarkEntry) {
+        bookmarkEntry.visible = true
+        notifyItemChanged(bookmarks.indexOf(bookmarkEntry))
     }
 
-    fun remove(bookmark: Bookmark){
-        val index = bookmarks.indexOf(bookmark)
-        bookmarks.remove(bookmark)
+    fun remove(bookmarkEntry: BookmarkEntry){
+        val index = bookmarks.indexOf(bookmarkEntry)
+        bookmarks.remove(bookmarkEntry)
         notifyItemRemoved(index)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarksDialog.kt b/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarksDialog.kt
index 7c12fbe..620df92 100644
--- a/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarksDialog.kt
+++ b/app/src/main/java/oppen/ariane/ui/bookmarks/BookmarksDialog.kt
@@ -11,15 +11,15 @@ import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.dialog_bookmarks.view.*
 import oppen.ariane.R
-import oppen.ariane.io.bookmarks.Bookmark
-import oppen.ariane.io.bookmarks.BookmarksDatasource
+import oppen.ariane.io.database.bookmarks.BookmarkEntry
+import oppen.ariane.io.database.bookmarks.BookmarksDatasource
 import oppen.visible
 
 
 class BookmarksDialog(
     context: Context,
     private val bookmarkDatasource: BookmarksDatasource,
-    onBookmark: (bookmark: Bookmark) -> Unit): AppCompatDialog(context, R.style.FSDialog) {
+    onBookmark: (bookmarkEntry: BookmarkEntry) -> Unit): AppCompatDialog(context, R.style.FSDialog) {
 
     var bookmarksAdapter: BookmarksAdapter
 
@@ -82,9 +82,9 @@ class BookmarksDialog(
         }
     }
 
-    private fun edit(bookmark: Bookmark){
-        BookmarkDialog(context, BookmarkDialog.mode_edit, null, bookmark.uri.toString(), bookmark.label){ label, uri ->
-            bookmarkDatasource.update(bookmark, label, uri){
+    private fun edit(bookmarkEntry: BookmarkEntry){
+        BookmarkDialog(context, BookmarkDialog.mode_edit, null, bookmarkEntry.uri.toString(), bookmarkEntry.label){ label, uri ->
+            bookmarkDatasource.update(bookmarkEntry, label, uri){
                 bookmarkDatasource.get {bookmarks ->
                     Handler(Looper.getMainLooper()).post {
                         bookmarksAdapter.update(bookmarks)
@@ -99,15 +99,15 @@ class BookmarksDialog(
      * Bookmark isn't actually deleted from the DB until the Snackbar disappears. Which is nice.
      *
      */
-    private fun delete(bookmark: Bookmark){
+    private fun delete(bookmarkEntry: BookmarkEntry){
         //OnDelete
-        bookmarksAdapter.hide(bookmark)
-        Snackbar.make(view, "Deleted ${bookmark.label}", Snackbar.LENGTH_SHORT).addCallback(object: Snackbar.Callback() {
+        bookmarksAdapter.hide(bookmarkEntry)
+        Snackbar.make(view, "Deleted ${bookmarkEntry.label}", Snackbar.LENGTH_SHORT).addCallback(object: Snackbar.Callback() {
             override fun onDismissed(transientBottomBar: Snackbar?, event: Int) = when (event) {
-                BaseTransientBottomBar.BaseCallback.DISMISS_EVENT_ACTION -> bookmarksAdapter.show(bookmark)
-                else -> bookmarkDatasource.delete(bookmark){
+                BaseTransientBottomBar.BaseCallback.DISMISS_EVENT_ACTION -> bookmarksAdapter.show(bookmarkEntry)
+                else -> bookmarkDatasource.delete(bookmarkEntry){
                     Handler(Looper.getMainLooper()).post {
-                        bookmarksAdapter.remove(bookmark)
+                        bookmarksAdapter.remove(bookmarkEntry)
                     }
                 }
             }
@@ -116,8 +116,8 @@ class BookmarksDialog(
         }.show()
     }
 
-    private fun moveUp(bookmark: Bookmark){
-        bookmarkDatasource.moveUp(bookmark){
+    private fun moveUp(bookmarkEntry: BookmarkEntry){
+        bookmarkDatasource.moveUp(bookmarkEntry){
             bookmarkDatasource.get { bookmarks ->
                 Handler(Looper.getMainLooper()).post {
                     bookmarksAdapter.update(bookmarks)
@@ -126,8 +126,8 @@ class BookmarksDialog(
         }
     }
 
-    private fun moveDown(bookmark: Bookmark){
-        bookmarkDatasource.moveDown(bookmark){
+    private fun moveDown(bookmarkEntry: BookmarkEntry){
+        bookmarkDatasource.moveDown(bookmarkEntry){
             bookmarkDatasource.get { bookmarks ->
                 Handler(Looper.getMainLooper()).post {
                     bookmarksAdapter.update(bookmarks)
diff --git a/app/src/main/java/oppen/ariane/ui/modals_menus/history/HistoryAdapter.kt b/app/src/main/java/oppen/ariane/ui/modals_menus/history/HistoryAdapter.kt
index 9a1c7bc..36cd767 100644
--- a/app/src/main/java/oppen/ariane/ui/modals_menus/history/HistoryAdapter.kt
+++ b/app/src/main/java/oppen/ariane/ui/modals_menus/history/HistoryAdapter.kt
@@ -7,8 +7,9 @@ import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.row_history.view.*
 import oppen.delay
 import oppen.ariane.R
+import oppen.ariane.io.database.history.HistoryEntry
 
-class HistoryAdapter(val history: List<String>, val onClick:(address: String) -> Unit): RecyclerView.Adapter<HistoryAdapter.ViewHolder>() {
+class HistoryAdapter(val history: List<HistoryEntry>, val onClick:(entry: HistoryEntry) -> Unit): RecyclerView.Adapter<HistoryAdapter.ViewHolder>() {
 
     class ViewHolder(view: View): RecyclerView.ViewHolder(view)
 
@@ -19,7 +20,7 @@ class HistoryAdapter(val history: List<String>, val onClick:(address: String) ->
     override fun getItemCount(): Int = history.size
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.itemView.history_address.text = history[position]
+        holder.itemView.history_address.text = history[position].uri.toString()
         holder.itemView.history_row.setOnClickListener {
             delay(500){
                 onClick(history[holder.adapterPosition])
diff --git a/app/src/main/java/oppen/ariane/ui/modals_menus/history/HistoryDialog.kt b/app/src/main/java/oppen/ariane/ui/modals_menus/history/HistoryDialog.kt
index 32872dc..060f76a 100644
--- a/app/src/main/java/oppen/ariane/ui/modals_menus/history/HistoryDialog.kt
+++ b/app/src/main/java/oppen/ariane/ui/modals_menus/history/HistoryDialog.kt
@@ -1,6 +1,8 @@
 package oppen.ariane.ui.modals_menus.history
 
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import android.view.MenuInflater
 import android.view.View
 import android.widget.Toast
@@ -11,14 +13,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.dialog_about.view.close_tab_dialog
 import kotlinx.android.synthetic.main.dialog_history.view.*
 import oppen.ariane.R
+import oppen.ariane.io.database.history.ArianeHistory
 import oppen.ariane.io.gemini.RuntimeCache
-import oppen.ariane.io.history.uris.HistoryInterface
 
 object HistoryDialog {
-    fun show(context: Context, onHistoryItem: (address: String) -> Unit){
-        val historyCache = HistoryInterface.default(context)
-        val history = historyCache.get()
-
+    fun show(context: Context, history: ArianeHistory, onHistoryItem: (address: String) -> Unit){
         val dialog = AppCompatDialog(context, R.style.AppTheme)
 
         val view = View.inflate(context, R.layout.dialog_history, null)
@@ -34,9 +33,10 @@ object HistoryDialog {
             inflater.inflate(R.menu.history_overflow_menu, popup.menu)
             popup.setOnMenuItemClickListener { menuItem ->
                 if(menuItem.itemId == R.id.history_overflow_clear_history){
-                    historyCache.clear()
-                    dialog.dismiss()
-                    Toast.makeText(context, "History cleared", Toast.LENGTH_SHORT).show()
+                    history.clear {
+                        dialog.dismiss()
+                        Toast.makeText(context, "History cleared", Toast.LENGTH_SHORT).show()
+                    }
                 }else if(menuItem.itemId == R.id.history_overflow_clear_runtime_cache){
                     RuntimeCache.clear()
                     dialog.dismiss()
@@ -49,12 +49,16 @@ object HistoryDialog {
         }
 
         view.history_recycler.layoutManager = LinearLayoutManager(context)
-        view.history_recycler.adapter = HistoryAdapter(history.asReversed()){ address ->
-            onHistoryItem(address)
-            dialog.dismiss()
+
+        history.get { history ->
+           Handler(Looper.getMainLooper()).post {
+               view.history_recycler.adapter = HistoryAdapter(history) { entry ->
+                   onHistoryItem(entry.uri.toString())
+                   dialog.dismiss()
+               }
+
+               dialog.show()
+           }
         }
-
-        dialog.show()
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/raw/cert.pfx b/app/src/main/res/raw/cert.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..142dbb03aa0a6cb6a0790ee47e1f9685efe215e0
GIT binary patch
literal 3941
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

literal 0
HcmV?d00001