From 11c65b629283633115b41b568298efcc6f816408 Mon Sep 17 00:00:00 2001 From: Joshua <8Joshua@web.de> Date: Thu, 11 Oct 2018 14:17:29 +0200 Subject: [PATCH] =?UTF-8?q?Resourcen=20auto=20login=20pr=C3=BCfung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuplanner/services/KVV/KVVModuleList.java | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java index c04ac89..5e52a2a 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java @@ -543,19 +543,26 @@ class KVVModuleList extends HTTPService { return; } get(url, token.getCookies(), response ->{ - String pfad=""; - if (response.getParsed()==null){//Prüfen ob Datei wirklich heruntergeladen wurde - log.d("ResourceFile erneut einlogen"); - //todo testLogin(token, token -> callback.onResponse(root), errorCallback); - } - else { - if (isExternalStorageWritable()){//Datei Speichern, falls schreibrechte - pfad=saveFileInDownloads(Filename, response, moduleName); - } + final String[] pfad = {""}; + + + if (response.getParsed()==null) + testLogin(token, token -> { + if (isExternalStorageWritable()) { + pfad[0] = saveFileInDownloads(Filename, response, moduleName); + callback.onResponse(pfad[0]); + } else { + errorCallback.onError(new NetworkError(101703, 403, "Exgternal storage not writeable!")); + } + }, errorCallback); + else if (isExternalStorageWritable()) { + pfad[0] = saveFileInDownloads(Filename, response, moduleName); + log.d("ResourceFile: ", token); + callback.onResponse(pfad[0]); + } else { + errorCallback.onError(new NetworkError(101704, 403, "Exgternal storage not writeable!")); } - //log.d("ResourceFile: ", token); - callback.onResponse(pfad); }, error -> errorCallback.onError(new NetworkError(101702, error.networkResponse.statusCode, "Cannot get File!")));