sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update All Parts in Module; Removed Logs

Browse Source
This commit is contained in:
Caesar2011
2018-11-15 18:31:37 +01:00
parent 5ba6c899be
commit 9a1892db0a
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java
View File

@@ -84,8 +84,9 @@ public class ModDetailAnnounceFragment extends Fragment implements Download.OnDo
private void refresh(boolean forceRefresh) { private void refresh(boolean forceRefresh) {
if (mListener == null) if (mListener == null)
return; return;
mListener.getKVV().modules().announcements().recv(mItemPos, success -> { mListener.getKVV().modules().details().recv(mItemPos, pair -> {
adapter.setModule(success); adapter.setModule(pair.first);
if (pair.second)
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);
}, error -> { }, error -> {
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);

6
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java
View File

@@ -84,8 +84,9 @@ public class ModDetailAssignmentFragment extends Fragment implements Download.On
private void refresh(boolean forceRefresh) { private void refresh(boolean forceRefresh) {
if (mListener == null) if (mListener == null)
return; return;
mListener.getKVV().modules().assignments().recv(mItemPos, success -> { mListener.getKVV().modules().details().recv(mItemPos, pair -> {
adapter.setModule(success); adapter.setModule(pair.first);
if (pair.second)
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);
}, error -> { }, error -> {
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);
@@ -95,7 +96,6 @@ public class ModDetailAssignmentFragment extends Fragment implements Download.On
@Override @Override
public void request(String title, String url) { public void request(String title, String url) {
log.d(title, url, mListener);
if (mListener == null) if (mListener == null)
return; return;
mListener.getKVV().modules().list().find(mItemPos, (Modules.Module module) -> { mListener.getKVV().modules().list().find(mItemPos, (Modules.Module module) -> {

5
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventFragment.java
View File

@@ -83,8 +83,9 @@ public class ModDetailEventFragment extends Fragment {
private void refresh(boolean forceRefresh) { private void refresh(boolean forceRefresh) {
if (mListener == null) if (mListener == null)
return; return;
mListener.getKVV().modules().events().recv(mItemPos, success -> { mListener.getKVV().modules().details().recv(mItemPos, pair -> {
adapter.setModule(success); adapter.setModule(pair.first);
if (pair.second)
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);
}, error -> { }, error -> {
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);

5
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookFragment.java
View File

@@ -83,8 +83,9 @@ public class ModDetailGradebookFragment extends Fragment {
private void refresh(boolean forceRefresh) { private void refresh(boolean forceRefresh) {
if (mListener == null) if (mListener == null)
return; return;
mListener.getKVV().modules().gradebook().recv(mItemPos, success -> { mListener.getKVV().modules().details().recv(mItemPos, pair -> {
adapter.setModule(success); adapter.setModule(pair.first);
if (pair.second)
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);
}, error -> { }, error -> {
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);

5
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java
View File

@@ -140,8 +140,9 @@ public class ModDetailResourceFragment extends Fragment {
private void refresh(boolean forceRefresh) { private void refresh(boolean forceRefresh) {
if (mListener == null) if (mListener == null)
return; return;
mListener.getKVV().modules().assignments().recv(mItemPos, success -> { mListener.getKVV().modules().details().recv(mItemPos, pair -> {
adapter.setModule(success); adapter.setModule(pair.first);
if (pair.second)
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);
}, error -> { }, error -> {
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);

1
app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java
View File

@@ -206,7 +206,6 @@ public class CanteenBrowser extends HTTPService {
} }
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
log.d(body);
errorCallback.onError(new NetworkError(201302, 403, "Cannot parse meal list!")); errorCallback.onError(new NetworkError(201302, 403, "Cannot parse meal list!"));
return; return;
} }

3
app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java
View File

@@ -42,7 +42,8 @@ public class ModulesResources extends PartModules<ArrayList<Resource>> {
errorCallback.onError(new NetworkError(101604, 500, "Currently running in offline mode!")); errorCallback.onError(new NetworkError(101604, 500, "Currently running in offline mode!"));
return; 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(); String body = response.getParsed();
if (body == null) { if (body == null) {
errorCallback.onError(new NetworkError(101601, 403, "No resources retrieved!")); errorCallback.onError(new NetworkError(101601, 403, "No resources retrieved!"));

4
app/src/main/java/de/sebse/fuplanner/services/KVV/ui/Download.java
View File

@@ -140,7 +140,7 @@ public class Download {
public RequestPermissionsResultListener getRequestPermissionsResultListener() { public RequestPermissionsResultListener getRequestPermissionsResultListener() {
return (requestCode, permissions, grantResults) -> { return (requestCode, permissions, grantResults) -> {
if (requestedDownload == null) { if (requestedDownload == null) {
log.d("No request"); log.e("No request");
return; return;
} }
if (activityInterface.get() == null) { if (activityInterface.get() == null) {
@@ -152,13 +152,11 @@ public class Download {
{ {
intList.add(i); intList.add(i);
} }
log.d(requestCode, Arrays.asList(permissions), intList);
int pos = Arrays.asList(permissions).indexOf("android.permission.WRITE_EXTERNAL_STORAGE"); int pos = Arrays.asList(permissions).indexOf("android.permission.WRITE_EXTERNAL_STORAGE");
if (pos != -1) { if (pos != -1) {
if (grantResults[pos] != -1) { if (grantResults[pos] != -1) {
downloadOrOpen(requestedDownload.file, requestedDownload.folderName, requestedDownload.downloadNew); downloadOrOpen(requestedDownload.file, requestedDownload.folderName, requestedDownload.downloadNew);
} else { } else {
log.d(requestedDownload, pos, grantResults[pos]);
showDownloadError(); showDownloadError();
} }
requestedDownload = null; requestedDownload = null;