diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java index e3665a2..769914c 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java @@ -94,8 +94,6 @@ public class ModulesEvents extends PartModules { return; } this.mList.find(ID, module -> { - log.d(module.lvNumber.size(), module.lvNumber); - log.d(module.lvNumber.iterator().next()); super.head(String.format("https://www.fu-berlin.de/vv/de/search?utf8=✓&query=%s", module.lvNumber.iterator().next()), null, response -> { String location = response.getHeaders().get("Location"); if (location == null) { @@ -114,7 +112,6 @@ public class ModulesEvents extends PartModules { } super.get(String.format("https://www.fu-berlin.de/vv/de/lv/%s", group), null, response1 -> { String body = response1.getParsed(); - log.d(response1.getHeaders().get("Location")); if (body == null) { errorCallback.onError(new NetworkError(101411, 400, "Cannot get events!")); 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 2692cb2..262032b 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 @@ -14,7 +14,6 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.concurrent.CountDownLatch; import de.sebse.fuplanner.services.kvv.types.Modules; import de.sebse.fuplanner.services.kvv.types.Resource; @@ -312,7 +311,6 @@ public class ModulesResources extends PartModules> { if (redirectUrl == null){ redirectUrl = ""; } - log.d("redirectUrl", redirectUrl); get(redirectUrl, mLogin.getLoginTokenBB().getCookies(), response1 -> { if (response1.getHeaders().containsKey("Location")) { // Return redirected URL @@ -322,7 +320,6 @@ public class ModulesResources extends PartModules> { } else { redirectUrl2 = "https://lms.fu-berlin.de" + redirectUrl2; } - log.d("redirectUrl2", redirectUrl2); get(redirectUrl2, mLogin.getLoginTokenBB().getCookies(), response2 -> { if (response2.getBytes() == null) { errorCallback.onError(new NetworkError(101714, 400, "Cannot get file!")); diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/BBLogin.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/BBLogin.java index fe156b2..527534c 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/BBLogin.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/BBLogin.java @@ -134,7 +134,6 @@ public class BBLogin extends HTTPService { private void step6(String shibsessionKey, String shibsessionName, final NetworkCallback> callback, final NetworkErrorCallback errorCallback) { HashMap cookies = new HashMap<>(); cookies.put(shibsessionKey, shibsessionName); - log.d(shibsessionKey, shibsessionName); get("https://lms.fu-berlin.de/webapps/bb-auth-provider-shibboleth-bb_bb60/execute/shibbolethLogin?returnUrl=https://lms.fu-berlin.de/webapps/portal/execute/defaultTab&authProviderId=_3_1", cookies, response -> { String cookies1 = response.getHeaders().get("Set-Cookie"); if (cookies1 ==null) { diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java index cf7c831..352c886 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java @@ -123,19 +123,6 @@ public class KVVSyncAdapter extends AbstractThreadedSyncAdapter { if (oldList == null || newList == null) { return; } - if (oldList instanceof ArrayList && ((ArrayList) oldList).size() > 0 && ((ArrayList) oldList).get(0) instanceof Resource) { - log.d("-- all --"); - log.d(oldList.hashCode(), newList.hashCode()); - log.d("-- old --"); - for (T x: oldList) { - log.d(titleInterface.get(x), idInterface.get(x), x.hashCode(), x); - } - log.d("-- new --"); - for (T x: newList) { - log.d(titleInterface.get(x), idInterface.get(x), x.hashCode(), x); - } - log.d("-- --- --"); - } ArrayList obsoletes = new ArrayList<>(); for (T old: oldList) { obsoletes.add(old); diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Resource.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Resource.java index 87f22ef..ae21136 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Resource.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Resource.java @@ -1,7 +1,5 @@ package de.sebse.fuplanner.services.kvv.types; -import android.util.Pair; - import com.google.android.gms.common.internal.Objects; import java.io.Serializable; 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 bcc982d..47b8898 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 @@ -187,8 +187,6 @@ public class Download { private void fileOpen(File url){ Context context = contextInterface.get(); - log.d("fileOpen", context); - log.d("url", url.toString()); if (context == null) return; Uri uri = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".my.provider", url); diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DocumentNodeBinder.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DocumentNodeBinder.java index cbdf1a3..151e5b4 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DocumentNodeBinder.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DocumentNodeBinder.java @@ -8,7 +8,6 @@ import com.cunoraz.tagview.TagView; import androidx.core.content.ContextCompat; import de.sebse.fuplanner.R; -import de.sebse.fuplanner.fragments.moddetails.ModDetailAnnounceFragment; import de.sebse.fuplanner.services.kvv.types.Resource; import de.sebse.fuplanner.services.kvv.ui.Download; import de.sebse.fuplanner.tools.UtilsDate; @@ -53,8 +52,6 @@ public class DocumentNodeBinder extends TreeViewBinder implements Cloneable { } - @SuppressWarnings("CloneDoesntDeclareCloneNotSupportedException") + @SuppressWarnings({"CloneDoesntDeclareCloneNotSupportedException", "MethodDoesntCallSuperMethod"}) @Override protected TreeNode clone() { TreeNode clone = new TreeNode<>(this.content); diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/TreeViewAdapter.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/TreeViewAdapter.java index d3cc94a..332d96c 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/TreeViewAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/TreeViewAdapter.java @@ -13,7 +13,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; -import de.sebse.fuplanner.tools.logging.Logger; /** * Created by tlh on 2016/10/1 :) diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java index 7eb216a..368435e 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java @@ -365,7 +365,7 @@ public class WeekView extends View { } int nonRoundedMinutes = selectedTime.get(Calendar.MINUTE); int mod = nonRoundedMinutes % mNewEventTimeResolutionInMinutes; - selectedTime.add(Calendar.MINUTE, mod < Math.ceil(mNewEventTimeResolutionInMinutes / 2) ? -mod : (mNewEventTimeResolutionInMinutes - mod)); + selectedTime.add(Calendar.MINUTE, mod < Math.ceil(mNewEventTimeResolutionInMinutes / 2.0) ? -mod : (mNewEventTimeResolutionInMinutes - mod)); Calendar endTime = (Calendar) selectedTime.clone(); @@ -379,8 +379,8 @@ public class WeekView extends View { WeekViewEvent newEvent = new WeekViewEvent(mNewEventIdentifier, "", null, selectedTime, endTime); - float top = mHourHeight * getPassedMinutesInDay(selectedTime) / 60 + getEventsTop(); - float bottom = mHourHeight * getPassedMinutesInDay(endTime) / 60 + getEventsTop(); + float top = mHourHeight * getPassedMinutesInDay(selectedTime) / 60f + getEventsTop(); + float bottom = mHourHeight * getPassedMinutesInDay(endTime) / 60f + getEventsTop(); // Calculate left and right. float left = mWidthPerDay * daysBetween(getFirstVisibleDay(), selectedTime); @@ -1117,7 +1117,7 @@ public class WeekView extends View { canvas.drawRoundRect(eventRect.rectF, mEventCornerRadius, mEventCornerRadius, mEventBackgroundPaint); float topToUse = top; if (eventRect.event.getStartTime().get(Calendar.HOUR_OF_DAY) < mMinTime) - topToUse = mHourHeight * getPassedMinutesInDay(mMinTime, 0) / 60 + getEventsTop(); + topToUse = mHourHeight * getPassedMinutesInDay(mMinTime, 0) / 60f + getEventsTop(); if (!mNewEventIdentifier.equals(eventRect.event.getIdentifier())) drawEventTitle(eventRect.event, eventRect.rectF, canvas, topToUse, left); diff --git a/app/src/main/res/layout/list_moddetails_shortcuts.xml b/app/src/main/res/layout/list_moddetails_shortcuts.xml index 09fc399..8e2eb5f 100644 --- a/app/src/main/res/layout/list_moddetails_shortcuts.xml +++ b/app/src/main/res/layout/list_moddetails_shortcuts.xml @@ -21,6 +21,7 @@ android:typeface="sans" android:gravity="center" android:textColor="@color/colorFUBlue" + app:layout_constraintTop_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/guideline" /> @@ -34,6 +35,7 @@ android:typeface="sans" android:gravity="center" android:textColor="@color/colorFUBlue" + app:layout_constraintTop_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintLeft_toRightOf="@id/guideline" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 332519a..f7d387c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -120,6 +120,6 @@ Resource updated: %1$s New resource: %1$s Resource removed: %1$s - A network error occured! - A network error occured: %s! + A network error occurred! + A network error occurred: %s!