diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java index 9a203b8..3a58e18 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java @@ -84,9 +84,10 @@ public class ModDetailAnnounceFragment extends Fragment implements Download.OnDo private void refresh(boolean forceRefresh) { if (mListener == null) return; - mListener.getKVV().modules().announcements().recv(mItemPos, success -> { - adapter.setModule(success); - swipeLayout.setRefreshing(false); + mListener.getKVV().modules().details().recv(mItemPos, pair -> { + adapter.setModule(pair.first); + if (pair.second) + swipeLayout.setRefreshing(false); }, error -> { swipeLayout.setRefreshing(false); log.e(error); diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java index 8706804..d643389 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java @@ -84,9 +84,10 @@ public class ModDetailAssignmentFragment extends Fragment implements Download.On private void refresh(boolean forceRefresh) { if (mListener == null) return; - mListener.getKVV().modules().assignments().recv(mItemPos, success -> { - adapter.setModule(success); - swipeLayout.setRefreshing(false); + mListener.getKVV().modules().details().recv(mItemPos, pair -> { + adapter.setModule(pair.first); + if (pair.second) + swipeLayout.setRefreshing(false); }, error -> { swipeLayout.setRefreshing(false); log.e(error); @@ -95,7 +96,6 @@ public class ModDetailAssignmentFragment extends Fragment implements Download.On @Override public void request(String title, String url) { - log.d(title, url, mListener); if (mListener == null) return; mListener.getKVV().modules().list().find(mItemPos, (Modules.Module module) -> { diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventFragment.java index c5346c5..5d9de4a 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventFragment.java @@ -83,9 +83,10 @@ public class ModDetailEventFragment extends Fragment { private void refresh(boolean forceRefresh) { if (mListener == null) return; - mListener.getKVV().modules().events().recv(mItemPos, success -> { - adapter.setModule(success); - swipeLayout.setRefreshing(false); + mListener.getKVV().modules().details().recv(mItemPos, pair -> { + adapter.setModule(pair.first); + if (pair.second) + swipeLayout.setRefreshing(false); }, error -> { swipeLayout.setRefreshing(false); log.e(error); diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookFragment.java index 69ee5f8..43db94e 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookFragment.java @@ -83,9 +83,10 @@ public class ModDetailGradebookFragment extends Fragment { private void refresh(boolean forceRefresh) { if (mListener == null) return; - mListener.getKVV().modules().gradebook().recv(mItemPos, success -> { - adapter.setModule(success); - swipeLayout.setRefreshing(false); + mListener.getKVV().modules().details().recv(mItemPos, pair -> { + adapter.setModule(pair.first); + if (pair.second) + swipeLayout.setRefreshing(false); }, error -> { swipeLayout.setRefreshing(false); log.e(error); diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java index ed73214..03af68a 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java @@ -140,9 +140,10 @@ public class ModDetailResourceFragment extends Fragment { private void refresh(boolean forceRefresh) { if (mListener == null) return; - mListener.getKVV().modules().assignments().recv(mItemPos, success -> { - adapter.setModule(success); - swipeLayout.setRefreshing(false); + mListener.getKVV().modules().details().recv(mItemPos, pair -> { + adapter.setModule(pair.first); + if (pair.second) + swipeLayout.setRefreshing(false); }, error -> { swipeLayout.setRefreshing(false); log.e(error); diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java index 9d0cb59..5dd5e54 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java +++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java @@ -206,7 +206,6 @@ public class CanteenBrowser extends HTTPService { } } catch (JSONException e) { e.printStackTrace(); - log.d(body); errorCallback.onError(new NetworkError(201302, 403, "Cannot parse meal list!")); return; } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java index f26869c..1d0c908 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java @@ -42,7 +42,8 @@ public class ModulesResources extends PartModules> { errorCallback.onError(new NetworkError(101604, 500, "Currently running in offline mode!")); return; } - get(String.format("https://kvv.imp.fu-berlin.de/direct/content/site/%s.json", ID), mLogin.getLoginToken().getCookies(), response -> { + //get(String.format("https://kvv.imp.fu-berlin.de/direct/content/site/%s.json", ID), mLogin.getLoginToken().getCookies(), response -> { + get("http://adminer.sebse.de/res_old.json", mLogin.getLoginToken().getCookies(), response -> { String body = response.getParsed(); if (body == null) { errorCallback.onError(new NetworkError(101601, 403, "No resources retrieved!")); diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ui/Download.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ui/Download.java index 8cd8ff8..80cd58a 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ui/Download.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ui/Download.java @@ -140,7 +140,7 @@ public class Download { public RequestPermissionsResultListener getRequestPermissionsResultListener() { return (requestCode, permissions, grantResults) -> { if (requestedDownload == null) { - log.d("No request"); + log.e("No request"); return; } if (activityInterface.get() == null) { @@ -152,13 +152,11 @@ public class Download { { intList.add(i); } - log.d(requestCode, Arrays.asList(permissions), intList); int pos = Arrays.asList(permissions).indexOf("android.permission.WRITE_EXTERNAL_STORAGE"); if (pos != -1) { if (grantResults[pos] != -1) { downloadOrOpen(requestedDownload.file, requestedDownload.folderName, requestedDownload.downloadNew); } else { - log.d(requestedDownload, pos, grantResults[pos]); showDownloadError(); } requestedDownload = null;