Code cleanup
This commit is contained in:
@@ -14,12 +14,9 @@ import de.sebse.fuplanner.services.fulogin.AccountGeneral;
|
|||||||
import de.sebse.fuplanner.services.kvv.sync.KVVContentProvider;
|
import de.sebse.fuplanner.services.kvv.sync.KVVContentProvider;
|
||||||
import de.sebse.fuplanner.tools.CustomAccountManager;
|
import de.sebse.fuplanner.tools.CustomAccountManager;
|
||||||
import de.sebse.fuplanner.tools.Preferences;
|
import de.sebse.fuplanner.tools.Preferences;
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
|
|
||||||
public class PrefsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
|
public class PrefsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
|
||||||
|
|
||||||
private Logger log = new Logger(this);
|
|
||||||
|
|
||||||
public static PrefsFragment newInstance() {
|
public static PrefsFragment newInstance() {
|
||||||
PrefsFragment fragment = new PrefsFragment();
|
PrefsFragment fragment = new PrefsFragment();
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
|
|||||||
@@ -21,14 +21,12 @@ import de.sebse.fuplanner.services.kvv.types.Announcement;
|
|||||||
import de.sebse.fuplanner.services.kvv.types.Modules;
|
import de.sebse.fuplanner.services.kvv.types.Modules;
|
||||||
import de.sebse.fuplanner.tools.Regex;
|
import de.sebse.fuplanner.tools.Regex;
|
||||||
import de.sebse.fuplanner.tools.UtilsDate;
|
import de.sebse.fuplanner.tools.UtilsDate;
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
import de.sebse.fuplanner.tools.ui.AnnouncementViewHolder;
|
import de.sebse.fuplanner.tools.ui.AnnouncementViewHolder;
|
||||||
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
|
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
|
||||||
|
|
||||||
class ModDetailAnnounceAdapter extends RecyclerView.Adapter<CustomViewHolder> {
|
class ModDetailAnnounceAdapter extends RecyclerView.Adapter<CustomViewHolder> {
|
||||||
|
|
||||||
@Nullable private Modules.Module mModule = null;
|
@Nullable private Modules.Module mModule = null;
|
||||||
private Logger log = new Logger(this);
|
|
||||||
@NonNull private final Download.OnDownloadRequestInterface requestInterface;
|
@NonNull private final Download.OnDownloadRequestInterface requestInterface;
|
||||||
|
|
||||||
ModDetailAnnounceAdapter(@NonNull Download.OnDownloadRequestInterface requestInterface) {
|
ModDetailAnnounceAdapter(@NonNull Download.OnDownloadRequestInterface requestInterface) {
|
||||||
|
|||||||
@@ -21,14 +21,12 @@ import de.sebse.fuplanner.services.kvv.types.Assignment;
|
|||||||
import de.sebse.fuplanner.services.kvv.types.Modules;
|
import de.sebse.fuplanner.services.kvv.types.Modules;
|
||||||
import de.sebse.fuplanner.tools.Regex;
|
import de.sebse.fuplanner.tools.Regex;
|
||||||
import de.sebse.fuplanner.tools.UtilsDate;
|
import de.sebse.fuplanner.tools.UtilsDate;
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
import de.sebse.fuplanner.tools.ui.AnnouncementViewHolder;
|
import de.sebse.fuplanner.tools.ui.AnnouncementViewHolder;
|
||||||
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
|
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
|
||||||
|
|
||||||
class ModDetailAssignmentAdapter extends RecyclerView.Adapter<CustomViewHolder> {
|
class ModDetailAssignmentAdapter extends RecyclerView.Adapter<CustomViewHolder> {
|
||||||
|
|
||||||
@Nullable private Modules.Module mModule = null;
|
@Nullable private Modules.Module mModule = null;
|
||||||
private Logger log = new Logger(this);
|
|
||||||
@NonNull private final Download.OnDownloadRequestInterface requestInterface;
|
@NonNull private final Download.OnDownloadRequestInterface requestInterface;
|
||||||
|
|
||||||
ModDetailAssignmentAdapter(@NonNull Download.OnDownloadRequestInterface requestInterface) {
|
ModDetailAssignmentAdapter(@NonNull Download.OnDownloadRequestInterface requestInterface) {
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import de.sebse.fuplanner.services.kvv.types.EventList;
|
|||||||
import de.sebse.fuplanner.services.kvv.types.GroupedEvents;
|
import de.sebse.fuplanner.services.kvv.types.GroupedEvents;
|
||||||
import de.sebse.fuplanner.services.kvv.types.Modules;
|
import de.sebse.fuplanner.services.kvv.types.Modules;
|
||||||
import de.sebse.fuplanner.tools.UtilsDate;
|
import de.sebse.fuplanner.tools.UtilsDate;
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
|
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
|
||||||
import de.sebse.fuplanner.tools.ui.ItemViewHolder;
|
import de.sebse.fuplanner.tools.ui.ItemViewHolder;
|
||||||
import de.sebse.fuplanner.tools.ui.StringViewHolder;
|
import de.sebse.fuplanner.tools.ui.StringViewHolder;
|
||||||
@@ -43,8 +42,6 @@ class ModDetailEventAdapter extends RecyclerView.Adapter<CustomViewHolder> {
|
|||||||
private Modules.Module mValue;
|
private Modules.Module mValue;
|
||||||
private final ArrayList<Pair<Integer, Object>> mPositionalData;
|
private final ArrayList<Pair<Integer, Object>> mPositionalData;
|
||||||
|
|
||||||
private final Logger log = new Logger(this);
|
|
||||||
|
|
||||||
ModDetailEventAdapter() {
|
ModDetailEventAdapter() {
|
||||||
mValue = null;
|
mValue = null;
|
||||||
mPositionalData = new ArrayList<>();
|
mPositionalData = new ArrayList<>();
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import de.sebse.fuplanner.services.kvv.types.Event;
|
|||||||
import de.sebse.fuplanner.services.kvv.types.Lecturer;
|
import de.sebse.fuplanner.services.kvv.types.Lecturer;
|
||||||
import de.sebse.fuplanner.services.kvv.types.Modules;
|
import de.sebse.fuplanner.services.kvv.types.Modules;
|
||||||
import de.sebse.fuplanner.tools.UtilsDate;
|
import de.sebse.fuplanner.tools.UtilsDate;
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
|
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
|
||||||
import de.sebse.fuplanner.tools.ui.ItemViewHolder;
|
import de.sebse.fuplanner.tools.ui.ItemViewHolder;
|
||||||
import de.sebse.fuplanner.tools.ui.MailViewHolder;
|
import de.sebse.fuplanner.tools.ui.MailViewHolder;
|
||||||
@@ -44,7 +43,6 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
|
|||||||
|
|
||||||
private Modules.Module mValue;
|
private Modules.Module mValue;
|
||||||
private final ArrayList<Pair<Integer, Object>> mPositionalData;
|
private final ArrayList<Pair<Integer, Object>> mPositionalData;
|
||||||
private Logger log = new Logger(this);
|
|
||||||
|
|
||||||
ModDetailOverviewAdapter(@Nullable final ModDetailListener listener) {
|
ModDetailOverviewAdapter(@Nullable final ModDetailListener listener) {
|
||||||
mValue = null;
|
mValue = null;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import android.accounts.AbstractAccountAuthenticator;
|
|||||||
import android.accounts.Account;
|
import android.accounts.Account;
|
||||||
import android.accounts.AccountAuthenticatorResponse;
|
import android.accounts.AccountAuthenticatorResponse;
|
||||||
import android.accounts.AccountManager;
|
import android.accounts.AccountManager;
|
||||||
import android.accounts.AccountsException;
|
|
||||||
import android.accounts.NetworkErrorException;
|
import android.accounts.NetworkErrorException;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
@@ -13,13 +12,9 @@ import android.text.TextUtils;
|
|||||||
|
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
|
|
||||||
import de.sebse.fuplanner.tools.CustomAccountManager;
|
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
|
|
||||||
public class FUAuthenticator extends AbstractAccountAuthenticator {
|
public class FUAuthenticator extends AbstractAccountAuthenticator {
|
||||||
|
|
||||||
private final Context mContext;
|
private final Context mContext;
|
||||||
private Logger log = new Logger(this);
|
|
||||||
|
|
||||||
public FUAuthenticator(Context context) {
|
public FUAuthenticator(Context context) {
|
||||||
super(context);
|
super(context);
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public class Modules implements Iterable<Modules.Module>, Serializable {
|
|||||||
private SortedListModule list;
|
private SortedListModule list;
|
||||||
private final String mUsername;
|
private final String mUsername;
|
||||||
private transient long mLastTimestamp = 0;
|
private transient long mLastTimestamp = 0;
|
||||||
//private transient Logger log = new Logger(this);
|
|
||||||
private static final String FILE_NAME = "ModuleListSaving";
|
private static final String FILE_NAME = "ModuleListSaving";
|
||||||
private static final String FILE_NAME_TIMESTAMP = "ModuleListSavingTimestamp";
|
private static final String FILE_NAME_TIMESTAMP = "ModuleListSavingTimestamp";
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import java.util.ArrayList;
|
|||||||
import androidx.annotation.LayoutRes;
|
import androidx.annotation.LayoutRes;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import de.sebse.fuplanner.R;
|
import de.sebse.fuplanner.R;
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
import de.sebse.fuplanner.tools.ui.treeview.LayoutItemType;
|
import de.sebse.fuplanner.tools.ui.treeview.LayoutItemType;
|
||||||
import de.sebse.fuplanner.tools.ui.treeview.TreeNode;
|
import de.sebse.fuplanner.tools.ui.treeview.TreeNode;
|
||||||
|
|
||||||
@@ -45,7 +44,6 @@ public abstract class Resource implements Serializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getUrl() {
|
public String getUrl() {
|
||||||
Logger log = new Logger(this);
|
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,7 +69,6 @@ public abstract class Resource implements Serializable {
|
|||||||
|
|
||||||
public Document(String author, String title, long modifiedDate, String url, boolean visible, String container, String body) {
|
public Document(String author, String title, long modifiedDate, String url, boolean visible, String container, String body) {
|
||||||
super(author, title, modifiedDate, url, visible, container);
|
super(author, title, modifiedDate, url, visible, container);
|
||||||
Logger log = new Logger(this);
|
|
||||||
this.body = body;
|
this.body = body;
|
||||||
this.urls = new ArrayList<>();
|
this.urls = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,12 +15,10 @@ import java.io.IOException;
|
|||||||
|
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
import de.sebse.fuplanner.services.kvv.Login;
|
import de.sebse.fuplanner.services.kvv.Login;
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
|
|
||||||
public class CustomAccountManager {
|
public class CustomAccountManager {
|
||||||
private final AccountManager mAccountManager;
|
private final AccountManager mAccountManager;
|
||||||
private final ActivityInterface mActivityInterface;
|
private final ActivityInterface mActivityInterface;
|
||||||
private Logger log = new Logger(this);
|
|
||||||
|
|
||||||
public CustomAccountManager(AccountManager manager, ActivityInterface activityInterface) {
|
public CustomAccountManager(AccountManager manager, ActivityInterface activityInterface) {
|
||||||
mAccountManager = manager;
|
mAccountManager = manager;
|
||||||
@@ -69,7 +67,6 @@ public class CustomAccountManager {
|
|||||||
|
|
||||||
public void deleteAccount(String accountType) {
|
public void deleteAccount(String accountType) {
|
||||||
Account[] accounts = mAccountManager.getAccountsByType(accountType);
|
Account[] accounts = mAccountManager.getAccountsByType(accountType);
|
||||||
int[] count = {accounts.length};
|
|
||||||
for (Account account: accounts) {
|
for (Account account: accounts) {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
|
||||||
mAccountManager.removeAccount(account, null, null, null);
|
mAccountManager.removeAccount(account, null, null, null);
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import de.sebse.fuplanner.R;
|
|||||||
import de.sebse.fuplanner.services.kvv.types.Resource;
|
import de.sebse.fuplanner.services.kvv.types.Resource;
|
||||||
import de.sebse.fuplanner.services.kvv.ui.Download;
|
import de.sebse.fuplanner.services.kvv.ui.Download;
|
||||||
import de.sebse.fuplanner.tools.UtilsDate;
|
import de.sebse.fuplanner.tools.UtilsDate;
|
||||||
import de.sebse.fuplanner.tools.logging.Logger;
|
|
||||||
import de.sebse.fuplanner.tools.ui.cardview.ExpandableCardView;
|
import de.sebse.fuplanner.tools.ui.cardview.ExpandableCardView;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -51,7 +50,6 @@ public class DocumentNodeBinder extends TreeViewBinder<DocumentNodeBinder.ViewHo
|
|||||||
String s = fileNode.getUrl(i).url;
|
String s = fileNode.getUrl(i).url;
|
||||||
if (s != null) {
|
if (s != null) {
|
||||||
String name = fileNode.getUrl(i).name;
|
String name = fileNode.getUrl(i).name;
|
||||||
Logger log = new Logger(this);
|
|
||||||
this.requestInterface.request(name, s);
|
this.requestInterface.request(name, s);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user