diff --git a/frontend/apps/cloudstorage/cloudstorage.lua b/frontend/apps/cloudstorage/cloudstorage.lua index 988e162d2..8d744ea55 100644 --- a/frontend/apps/cloudstorage/cloudstorage.lua +++ b/frontend/apps/cloudstorage/cloudstorage.lua @@ -3,14 +3,14 @@ local ButtonDialogTitle = require("ui/widget/buttondialogtitle") local ConfirmBox = require("ui/widget/confirmbox") local DataStorage = require("datastorage") local DropBox = require("apps/cloudstorage/dropbox") -local InfoMessage = require("ui/widget/infomessage") local Ftp = require("apps/cloudstorage/ftp") -local Menu = require("ui/widget/menu") +local InfoMessage = require("ui/widget/infomessage") local LuaSettings = require("luasettings") -local Screen = require("device").screen +local Menu = require("ui/widget/menu") local UIManager = require("ui/uimanager") local lfs = require("libs/libkoreader-lfs") local _ = require("gettext") +local Screen = require("device").screen local CloudStorage = Menu:extend{ cloud_servers = { @@ -21,8 +21,6 @@ local CloudStorage = Menu:extend{ editable = false, }, }, - width = Screen:getWidth(), - height = Screen:getHeight(), no_title = false, show_parent = nil, is_popout = false, @@ -35,6 +33,8 @@ function CloudStorage:init() self.title = "Cloud Storage" self.show_parent = self self.item_table = self:genItemTableFromRoot() + self.width = Screen:getWidth() + self.height = Screen:getHeight() Menu.init(self) end diff --git a/frontend/apps/cloudstorage/dropboxapi.lua b/frontend/apps/cloudstorage/dropboxapi.lua index 1f70642d6..85326a86a 100644 --- a/frontend/apps/cloudstorage/dropboxapi.lua +++ b/frontend/apps/cloudstorage/dropboxapi.lua @@ -1,11 +1,11 @@ -local url = require('socket.url') -local socket = require('socket') +local DocumentRegistry = require("document/documentregistry") +local JSON = require("json") local http = require('socket.http') local https = require('ssl.https') local ltn12 = require('ltn12') +local socket = require('socket') +local url = require('socket.url') local _ = require("gettext") -local JSON = require("json") -local DocumentRegistry = require("document/documentregistry") local DropBoxApi = { } @@ -95,7 +95,7 @@ function DropBoxApi:listFolder(path, token) local dropbox_file = {} local tag, text local ls_dropbox = self:fetchListFolders(path, token) - if ls_dropbox == nil then return false end + if ls_dropbox == nil or ls_dropbox.entries == nil then return false end for _, files in ipairs(ls_dropbox.entries) do text = files.name tag = files[".tag"]