Massive Renaming and Name Shorting

app/src/main/java/de/sebse/fuplanner/MainActivity.java

@@ -39,6 +39,7 @@ import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
 import de.sebse.fuplanner.services.KVV.KVV;
 import de.sebse.fuplanner.services.KVV.KVVListener;
 import de.sebse.fuplanner.services.KVV.types.LoginToken;
+import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.RequestPermissionsResultListener;
 import de.sebse.fuplanner.tools.logging.Logger;
@@ -273,7 +274,7 @@ public class MainActivity extends AppCompatActivity
         changeFragment(FRAGMENT_LOGIN);
     }
 
-    private void toLoginState(String fullName, String email, int newFragment, String newData, boolean onlineMode) {
+    private void toLoginState(String fullName, String email, int newFragment, boolean onlineMode) {
         setOfflineBanner(!onlineMode);
         updateNavigation();
 
@@ -281,7 +282,7 @@ public class MainActivity extends AppCompatActivity
         ((TextView) header.findViewById(R.id.login_name)).setText(fullName);
         ((TextView) header.findViewById(R.id.login_mail)).setText(email);
 
-        changeFragment(newFragment, newData);
+        changeFragment(newFragment);
     }
 
     private void changeFragment(int newFragment) {
@@ -425,8 +426,8 @@ public class MainActivity extends AppCompatActivity
         if (isLoggedIn) {
             getKVV().modules().list().recv(success -> {
                 int i = 0;
-                for (Iterator<de.sebse.fuplanner.services.KVV.types.Modules.Module> it = success.latestSemesterIterator(); it.hasNext(); ) {
+                for (Iterator<Modules.Module> it = success.latestSemesterIterator(); it.hasNext(); ) {
-                    de.sebse.fuplanner.services.KVV.types.Modules.Module module = it.next();
+                    Modules.Module module = it.next();
                     MenuItem menuItem = mNavigationView.getMenu().add(Menu.NONE, Menu.NONE, 101 + i, module.title);
                     menuItem.setOnMenuItemClickListener(item -> {
                         onModulesFragmentInteraction(module.getID());
@@ -535,12 +536,12 @@ public class MainActivity extends AppCompatActivity
     }
 
     @Override
-    public void handleLogin(LoginToken token, boolean enteringOnlineMode) {
+    public void onLogin(LoginToken token, boolean enteringOnlineMode) {
-        toLoginState(token.getUsername(), token.getEmail(), getDefaultFragmentAfterLogin(), "", enteringOnlineMode);
+        toLoginState(token.getUsername(), token.getEmail(), getDefaultFragmentAfterLogin(), enteringOnlineMode);
     }
 
     @Override
-    public void handleLogout() {
+    public void onLogout() {
         toLogoutState();
     }
 
@@ -550,12 +551,7 @@ public class MainActivity extends AppCompatActivity
     }
 
     @Override
-    public void onNetworkError(NetworkResponse networkResponse) {
+    public void onNetworkResponse(NetworkResponse error) {
-        setRefreshFailedBanner(true);
+        setRefreshFailedBanner(error != null);
-    }
-
-    @Override
-    public void onNetworkSuccess() {
-        setRefreshFailedBanner(false);
     }
 }

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java

@@ -16,7 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.Download;
+import de.sebse.fuplanner.services.KVV.ui.Download;
 import de.sebse.fuplanner.services.KVV.types.Announcement;
 import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.Regex;

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

@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.Download;
+import de.sebse.fuplanner.services.KVV.ui.Download;
 import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java

@@ -16,7 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.Download;
+import de.sebse.fuplanner.services.KVV.ui.Download;
 import de.sebse.fuplanner.services.KVV.types.Assignment;
 import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.Regex;

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

@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.Download;
+import de.sebse.fuplanner.services.KVV.ui.Download;
 import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;

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

@@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.Download;
+import de.sebse.fuplanner.services.KVV.ui.Download;
 import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.services.KVV.types.Resource;
 import de.sebse.fuplanner.tools.MainActivityListener;

app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java

@@ -17,13 +17,13 @@ public class KVV {
     }
 
     @NotNull
-    public KVVLogin account() {
+    public Login account() {
-        return (KVVLogin) addAndGet("account", () -> new KVVLogin(mListener, mContext));
+        return (Login) addAndGet("account", () -> new Login(mListener, mContext));
     }
 
     @NotNull
-    public KVVModules modules() {
+    public Modules modules() {
-        return (KVVModules) addAndGet("module", () -> new KVVModules(account(), mListener, mContext));
+        return (Modules) addAndGet("module", () -> new Modules(account(), mListener, mContext));
     }
 
 

app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java

@@ -10,13 +10,11 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 public interface KVVListener {
     void getCredentials(NetworkCallback<Credentials> callback, NetworkErrorCallback error);
 
-    void handleLogin(LoginToken token, boolean enteringOnlineMode);
+    void onLogin(LoginToken token, boolean enteringOnlineMode);
 
-    void handleLogout();
+    void onLogout();
 
     void onModuleListChange();
 
-    void onNetworkError(NetworkResponse networkResponse);
+    void onNetworkResponse(NetworkResponse error);
-
-    void onNetworkSuccess();
 }

app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModules.java

@@ -1,81 +0,0 @@
-package de.sebse.fuplanner.services.KVV;
-
-import android.content.Context;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashMap;
-
-public class KVVModules {
-    private final HashMap<String, Part> mAddons = new HashMap<>();
-    private KVVModulesList mList = null;
-    private final KVVLogin mLogin;
-    private KVVListener mListener;
-    private final Context context;
-
-    KVVModules(KVVLogin login, KVVListener listener, Context context) {
-        this.mLogin = login;
-        this.mListener = listener;
-        this.context = context;
-    }
-
-    @NotNull
-    public KVVModulesDetails details() {
-        return (KVVModulesDetails) addAndGet("details", () -> {
-            ModulesPart[] parts = {announcements(), assignments(), events(), gradebook(), resources()};
-            return new KVVModulesDetails(mLogin, list(), context, parts);
-        });
-    }
-
-    @NotNull
-    public KVVModulesAnnouncements announcements() {
-        return (KVVModulesAnnouncements) addAndGet("announcements", () -> new KVVModulesAnnouncements(mLogin, list(), context));
-    }
-
-    @NotNull
-    public KVVModulesAssignments assignments() {
-        return (KVVModulesAssignments) addAndGet("assignments", () -> new KVVModulesAssignments(mLogin, list(), context));
-    }
-
-    @NotNull
-    public KVVModulesEvents events() {
-        return (KVVModulesEvents) addAndGet("events", () -> new KVVModulesEvents(mLogin, list(), context));
-    }
-
-    @NotNull
-    public KVVModulesGradebook gradebook() {
-        return (KVVModulesGradebook) addAndGet("gradebook", () -> new KVVModulesGradebook(mLogin, list(), context));
-    }
-
-    @NotNull
-    public KVVModulesResources resources() {
-        return (KVVModulesResources) addAndGet("resources", () -> new KVVModulesResources(mLogin, list(), context));
-    }
-
-    @NotNull
-    public KVVModulesList list() {
-        if (mList == null) {
-            mList = new KVVModulesList(mLogin, mListener, context);
-            mList.addErrorListener("KVVModules", error -> mListener.onNetworkError(error.networkResponse));
-            mList.addSuccessListener("KVVModules", success -> mListener.onNetworkSuccess());
-        }
-        return mList;
-    }
-
-
-    @NotNull
-    private Part addAndGet(@NotNull String addon, @NotNull ModuleCreatorInterface creatorInterface) {
-        Part o = mAddons.get(addon);
-        if (o == null) {
-            o = creatorInterface.create();
-            o.addErrorListener("KVVModules", error -> mListener.onNetworkError(error.networkResponse));
-            o.addSuccessListener("KVVModules", success -> mListener.onNetworkSuccess());
-            mAddons.put(addon, o);
-        }
-        return o;
-    }
-
-    private interface ModuleCreatorInterface {
-        @NotNull Part create();
-    }
-}

app/src/main/java/de/sebse/fuplanner/services/KVV/Login.java

@@ -20,13 +20,13 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
-public class KVVLogin extends HTTPService {
+public class Login extends HTTPService {
     private KVVListener mListener;
     @Nullable private LoginToken mToken;
     private boolean mLoginPending = false;
     private boolean mOnlineMode = false;
 
-    KVVLogin(KVVListener listener, Context context) {
+    Login(KVVListener listener, Context context) {
         super(context);
         this.mListener = listener;
     }
@@ -160,10 +160,10 @@ public class KVVLogin extends HTTPService {
 
     private boolean handleCallbacks() {
         if (mToken != null) {
-            mListener.handleLogin(mToken, mOnlineMode);
+            mListener.onLogin(mToken, mOnlineMode);
             return true;
         } else {
-            mListener.handleLogout();
+            mListener.onLogout();
             return false;
         }
     }

app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java

@@ -0,0 +1,81 @@
+package de.sebse.fuplanner.services.KVV;
+
+import android.content.Context;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+
+public class Modules {
+    private final HashMap<String, Part> mAddons = new HashMap<>();
+    private ModulesList mList = null;
+    private final Login mLogin;
+    private KVVListener mListener;
+    private final Context context;
+
+    Modules(Login login, KVVListener listener, Context context) {
+        this.mLogin = login;
+        this.mListener = listener;
+        this.context = context;
+    }
+
+    @NotNull
+    public ModulesDetails details() {
+        return (ModulesDetails) addAndGet("details", () -> {
+            ModulesPart[] parts = {announcements(), assignments(), events(), gradebook(), resources()};
+            return new ModulesDetails(mLogin, list(), context, parts);
+        });
+    }
+
+    @NotNull
+    public ModulesAnnouncements announcements() {
+        return (ModulesAnnouncements) addAndGet("announcements", () -> new ModulesAnnouncements(mLogin, list(), context));
+    }
+
+    @NotNull
+    public ModulesAssignments assignments() {
+        return (ModulesAssignments) addAndGet("assignments", () -> new ModulesAssignments(mLogin, list(), context));
+    }
+
+    @NotNull
+    public ModulesEvents events() {
+        return (ModulesEvents) addAndGet("events", () -> new ModulesEvents(mLogin, list(), context));
+    }
+
+    @NotNull
+    public ModulesGradebook gradebook() {
+        return (ModulesGradebook) addAndGet("gradebook", () -> new ModulesGradebook(mLogin, list(), context));
+    }
+
+    @NotNull
+    public ModulesResources resources() {
+        return (ModulesResources) addAndGet("resources", () -> new ModulesResources(mLogin, list(), context));
+    }
+
+    @NotNull
+    public ModulesList list() {
+        if (mList == null) {
+            mList = new ModulesList(mLogin, mListener, context);
+            mList.addErrorListener("Modules", error -> mListener.onNetworkResponse(error.networkResponse));
+            mList.addSuccessListener("Modules", success -> mListener.onNetworkResponse(null));
+        }
+        return mList;
+    }
+
+
+    @NotNull
+    private Part addAndGet(@NotNull String addon, @NotNull ModuleCreatorInterface creatorInterface) {
+        Part o = mAddons.get(addon);
+        if (o == null) {
+            o = creatorInterface.create();
+            o.addErrorListener("Modules", error -> mListener.onNetworkResponse(error.networkResponse));
+            o.addSuccessListener("Modules", success -> mListener.onNetworkResponse(null));
+            mAddons.put(addon, o);
+        }
+        return o;
+    }
+
+    private interface ModuleCreatorInterface {
+        @NotNull Part create();
+    }
+}

app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAnnouncements.java

@@ -14,9 +14,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
-public class KVVModulesAnnouncements extends ModulesPart<ArrayList<Announcement>> {
+public class ModulesAnnouncements extends ModulesPart<ArrayList<Announcement>> {
 
-    KVVModulesAnnouncements(KVVLogin login, KVVModulesList list, Context context) {
+    ModulesAnnouncements(Login login, ModulesList list, Context context) {
         super(login, list, context);
     }
 

app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAssignments.java

@@ -15,9 +15,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
-public class KVVModulesAssignments extends ModulesPart<AssignmentList> {
+public class ModulesAssignments extends ModulesPart<AssignmentList> {
 
-    KVVModulesAssignments(KVVLogin login, KVVModulesList list, Context context) {
+    ModulesAssignments(Login login, ModulesList list, Context context) {
         super(login, list, context);
     }
 

app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesDetails.java

@@ -10,10 +10,10 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
-final public class KVVModulesDetails extends Part<Pair<Modules.Module, Boolean>> {
+final public class ModulesDetails extends Part<Pair<Modules.Module, Boolean>> {
     private final ModulesPart[] parts;
 
-    KVVModulesDetails(KVVLogin login, KVVModulesList list, Context context, ModulesPart[] parts) {
+    ModulesDetails(Login login, ModulesList list, Context context, ModulesPart[] parts) {
         super(login, list, context);
         this.parts = parts;
     }
@@ -40,7 +40,7 @@ final public class KVVModulesDetails extends Part<Pair<Modules.Module, Boolean>>
                     errorCallback.onError(lastError.get());
             }
         };
-        for (ModulesPart part: parts) {
+        for (ModulesPart<?> part: parts) {
             part.recv(module, successCb, errorCb, forceRefresh, RETRY_COUNT);
         }
     }

app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesEvents.java

@@ -13,9 +13,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
-public class KVVModulesEvents extends ModulesPart<EventList> {
+public class ModulesEvents extends ModulesPart<EventList> {
 
-    KVVModulesEvents(KVVLogin login, KVVModulesList list, Context context) {
+    ModulesEvents(Login login, ModulesList list, Context context) {
         super(login, list, context);
     }
 

app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesGradebook.java

@@ -14,9 +14,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
-public class KVVModulesGradebook extends ModulesPart<ArrayList<Grade>> {
+public class ModulesGradebook extends ModulesPart<ArrayList<Grade>> {
 
-    KVVModulesGradebook(KVVLogin login, KVVModulesList list, Context context) {
+    ModulesGradebook(Login login, ModulesList list, Context context) {
         super(login, list, context);
     }
 

app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java

@@ -23,23 +23,19 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
 import static de.sebse.fuplanner.services.KVV.ModulesPart.RETRY_COUNT;
 
-public class KVVModulesList extends HTTPService {
+public class ModulesList extends HTTPService {
-    private final KVVLogin mLogin;
+    private final Login mLogin;
     private final KVVListener mListener;
     @Nullable private Modules mModules;
     private NewAsyncQueue mQueue = new NewAsyncQueue();
 
-    KVVModulesList(KVVLogin login, KVVListener listener, Context context) {
+    ModulesList(Login login, KVVListener listener, Context context) {
         super(context);
         this.mLogin = login;
         this.mListener = listener;
         restore();
     }
 
-    public boolean stored() {
-        return mModules != null;
-    }
-
     @Nullable
     public String getUsername() {
         if (mModules != null) {

app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java

@@ -13,7 +13,7 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 abstract class ModulesPart<T> extends Part<Modules.Module> {
     private NewAsyncQueue mQueue = new NewAsyncQueue();
 
-    ModulesPart(KVVLogin login, KVVModulesList list, Context context) {
+    ModulesPart(Login login, ModulesList list, Context context) {
         super(login, list, context);
     }
 

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

@@ -18,9 +18,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
-public class KVVModulesResources extends ModulesPart<ArrayList<Resource>> {
+public class ModulesResources extends ModulesPart<ArrayList<Resource>> {
 
-    KVVModulesResources(KVVLogin login, KVVModulesList list, Context context) {
+    ModulesResources(Login login, ModulesList list, Context context) {
         super(login, list, context);
     }
 

app/src/main/java/de/sebse/fuplanner/services/KVV/Part.java

@@ -9,10 +9,10 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
 public abstract class Part<T> extends HTTPService {
     static final int RETRY_COUNT = 1;
-    protected final KVVLogin mLogin;
+    protected final Login mLogin;
-    protected final KVVModulesList mList;
+    protected final ModulesList mList;
 
-    Part(KVVLogin login, KVVModulesList list, Context context) {
+    Part(Login login, ModulesList list, Context context) {
         super(context);
         this.mLogin = login;
         this.mList = list;

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

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.KVV.ui;
 
 import android.Manifest;
 import android.app.AlertDialog;

app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java

@@ -21,6 +21,7 @@ public interface MainActivityListener {
 
     CanteenBrowser getCanteenBrowser();
 
+    @Deprecated
     void onRefreshCompleted(boolean isFailed);
 
     void addRequestPermissionsResultListener(RequestPermissionsResultListener listener, String id);