android: unbreak KO on scoped storage devices

This commit is contained in:
Martín Fernández
2019-12-10 22:26:45 +01:00
parent 794598c1e9
commit f9a820d682
2 changed files with 6 additions and 2 deletions

View File

@@ -11,7 +11,7 @@ function DataStorage:getDataDir()
if data_dir then return data_dir end
if isAndroid then
data_dir = android.externalStorage() .. "/koreader"
data_dir = android.getExternalStoragePath() .. "/koreader"
elseif os.getenv("UBUNTU_APPLICATION_ISOLATION") then
local app_id = os.getenv("APP_ID")
local package_name = app_id:match("^(.-)_")

View File

@@ -20,7 +20,11 @@ local function getCodename()
local api = android.app.activity.sdkVersion
local codename = ""
if api > 27 then
if api > 29 then
codename = "R"
elseif api == 29 then
codename = "Q"
elseif api == 28 then
codename = "Pie"
elseif api == 27 or api == 26 then
codename = "Oreo"