From 6082f84e138256b3f1295528f6e25aa2576822ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Fern=C3=A1ndez?= <paziusss@gmail.com>
Date: Mon, 14 Oct 2019 01:25:32 +0200
Subject: [PATCH] remove unused ANDROID_FONT_DIR and update defaults.spec

---
 defaults.lua                |  3 ---
 spec/unit/defaults_spec.lua | 38 ++++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/defaults.lua b/defaults.lua
index 9d05a4e89..e9f5eae8b 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -234,9 +234,6 @@ NETWORK_PROXY = nil
 -- Use turbo library to handle async HTTP request
 DUSE_TURBO_LIB = false
 
--- Custom font dir for Android
-ANDROID_FONT_DIR = "/system/fonts;/sdcard/koreader/fonts"
-
 -- ####################################################################
 -- following features are not supported right now
 -- ####################################################################
diff --git a/spec/unit/defaults_spec.lua b/spec/unit/defaults_spec.lua
index 34fa7c7bb..5eec8bd19 100644
--- a/spec/unit/defaults_spec.lua
+++ b/spec/unit/defaults_spec.lua
@@ -8,8 +8,8 @@ describe("defaults module", function()
 
     it("should load all defaults from defaults.lua", function()
         Defaults:init()
-        assert.is_same(112, #Defaults.defaults_name)
-        assert.is_same("DFULL_SCREEN", Defaults.defaults_name[57])
+        assert.is_same(111, #Defaults.defaults_name)
+        assert.is_same("DFULL_SCREEN", Defaults.defaults_name[56])
     end)
 
     it("should save changes to defaults.persistent.lua", function()
@@ -17,18 +17,18 @@ describe("defaults module", function()
         os.remove(persistent_filename)
 
         -- not in persistent but checked in defaults
-        Defaults.changed[21] = true
-        Defaults.changed[48] = true
-        Defaults.changed[57] = true
-        Defaults.changed[91] = true
-        Defaults.changed[107] = true
+        Defaults.changed[20] = true
+        Defaults.changed[47] = true
+        Defaults.changed[56] = true
+        Defaults.changed[90] = true
+        Defaults.changed[106] = true
         Defaults:saveSettings()
-        assert.is_same(112, #Defaults.defaults_name)
-        assert.is_same("DFULL_SCREEN", Defaults.defaults_name[57])
-        assert.is_same("SEARCH_LIBRARY_PATH", Defaults.defaults_name[107])
-        assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[91])
-        assert.is_same("DCREREADER_CONFIG_WORD_GAP_LARGE", Defaults.defaults_name[48])
-        assert.is_same("DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE", Defaults.defaults_name[21])
+        assert.is_same(111, #Defaults.defaults_name)
+        assert.is_same("DFULL_SCREEN", Defaults.defaults_name[56])
+        assert.is_same("SEARCH_LIBRARY_PATH", Defaults.defaults_name[106])
+        assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[90])
+        assert.is_same("DCREREADER_CONFIG_WORD_GAP_LARGE", Defaults.defaults_name[47])
+        assert.is_same("DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE", Defaults.defaults_name[20])
         local fd = io.open(persistent_filename, "r")
         assert.Equals(
 [[-- For configuration changes that persists between updates
@@ -51,10 +51,10 @@ DFULL_SCREEN = 1
 
         -- in persistent
         Defaults:init()
-        Defaults.changed[57] = true
-        Defaults.defaults_value[57] = 2
-        Defaults.changed[91] = true
-        Defaults.defaults_value[91] = {
+        Defaults.changed[56] = true
+        Defaults.defaults_value[56] = 2
+        Defaults.changed[90] = true
+        Defaults.defaults_value[90] = {
             y = 10,
             x = 10.125,
             h = 20.25,
@@ -100,8 +100,8 @@ DHINTCOUNT = 2
 
         -- in persistent
         Defaults:init()
-        Defaults.changed[57] = true
-        Defaults.defaults_value[57] = 1
+        Defaults.changed[56] = true
+        Defaults.defaults_value[56] = 1
         Defaults:saveSettings()
         fd = io.open(persistent_filename)
         assert.Equals(