restructured project

This commit is contained in:
nuclearfog 2023-05-20 10:59:26 +02:00
parent 81c4c64167
commit dfd1b3b346
No known key found for this signature in database
GPG Key ID: 03488A185C476379
39 changed files with 76 additions and 70 deletions

View File

@ -126,7 +126,7 @@
android:theme="@style/AppTheme" />
<receiver
android:name=".receiver.PushNotificationReceiver"
android:name=".notification.PushNotificationReceiver"
android:enabled="true"
android:exported="true">

View File

@ -3,16 +3,16 @@ package org.nuclearfog.twidda.backend.api;
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
import org.nuclearfog.twidda.backend.helper.MediaStatus;
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
import org.nuclearfog.twidda.lists.Domains;
import org.nuclearfog.twidda.lists.Messages;
import org.nuclearfog.twidda.model.lists.Domains;
import org.nuclearfog.twidda.model.lists.Messages;
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
import org.nuclearfog.twidda.lists.Notifications;
import org.nuclearfog.twidda.lists.Statuses;
import org.nuclearfog.twidda.model.lists.Notifications;
import org.nuclearfog.twidda.model.lists.Statuses;
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
import org.nuclearfog.twidda.lists.Trends;
import org.nuclearfog.twidda.lists.UserLists;
import org.nuclearfog.twidda.lists.Users;
import org.nuclearfog.twidda.model.lists.Trends;
import org.nuclearfog.twidda.model.lists.UserLists;
import org.nuclearfog.twidda.model.lists.Users;
import org.nuclearfog.twidda.model.Account;
import org.nuclearfog.twidda.model.Emoji;
import org.nuclearfog.twidda.model.Instance;

View File

@ -27,17 +27,17 @@ import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonUser;
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
import org.nuclearfog.twidda.backend.helper.MediaStatus;
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
import org.nuclearfog.twidda.lists.Domains;
import org.nuclearfog.twidda.lists.Messages;
import org.nuclearfog.twidda.model.lists.Domains;
import org.nuclearfog.twidda.model.lists.Messages;
import org.nuclearfog.twidda.backend.helper.update.PollUpdate;
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
import org.nuclearfog.twidda.lists.Notifications;
import org.nuclearfog.twidda.lists.Statuses;
import org.nuclearfog.twidda.model.lists.Notifications;
import org.nuclearfog.twidda.model.lists.Statuses;
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
import org.nuclearfog.twidda.lists.Trends;
import org.nuclearfog.twidda.lists.UserLists;
import org.nuclearfog.twidda.lists.Users;
import org.nuclearfog.twidda.model.lists.Trends;
import org.nuclearfog.twidda.model.lists.UserLists;
import org.nuclearfog.twidda.model.lists.Users;
import org.nuclearfog.twidda.backend.utils.ConnectionBuilder;
import org.nuclearfog.twidda.backend.utils.StringUtils;
import org.nuclearfog.twidda.config.GlobalSettings;

View File

@ -24,16 +24,16 @@ import org.nuclearfog.twidda.backend.api.twitter.v1.impl.UserV1;
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
import org.nuclearfog.twidda.backend.helper.MediaStatus;
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
import org.nuclearfog.twidda.lists.Domains;
import org.nuclearfog.twidda.lists.Messages;
import org.nuclearfog.twidda.model.lists.Domains;
import org.nuclearfog.twidda.model.lists.Messages;
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
import org.nuclearfog.twidda.lists.Notifications;
import org.nuclearfog.twidda.lists.Statuses;
import org.nuclearfog.twidda.model.lists.Notifications;
import org.nuclearfog.twidda.model.lists.Statuses;
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
import org.nuclearfog.twidda.lists.Trends;
import org.nuclearfog.twidda.lists.UserLists;
import org.nuclearfog.twidda.lists.Users;
import org.nuclearfog.twidda.model.lists.Trends;
import org.nuclearfog.twidda.model.lists.UserLists;
import org.nuclearfog.twidda.model.lists.Users;
import org.nuclearfog.twidda.backend.utils.ConnectionBuilder;
import org.nuclearfog.twidda.backend.utils.StringUtils;
import org.nuclearfog.twidda.config.GlobalSettings;

View File

@ -21,8 +21,8 @@ import org.nuclearfog.twidda.backend.api.twitter.v2.maps.MediaV2Map;
import org.nuclearfog.twidda.backend.api.twitter.v2.maps.PollV2Map;
import org.nuclearfog.twidda.backend.api.twitter.v2.maps.UserV2Map;
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
import org.nuclearfog.twidda.lists.Statuses;
import org.nuclearfog.twidda.lists.Users;
import org.nuclearfog.twidda.model.lists.Statuses;
import org.nuclearfog.twidda.model.lists.Users;
import org.nuclearfog.twidda.backend.utils.StringUtils;
import org.nuclearfog.twidda.model.Account;
import org.nuclearfog.twidda.model.Instance;

View File

@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.nuclearfog.twidda.database.AppDatabase;
import org.nuclearfog.twidda.lists.Accounts;
import org.nuclearfog.twidda.model.lists.Accounts;
/**
* backend loader to get login information of local accounts

View File

@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import org.nuclearfog.twidda.backend.api.Connection;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.api.ConnectionManager;
import org.nuclearfog.twidda.lists.Domains;
import org.nuclearfog.twidda.model.lists.Domains;
/**
* background executor to load/block domains

View File

@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import org.nuclearfog.twidda.backend.api.Connection;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.api.ConnectionManager;
import org.nuclearfog.twidda.lists.Messages;
import org.nuclearfog.twidda.model.lists.Messages;
import org.nuclearfog.twidda.database.AppDatabase;
import org.nuclearfog.twidda.ui.fragments.MessageFragment;

View File

@ -9,7 +9,7 @@ import org.nuclearfog.twidda.backend.api.Connection;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.api.ConnectionManager;
import org.nuclearfog.twidda.database.AppDatabase;
import org.nuclearfog.twidda.lists.Notifications;
import org.nuclearfog.twidda.model.lists.Notifications;
import org.nuclearfog.twidda.ui.fragments.NotificationFragment;
/**

View File

@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import org.nuclearfog.twidda.backend.api.Connection;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.api.ConnectionManager;
import org.nuclearfog.twidda.lists.Statuses;
import org.nuclearfog.twidda.model.lists.Statuses;
import org.nuclearfog.twidda.database.AppDatabase;
import org.nuclearfog.twidda.ui.fragments.StatusFragment;

View File

@ -9,7 +9,7 @@ import org.nuclearfog.twidda.backend.api.Connection;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.api.ConnectionManager;
import org.nuclearfog.twidda.database.AppDatabase;
import org.nuclearfog.twidda.lists.Trends;
import org.nuclearfog.twidda.model.lists.Trends;
import org.nuclearfog.twidda.ui.fragments.TrendFragment;
/**

View File

@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import org.nuclearfog.twidda.backend.api.Connection;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.api.ConnectionManager;
import org.nuclearfog.twidda.lists.UserLists;
import org.nuclearfog.twidda.model.lists.UserLists;
import org.nuclearfog.twidda.ui.fragments.UserListFragment;
/**

View File

@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import org.nuclearfog.twidda.backend.api.Connection;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.api.ConnectionManager;
import org.nuclearfog.twidda.lists.Users;
import org.nuclearfog.twidda.model.lists.Users;
import org.nuclearfog.twidda.ui.fragments.UserFragment;
/**

View File

@ -7,10 +7,10 @@ import android.database.sqlite.SQLiteDatabase;
import androidx.annotation.Nullable;
import org.nuclearfog.twidda.lists.Accounts;
import org.nuclearfog.twidda.lists.Messages;
import org.nuclearfog.twidda.lists.Notifications;
import org.nuclearfog.twidda.lists.Statuses;
import org.nuclearfog.twidda.model.lists.Accounts;
import org.nuclearfog.twidda.model.lists.Messages;
import org.nuclearfog.twidda.model.lists.Notifications;
import org.nuclearfog.twidda.model.lists.Statuses;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.database.DatabaseAdapter.AccountTable;
import org.nuclearfog.twidda.database.DatabaseAdapter.BookmarkTable;
@ -39,7 +39,7 @@ import org.nuclearfog.twidda.database.impl.DatabasePoll;
import org.nuclearfog.twidda.database.impl.DatabaseStatus;
import org.nuclearfog.twidda.database.impl.DatabaseTrend;
import org.nuclearfog.twidda.database.impl.DatabaseUser;
import org.nuclearfog.twidda.lists.Trends;
import org.nuclearfog.twidda.model.lists.Trends;
import org.nuclearfog.twidda.model.Account;
import org.nuclearfog.twidda.model.Emoji;
import org.nuclearfog.twidda.model.Instance;

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.lists;
package org.nuclearfog.twidda.model.lists;
import org.nuclearfog.twidda.model.Account;

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.lists;
package org.nuclearfog.twidda.model.lists;
import java.util.LinkedList;

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.lists;
package org.nuclearfog.twidda.model.lists;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -91,6 +91,15 @@ public class Messages extends LinkedList<Message> {
return -1;
}
/**
* get previous cursor
*
* @return cursor string
*/
public String getPrevCursor() {
return prevCursor;
}
/**
* get next cursor string
*
@ -104,6 +113,6 @@ public class Messages extends LinkedList<Message> {
@Override
@NonNull
public String toString() {
return "size=" + size() + " previous=" + prevCursor + " next=" + nextCursor;
return "size=" + size() + " previous=" + getPrevCursor() + " next=" + getNextCursor();
}
}

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.lists;
package org.nuclearfog.twidda.model.lists;
import org.nuclearfog.twidda.model.Notification;

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.lists;
package org.nuclearfog.twidda.model.lists;
import androidx.annotation.Nullable;
@ -21,8 +21,7 @@ public class Statuses extends LinkedList<Status> {
*/
public static final long NO_ID = -1L;
private long prevCursor;
private long nextCursor;
private long prevCursor, nextCursor;
/**
* use status ID to determine minimum and maximum ID

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.lists;
package org.nuclearfog.twidda.model.lists;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -16,14 +16,13 @@ public class Trends extends LinkedList<Trend> {
private static final long serialVersionUID = 7646437787602696292L;
private long prevCursor = 0L;
private long nextCursor = 0L;
private long prevCursor, nextCursor;
/**
*
*/
public Trends() {
super();
this(0L, 0L);
}
/**

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.lists;
package org.nuclearfog.twidda.model.lists;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.lists;
package org.nuclearfog.twidda.model.lists;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -16,8 +16,7 @@ public class Users extends LinkedList<User> {
private static final long serialVersionUID = -1108521824070076679L;
private long prevCursor;
private long nextCursor;
private long prevCursor, nextCursor;
/**
*

View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.receiver;
package org.nuclearfog.twidda.notification;
import android.content.Context;

View File

@ -10,7 +10,7 @@ import com.squareup.picasso.Picasso;
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.lists.Accounts;
import org.nuclearfog.twidda.model.lists.Accounts;
import org.nuclearfog.twidda.model.Account;
import org.nuclearfog.twidda.ui.adapter.holder.AccountHolder;
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;

View File

@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView.Adapter;
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.lists.Domains;
import org.nuclearfog.twidda.model.lists.Domains;
import org.nuclearfog.twidda.ui.adapter.holder.DomainHolder;
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;

View File

@ -11,7 +11,7 @@ import com.squareup.picasso.Picasso;
import org.nuclearfog.tag.Tagger.OnTagClickListener;
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
import org.nuclearfog.twidda.lists.Messages;
import org.nuclearfog.twidda.model.lists.Messages;
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.model.Message;

View File

@ -12,7 +12,7 @@ import com.squareup.picasso.Picasso;
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.lists.Notifications;
import org.nuclearfog.twidda.model.lists.Notifications;
import org.nuclearfog.twidda.model.Notification;
import org.nuclearfog.twidda.model.User;
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;

View File

@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import com.squareup.picasso.Picasso;
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
import org.nuclearfog.twidda.lists.Statuses;
import org.nuclearfog.twidda.model.lists.Statuses;
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.model.Status;

View File

@ -7,7 +7,7 @@ import androidx.recyclerview.widget.RecyclerView.Adapter;
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.lists.Trends;
import org.nuclearfog.twidda.model.lists.Trends;
import org.nuclearfog.twidda.model.Trend;
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;

View File

@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import com.squareup.picasso.Picasso;
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
import org.nuclearfog.twidda.lists.Users;
import org.nuclearfog.twidda.model.lists.Users;
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.model.User;

View File

@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import com.squareup.picasso.Picasso;
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
import org.nuclearfog.twidda.lists.UserLists;
import org.nuclearfog.twidda.model.lists.UserLists;
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.model.User;

View File

@ -16,7 +16,7 @@ import org.nuclearfog.twidda.backend.async.DatabaseAction;
import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseParam;
import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseResult;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.lists.Accounts;
import org.nuclearfog.twidda.model.lists.Accounts;
import org.nuclearfog.twidda.model.Account;
import org.nuclearfog.twidda.ui.activities.AccountActivity;
import org.nuclearfog.twidda.ui.adapter.AccountAdapter;

View File

@ -13,7 +13,7 @@ import org.nuclearfog.twidda.backend.async.DomainAction;
import org.nuclearfog.twidda.backend.async.DomainAction.DomainParam;
import org.nuclearfog.twidda.backend.async.DomainAction.DomainResult;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.lists.Domains;
import org.nuclearfog.twidda.model.lists.Domains;
import org.nuclearfog.twidda.ui.adapter.DomainAdapter;
import org.nuclearfog.twidda.ui.adapter.DomainAdapter.OnDomainClickListener;
import org.nuclearfog.twidda.ui.dialogs.ConfirmDialog;

View File

@ -15,7 +15,7 @@ import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
import org.nuclearfog.twidda.backend.async.MessageLoader;
import org.nuclearfog.twidda.backend.async.MessageLoader.MessageLoaderParam;
import org.nuclearfog.twidda.backend.async.MessageLoader.MessageLoaderResult;
import org.nuclearfog.twidda.lists.Messages;
import org.nuclearfog.twidda.model.lists.Messages;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.backend.utils.LinkUtils;
import org.nuclearfog.twidda.model.Message;

View File

@ -21,7 +21,7 @@ import org.nuclearfog.twidda.backend.async.NotificationLoader;
import org.nuclearfog.twidda.backend.async.NotificationLoader.NotificationLoaderParam;
import org.nuclearfog.twidda.backend.async.NotificationLoader.NotificationLoaderResult;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.lists.Notifications;
import org.nuclearfog.twidda.model.lists.Notifications;
import org.nuclearfog.twidda.model.Notification;
import org.nuclearfog.twidda.model.User;
import org.nuclearfog.twidda.ui.activities.ProfileActivity;

View File

@ -16,7 +16,7 @@ import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
import org.nuclearfog.twidda.backend.async.StatusLoader;
import org.nuclearfog.twidda.backend.async.StatusLoader.StatusParameter;
import org.nuclearfog.twidda.backend.async.StatusLoader.StatusResult;
import org.nuclearfog.twidda.lists.Statuses;
import org.nuclearfog.twidda.model.lists.Statuses;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.model.Status;
import org.nuclearfog.twidda.ui.activities.StatusActivity;

View File

@ -17,7 +17,7 @@ import org.nuclearfog.twidda.backend.async.TrendLoader;
import org.nuclearfog.twidda.backend.async.TrendLoader.TrendParameter;
import org.nuclearfog.twidda.backend.async.TrendLoader.TrendResult;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.lists.Trends;
import org.nuclearfog.twidda.model.lists.Trends;
import org.nuclearfog.twidda.model.Trend;
import org.nuclearfog.twidda.ui.activities.SearchActivity;
import org.nuclearfog.twidda.ui.adapter.TrendAdapter;

View File

@ -19,7 +19,7 @@ import org.nuclearfog.twidda.backend.async.UserlistManager.ListManagerResult;
import org.nuclearfog.twidda.backend.async.UsersLoader;
import org.nuclearfog.twidda.backend.async.UsersLoader.UserParam;
import org.nuclearfog.twidda.backend.async.UsersLoader.UserResult;
import org.nuclearfog.twidda.lists.Users;
import org.nuclearfog.twidda.model.lists.Users;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.model.User;
import org.nuclearfog.twidda.ui.activities.ProfileActivity;

View File

@ -16,7 +16,7 @@ import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
import org.nuclearfog.twidda.backend.async.UserlistLoader;
import org.nuclearfog.twidda.backend.async.UserlistLoader.UserlistParam;
import org.nuclearfog.twidda.backend.async.UserlistLoader.UserlistResult;
import org.nuclearfog.twidda.lists.UserLists;
import org.nuclearfog.twidda.model.lists.UserLists;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.model.User;
import org.nuclearfog.twidda.model.UserList;