Reorder package

app/src/main/java/app/fedilab/android/BaseMainActivity.java

@@ -95,14 +95,14 @@ import app.fedilab.android.activities.ScheduledActivity;
 import app.fedilab.android.activities.SearchResultTabActivity;
 import app.fedilab.android.activities.SettingsActivity;
 import app.fedilab.android.broadcastreceiver.NetworkStateReceiver;
-import app.fedilab.android.client.entities.Account;
-import app.fedilab.android.client.entities.BottomMenu;
-import app.fedilab.android.client.entities.Pinned;
+import app.fedilab.android.client.entities.api.Filter;
+import app.fedilab.android.client.entities.api.Instance;
+import app.fedilab.android.client.entities.api.MastodonList;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.app.Account;
+import app.fedilab.android.client.entities.app.BottomMenu;
+import app.fedilab.android.client.entities.app.Pinned;
 import app.fedilab.android.client.entities.app.PinnedTimeline;
-import app.fedilab.android.client.mastodon.entities.Filter;
-import app.fedilab.android.client.mastodon.entities.Instance;
-import app.fedilab.android.client.mastodon.entities.MastodonList;
-import app.fedilab.android.client.mastodon.entities.Status;
 import app.fedilab.android.databinding.ActivityMainBinding;
 import app.fedilab.android.databinding.NavHeaderMainBinding;
 import app.fedilab.android.exception.DBException;
@@ -129,13 +129,13 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
     public static Instance instanceInfo;
     public static List<Filter> mainFilters;
     public static boolean filterFetched;
+    public static boolean show_boosts, show_replies, show_art_nsfw;
+    public static String regex_home, regex_local, regex_public;
     Fragment currentFragment;
     private Account account;
     private AppBarConfiguration mAppBarConfiguration;
     private ActivityMainBinding binding;
     private Pinned pinned;
-    public static boolean show_boosts, show_replies, show_art_nsfw;
-    public static String regex_home, regex_local, regex_public;
     private BottomMenu bottomMenu;
 
     private final BroadcastReceiver broadcast_data = new BroadcastReceiver() {
@@ -302,8 +302,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         binding.navView.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
 
 
-
-
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
         mAppBarConfiguration = new AppBarConfiguration.Builder()

app/src/main/java/app/fedilab/android/activities/ActionActivity.java

@@ -24,7 +24,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Timeline;
+import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityActionsBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.ThemeHelper;

app/src/main/java/app/fedilab/android/activities/ComposeActivity.java

@@ -58,12 +58,12 @@ import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Account;
-import app.fedilab.android.client.entities.StatusDraft;
-import app.fedilab.android.client.mastodon.entities.Context;
-import app.fedilab.android.client.mastodon.entities.Mention;
-import app.fedilab.android.client.mastodon.entities.ScheduledStatus;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Context;
+import app.fedilab.android.client.entities.api.Mention;
+import app.fedilab.android.client.entities.api.ScheduledStatus;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.app.Account;
+import app.fedilab.android.client.entities.app.StatusDraft;
 import app.fedilab.android.databinding.ActivityPaginationBinding;
 import app.fedilab.android.databinding.PopupContactBinding;
 import app.fedilab.android.exception.DBException;
@@ -100,8 +100,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
     private Uri photoFileUri;
     private ScheduledStatus scheduledStatus;
     private String visibility;
-    private app.fedilab.android.client.mastodon.entities.Account accountMention;
+    private app.fedilab.android.client.entities.api.Account accountMention;
     private String statusReplyId;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -131,7 +132,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
             instance = b.getString(Helper.ARG_INSTANCE, BaseMainActivity.currentInstance);
             token = b.getString(Helper.ARG_TOKEN, BaseMainActivity.currentToken);
             visibility = b.getString(Helper.ARG_VISIBILITY, null);
-            accountMention = (app.fedilab.android.client.mastodon.entities.Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);
+            accountMention = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);
         }
         binding.toolbar.setPopupTheme(Helper.popupStyle());
         //Edit a scheduled status from server
@@ -449,14 +450,14 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
     }
 
 
-    private void onRetrieveContact(PopupContactBinding binding, List<app.fedilab.android.client.mastodon.entities.Account> accounts) {
+    private void onRetrieveContact(PopupContactBinding binding, List<app.fedilab.android.client.entities.api.Account> accounts) {
         binding.loader.setVisibility(View.GONE);
         if (accounts == null) {
             accounts = new ArrayList<>();
         }
         List<Boolean> checkedValues = new ArrayList<>();
-        List<app.fedilab.android.client.mastodon.entities.Account> contacts = new ArrayList<>(accounts);
-        for (app.fedilab.android.client.mastodon.entities.Account account : contacts) {
+        List<app.fedilab.android.client.entities.api.Account> contacts = new ArrayList<>(accounts);
+        for (app.fedilab.android.client.entities.api.Account account : contacts) {
             checkedValues.add(composeAdapter.getLastComposeContent().contains("@" + account.acct));
         }
         AccountsReplyAdapter contactAdapter = new AccountsReplyAdapter(contacts, checkedValues);

app/src/main/java/app/fedilab/android/activities/ContextActivity.java

@@ -32,7 +32,7 @@ import androidx.preference.PreferenceManager;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.databinding.ActivityConversationBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.MastodonHelper;

app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java

@@ -32,10 +32,10 @@ import java.util.Set;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Attachment;
-import app.fedilab.android.client.mastodon.entities.Emoji;
-import app.fedilab.android.client.mastodon.entities.Status;
-import app.fedilab.android.client.mastodon.entities.Tag;
+import app.fedilab.android.client.entities.api.Attachment;
+import app.fedilab.android.client.entities.api.Emoji;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.api.Tag;
 import app.fedilab.android.databinding.ActivityCustomSharingBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.ThemeHelper;

app/src/main/java/app/fedilab/android/activities/DraftActivity.java

@@ -36,9 +36,9 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.StatusDraft;
-import app.fedilab.android.client.mastodon.entities.Attachment;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Attachment;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.app.StatusDraft;
 import app.fedilab.android.databinding.ActivityDraftsBinding;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;

app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java

@@ -42,8 +42,8 @@ import java.util.Locale;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.Field;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.Field;
 import app.fedilab.android.databinding.AccountFieldItemBinding;
 import app.fedilab.android.databinding.ActivityEditProfileBinding;
 import app.fedilab.android.exception.DBException;
@@ -193,7 +193,7 @@ public class EditProfileActivity extends BaseActivity {
                         Helper.recreateMainActivity(EditProfileActivity.this);
                         new Thread(() -> {
                             try {
-                                new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
+                                new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
                             } catch (DBException e) {
                                 e.printStackTrace();
                             }
@@ -213,7 +213,7 @@ public class EditProfileActivity extends BaseActivity {
                         BaseMainActivity.accountWeakReference.get().mastodon_account = account;
                         new Thread(() -> {
                             try {
-                                new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
+                                new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
                             } catch (DBException e) {
                                 e.printStackTrace();
                             }
@@ -304,7 +304,7 @@ public class EditProfileActivity extends BaseActivity {
                         BaseMainActivity.accountWeakReference.get().mastodon_account = account;
                         new Thread(() -> {
                             try {
-                                new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
+                                new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
                                 sendBroadCast(account);
                             } catch (DBException e) {
                                 e.printStackTrace();

app/src/main/java/app/fedilab/android/activities/FilterActivity.java

@@ -40,7 +40,7 @@ import java.util.Objects;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Filter;
+import app.fedilab.android.client.entities.api.Filter;
 import app.fedilab.android.databinding.ActivityFiltersBinding;
 import app.fedilab.android.databinding.PopupAddFilterBinding;
 import app.fedilab.android.helper.Helper;

app/src/main/java/app/fedilab/android/activities/HashTagActivity.java

@@ -33,12 +33,12 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Pinned;
-import app.fedilab.android.client.entities.StatusDraft;
-import app.fedilab.android.client.entities.Timeline;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.app.Pinned;
 import app.fedilab.android.client.entities.app.PinnedTimeline;
+import app.fedilab.android.client.entities.app.StatusDraft;
 import app.fedilab.android.client.entities.app.TagTimeline;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityHashtagBinding;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;

app/src/main/java/app/fedilab/android/activities/InstanceActivity.java

@@ -31,7 +31,7 @@ import com.bumptech.glide.Glide;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Instance;
+import app.fedilab.android.client.entities.api.Instance;
 import app.fedilab.android.databinding.ActivityInstanceBinding;
 import app.fedilab.android.helper.ThemeHelper;
 import app.fedilab.android.viewmodel.mastodon.InstancesVM;

app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java

@@ -31,7 +31,7 @@ import com.bumptech.glide.Glide;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.InstanceSocial;
+import app.fedilab.android.client.entities.app.InstanceSocial;
 import app.fedilab.android.databinding.ActivityInstanceSocialBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.ThemeHelper;

app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java

@@ -36,7 +36,7 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Account;
+import app.fedilab.android.client.entities.api.Account;
 import app.fedilab.android.databinding.ActivityInstanceProfileBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.ThemeHelper;

app/src/main/java/app/fedilab/android/activities/LoginActivity.java

@@ -43,8 +43,8 @@ import java.util.regex.Matcher;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Account;
-import app.fedilab.android.client.entities.WellKnownNodeinfo;
+import app.fedilab.android.client.entities.app.Account;
+import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.ThemeHelper;
@@ -160,17 +160,17 @@ public class LoginActivity extends BaseActivity {
         // as you specify a parent activity in AndroidManifest.xml.
         int id = item.getItemId();
 
-       if (id == R.id.action_proxy) {
-           Intent intent = new Intent(LoginActivity.this, ProxyActivity.class);
-           startActivity(intent);
-       } else if (id == R.id.action_custom_tabs) {
-           item.setChecked(!item.isChecked());
-           SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(LoginActivity.this);
-           SharedPreferences.Editor editor = sharedpreferences.edit();
-           editor.putBoolean(getString(R.string.SET_EMBEDDED_BROWSER), !item.isChecked());
-           editor.apply();
-           return false;
-       }
+        if (id == R.id.action_proxy) {
+            Intent intent = new Intent(LoginActivity.this, ProxyActivity.class);
+            startActivity(intent);
+        } else if (id == R.id.action_custom_tabs) {
+            item.setChecked(!item.isChecked());
+            SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(LoginActivity.this);
+            SharedPreferences.Editor editor = sharedpreferences.edit();
+            editor.putBoolean(getString(R.string.SET_EMBEDDED_BROWSER), !item.isChecked());
+            editor.apply();
+            return false;
+        }
         return super.onOptionsItemSelected(item);
     }
 

app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java

@@ -41,9 +41,9 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Timeline;
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.MastodonList;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.MastodonList;
+import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityListBinding;
 import app.fedilab.android.databinding.PopupAddListBinding;
 import app.fedilab.android.databinding.PopupManageAccountsListBinding;

app/src/main/java/app/fedilab/android/activities/MediaActivity.java

@@ -53,7 +53,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Attachment;
+import app.fedilab.android.client.entities.api.Attachment;
 import app.fedilab.android.databinding.ActivityMediaPagerBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.MediaHelper;

app/src/main/java/app/fedilab/android/activities/ProfileActivity.java

@@ -74,17 +74,17 @@ import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Pinned;
-import app.fedilab.android.client.entities.Timeline;
-import app.fedilab.android.client.entities.WellKnownNodeinfo;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.Attachment;
+import app.fedilab.android.client.entities.api.Field;
+import app.fedilab.android.client.entities.api.IdentityProof;
+import app.fedilab.android.client.entities.api.MastodonList;
+import app.fedilab.android.client.entities.api.RelationShip;
+import app.fedilab.android.client.entities.app.Pinned;
 import app.fedilab.android.client.entities.app.PinnedTimeline;
 import app.fedilab.android.client.entities.app.RemoteInstance;
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.Attachment;
-import app.fedilab.android.client.mastodon.entities.Field;
-import app.fedilab.android.client.mastodon.entities.IdentityProof;
-import app.fedilab.android.client.mastodon.entities.MastodonList;
-import app.fedilab.android.client.mastodon.entities.RelationShip;
+import app.fedilab.android.client.entities.app.Timeline;
+import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
 import app.fedilab.android.databinding.ActivityProfileBinding;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.CrossActionHelper;

app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java

@@ -48,12 +48,12 @@ import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.BottomMenu;
-import app.fedilab.android.client.entities.InstanceSocial;
-import app.fedilab.android.client.entities.Pinned;
-import app.fedilab.android.client.entities.Timeline;
+import app.fedilab.android.client.entities.app.BottomMenu;
+import app.fedilab.android.client.entities.app.InstanceSocial;
+import app.fedilab.android.client.entities.app.Pinned;
 import app.fedilab.android.client.entities.app.PinnedTimeline;
 import app.fedilab.android.client.entities.app.RemoteInstance;
+import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityReorderTabsBinding;
 import app.fedilab.android.databinding.PopupSearchInstanceBinding;
 import app.fedilab.android.exception.DBException;

app/src/main/java/app/fedilab/android/activities/ReportActivity.java

@@ -33,10 +33,10 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Timeline;
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.RelationShip;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.RelationShip;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityReportBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.ThemeHelper;

app/src/main/java/app/fedilab/android/activities/StatusInfoActivity.java

@@ -31,9 +31,9 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.Accounts;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.Accounts;
+import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.databinding.ActivityStatusInfoBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.ThemeHelper;

app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java

@@ -53,7 +53,7 @@ import java.util.regex.Matcher;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Account;
+import app.fedilab.android.client.entities.app.Account;
 import app.fedilab.android.databinding.ActivityWebviewConnectBinding;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;

app/src/main/java/app/fedilab/android/client/NodeInfoService.java

@@ -15,7 +15,7 @@ package app.fedilab.android.client;
  * see <http://www.gnu.org/licenses>. */
 
 
-import app.fedilab.android.client.entities.WellKnownNodeinfo;
+import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Path;

app/src/main/java/app/fedilab/android/client/endpoints/JoinMastodonService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,7 +17,7 @@ package app.fedilab.android.client.mastodon;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.JoinMastodonInstance;
+import app.fedilab.android.client.entities.api.JoinMastodonInstance;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonAccountsService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,17 +17,17 @@ package app.fedilab.android.client.mastodon;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.FeaturedTag;
-import app.fedilab.android.client.mastodon.entities.Filter;
-import app.fedilab.android.client.mastodon.entities.IdentityProof;
-import app.fedilab.android.client.mastodon.entities.MastodonList;
-import app.fedilab.android.client.mastodon.entities.Preferences;
-import app.fedilab.android.client.mastodon.entities.RelationShip;
-import app.fedilab.android.client.mastodon.entities.Report;
-import app.fedilab.android.client.mastodon.entities.Status;
-import app.fedilab.android.client.mastodon.entities.Tag;
-import app.fedilab.android.client.mastodon.entities.Token;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.FeaturedTag;
+import app.fedilab.android.client.entities.api.Filter;
+import app.fedilab.android.client.entities.api.IdentityProof;
+import app.fedilab.android.client.entities.api.MastodonList;
+import app.fedilab.android.client.entities.api.Preferences;
+import app.fedilab.android.client.entities.api.RelationShip;
+import app.fedilab.android.client.entities.api.Report;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.api.Tag;
+import app.fedilab.android.client.entities.api.Token;
 import okhttp3.MultipartBody;
 import retrofit2.Call;
 import retrofit2.http.Body;
@@ -96,7 +96,7 @@ public interface MastodonAccountsService {
             @Field("source[privacy]") String privacy,
             @Field("source[sensitive]") Boolean sensitive,
             @Field("source[language]") String language,
-            @Field("fields_attributes") List<app.fedilab.android.client.mastodon.entities.Field.FieldParams> fields
+            @Field("fields_attributes") List<app.fedilab.android.client.entities.api.Field.FieldParams> fields
     );
 
     //Get Account

app/src/main/java/app/fedilab/android/client/endpoints/MastodonAdminService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,8 +17,8 @@ package app.fedilab.android.client.mastodon;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.AdminAccount;
-import app.fedilab.android.client.mastodon.entities.AdminReport;
+import app.fedilab.android.client.entities.api.AdminAccount;
+import app.fedilab.android.client.entities.api.AdminReport;
 import retrofit2.Call;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonAnnouncementsService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,7 +17,7 @@ package app.fedilab.android.client.mastodon;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Announcement;
+import app.fedilab.android.client.entities.api.Announcement;
 import retrofit2.Call;
 import retrofit2.http.DELETE;
 import retrofit2.http.FormUrlEncoded;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonAppsService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,8 +15,8 @@ package app.fedilab.android.client.mastodon;
  * see <http://www.gnu.org/licenses>. */
 
 
-import app.fedilab.android.client.mastodon.entities.App;
-import app.fedilab.android.client.mastodon.entities.Token;
+import app.fedilab.android.client.entities.api.App;
+import app.fedilab.android.client.entities.api.Token;
 import retrofit2.Call;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonInstanceService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,11 +17,11 @@ package app.fedilab.android.client.mastodon;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.Activity;
-import app.fedilab.android.client.mastodon.entities.Emoji;
-import app.fedilab.android.client.mastodon.entities.Instance;
-import app.fedilab.android.client.mastodon.entities.Tag;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.Activity;
+import app.fedilab.android.client.entities.api.Emoji;
+import app.fedilab.android.client.entities.api.Instance;
+import app.fedilab.android.client.entities.api.Tag;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonNotificationsService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -16,8 +16,8 @@ package app.fedilab.android.client.mastodon;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Notification;
-import app.fedilab.android.client.mastodon.entities.PushSubscription;
+import app.fedilab.android.client.entities.api.Notification;
+import app.fedilab.android.client.entities.api.PushSubscription;
 import retrofit2.Call;
 import retrofit2.http.DELETE;
 import retrofit2.http.Field;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonOembedService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,7 +15,7 @@ package app.fedilab.android.client.mastodon;
  * see <http://www.gnu.org/licenses>. */
 
 
-import app.fedilab.android.client.mastodon.entities.Oembed;
+import app.fedilab.android.client.entities.api.Oembed;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonSearchService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,7 +15,7 @@ package app.fedilab.android.client.mastodon;
  * see <http://www.gnu.org/licenses>. */
 
 
-import app.fedilab.android.client.mastodon.entities.Results;
+import app.fedilab.android.client.entities.api.Results;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Header;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonStatusesService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,13 +17,13 @@ package app.fedilab.android.client.mastodon;
 import java.util.Date;
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.Attachment;
-import app.fedilab.android.client.mastodon.entities.Card;
-import app.fedilab.android.client.mastodon.entities.Context;
-import app.fedilab.android.client.mastodon.entities.Poll;
-import app.fedilab.android.client.mastodon.entities.ScheduledStatus;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.Attachment;
+import app.fedilab.android.client.entities.api.Card;
+import app.fedilab.android.client.entities.api.Context;
+import app.fedilab.android.client.entities.api.Poll;
+import app.fedilab.android.client.entities.api.ScheduledStatus;
+import app.fedilab.android.client.entities.api.Status;
 import okhttp3.MultipartBody;
 import retrofit2.Call;
 import retrofit2.http.DELETE;

app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -16,11 +16,11 @@ package app.fedilab.android.client.mastodon;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.Conversation;
-import app.fedilab.android.client.mastodon.entities.Marker;
-import app.fedilab.android.client.mastodon.entities.MastodonList;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.Conversation;
+import app.fedilab.android.client.entities.api.Marker;
+import app.fedilab.android.client.entities.api.MastodonList;
+import app.fedilab.android.client.entities.api.Status;
 import retrofit2.Call;
 import retrofit2.http.DELETE;
 import retrofit2.http.Field;

app/src/main/java/app/fedilab/android/client/endpoints/ProgressRequestBody.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon;
+package app.fedilab.android.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Account.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Accounts.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Activity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/AdminAccount.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/AdminReport.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Announcement.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/App.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Attachment.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Card.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Context.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Conversation.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/app/fedilab/android/client/entities/api/Conversations.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Emoji.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/EmojiInstance.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Error.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/FeaturedTag.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/app/fedilab/android/client/entities/api/Field.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Filter.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/app/fedilab/android/client/entities/api/History.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/app/fedilab/android/client/entities/api/IdentityProof.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/app/fedilab/android/client/entities/api/Instance.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/app/fedilab/android/client/entities/api/InstanceInfo.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/JoinMastodonInstance.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Marker.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/MastodonList.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Mention.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Notification.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Notifications.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Oembed.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Pagination.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Poll.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Preferences.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/app/fedilab/android/client/entities/api/PushSubscription.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Reaction.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/RelationShip.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Report.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Results.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/ScheduledStatus.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/ScheduledStatuses.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Source.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Status.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Statuses.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Tag.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/api/Token.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.mastodon.entities;
+package app.fedilab.android.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/app/Account.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -64,7 +64,7 @@ public class Account implements Serializable {
     @SerializedName("updated_at")
     public Date updated_at;
     @SerializedName("mastodon_account")
-    public app.fedilab.android.client.mastodon.entities.Account mastodon_account;
+    public app.fedilab.android.client.entities.api.Account mastodon_account;
 
     private transient Context context;
 
@@ -81,10 +81,10 @@ public class Account implements Serializable {
     /**
      * Serialized a Mastodon Account class
      *
-     * @param mastodon_account {@link app.fedilab.android.client.mastodon.entities.Account} to serialize
+     * @param mastodon_account {@link app.fedilab.android.client.entities.api.Account} to serialize
      * @return String serialized account
      */
-    public static String mastodonAccountToStringStorage(app.fedilab.android.client.mastodon.entities.Account mastodon_account) {
+    public static String mastodonAccountToStringStorage(app.fedilab.android.client.entities.api.Account mastodon_account) {
         Gson gson = new Gson();
         try {
             return gson.toJson(mastodon_account);
@@ -97,12 +97,12 @@ public class Account implements Serializable {
      * Unserialized a Mastodon Account
      *
      * @param serializedAccount String serialized account
-     * @return {@link app.fedilab.android.client.mastodon.entities.Account}
+     * @return {@link app.fedilab.android.client.entities.api.Account}
      */
-    public static app.fedilab.android.client.mastodon.entities.Account restoreAccountFromString(String serializedAccount) {
+    public static app.fedilab.android.client.entities.api.Account restoreAccountFromString(String serializedAccount) {
         Gson gson = new Gson();
         try {
-            return gson.fromJson(serializedAccount, app.fedilab.android.client.mastodon.entities.Account.class);
+            return gson.fromJson(serializedAccount, app.fedilab.android.client.entities.api.Account.class);
         } catch (Exception e) {
             return null;
         }

app/src/main/java/app/fedilab/android/client/entities/app/BottomMenu.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/app/InstanceSocial.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/app/Pinned.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -29,7 +29,6 @@ import java.util.Date;
 import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
-import app.fedilab.android.client.entities.app.PinnedTimeline;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.sqlite.Sqlite;

app/src/main/java/app/fedilab/android/client/entities/app/PinnedTimeline.java

@@ -18,8 +18,7 @@ import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
 
-import app.fedilab.android.client.entities.Timeline;
-import app.fedilab.android.client.mastodon.entities.MastodonList;
+import app.fedilab.android.client.entities.api.MastodonList;
 
 public class PinnedTimeline implements Serializable {
 

app/src/main/java/app/fedilab/android/client/entities/app/PostState.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.MastodonHelper;
 import app.fedilab.android.helper.SpannableHelper;

app/src/main/java/app/fedilab/android/client/entities/app/ScheduledBoost.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -14,8 +14,8 @@ package app.fedilab.android.client.entities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import static app.fedilab.android.client.entities.StatusCache.mastodonStatusToStringStorage;
-import static app.fedilab.android.client.entities.StatusCache.restoreStatusFromString;
+import static app.fedilab.android.client.entities.app.StatusCache.mastodonStatusToStringStorage;
+import static app.fedilab.android.client.entities.app.StatusCache.restoreStatusFromString;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.UUID;
 
 import app.fedilab.android.BaseMainActivity;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.sqlite.Sqlite;

app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -26,9 +26,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Pagination;
-import app.fedilab.android.client.mastodon.entities.Status;
-import app.fedilab.android.client.mastodon.entities.Statuses;
+import app.fedilab.android.client.entities.api.Pagination;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.api.Statuses;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.MastodonHelper;

app/src/main/java/app/fedilab/android/client/entities/app/StatusDraft.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.UUID;
 
 import app.fedilab.android.BaseMainActivity;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.sqlite.Sqlite;

app/src/main/java/app/fedilab/android/client/entities/app/Timeline.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/client/entities/app/WellKnownNodeinfo.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities;
+package app.fedilab.android.client.entities.app;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/helper/CommentDecorationHelper.java

@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Status;
 
 
 public class CommentDecorationHelper {

app/src/main/java/app/fedilab/android/helper/CrossActionHelper.java

@@ -36,10 +36,10 @@ import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
 import app.fedilab.android.activities.ComposeActivity;
 import app.fedilab.android.activities.MainActivity;
-import app.fedilab.android.client.entities.Account;
-import app.fedilab.android.client.mastodon.MastodonSearchService;
-import app.fedilab.android.client.mastodon.entities.Results;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.endpoints.MastodonSearchService;
+import app.fedilab.android.client.entities.api.Results;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.app.Account;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.ui.drawer.AccountsSearchAdapter;
 import app.fedilab.android.viewmodel.mastodon.AccountsVM;
@@ -63,7 +63,7 @@ public class CrossActionHelper {
      * @param targetedAccount mastodon account that is targeted
      * @param targetedStatus  status that is targeted
      */
-    public static void doCrossAction(@NonNull Context context, @NonNull TypeOfCrossAction actionType, app.fedilab.android.client.mastodon.entities.Account targetedAccount, Status targetedStatus) {
+    public static void doCrossAction(@NonNull Context context, @NonNull TypeOfCrossAction actionType, app.fedilab.android.client.entities.api.Account targetedAccount, Status targetedStatus) {
         final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
         new Thread(() -> {
             try {
@@ -73,7 +73,7 @@ public class CrossActionHelper {
                     Runnable myRunnable = () -> fetchRemote(context, actionType, accounts.get(0), targetedAccount, targetedStatus);
                     mainHandler.post(myRunnable);
                 } else {
-                    List<app.fedilab.android.client.mastodon.entities.Account> accountList = new ArrayList<>();
+                    List<app.fedilab.android.client.entities.api.Account> accountList = new ArrayList<>();
                     for (Account account : accounts) {
                         accountList.add(account.mastodon_account);
                     }
@@ -127,7 +127,7 @@ public class CrossActionHelper {
     /**
      * Fetch and federate the remote account or status
      */
-    private static void fetchRemote(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull Account ownerAccount, app.fedilab.android.client.mastodon.entities.Account targetedAccount, Status targetedStatus) {
+    private static void fetchRemote(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull Account ownerAccount, app.fedilab.android.client.entities.api.Account targetedAccount, Status targetedStatus) {
 
         SearchVM searchVM = new ViewModelProvider((ViewModelStoreOwner) context).get("crossactions", SearchVM.class);
         if (targetedAccount != null) {
@@ -140,7 +140,7 @@ public class CrossActionHelper {
             searchVM.search(ownerAccount.instance, ownerAccount.token, search, null, "accounts", false, true, false, 0, null, null, 1)
                     .observe((LifecycleOwner) context, results -> {
                         if (results.accounts != null && results.accounts.size() > 0) {
-                            app.fedilab.android.client.mastodon.entities.Account account = results.accounts.get(0);
+                            app.fedilab.android.client.entities.api.Account account = results.accounts.get(0);
                             applyAction(context, actionType, ownerAccount, account, null);
                         } else {
                             Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show();
@@ -165,7 +165,7 @@ public class CrossActionHelper {
     /**
      * Do action when status or account has been fetched
      */
-    private static void applyAction(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull Account ownerAccount, app.fedilab.android.client.mastodon.entities.Account targetedAccount, Status targetedStatus) {
+    private static void applyAction(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull Account ownerAccount, app.fedilab.android.client.entities.api.Account targetedAccount, Status targetedStatus) {
 
         AccountsVM accountsVM = null;
         StatusesVM statusesVM = null;
@@ -306,7 +306,7 @@ public class CrossActionHelper {
     /**
      * Fetch and federate the remote status
      */
-    public static void fetchRemoteAccount(@NonNull Context context, @NonNull Account ownerAccount, app.fedilab.android.client.mastodon.entities.Account targetedAccount, Callback callback) {
+    public static void fetchRemoteAccount(@NonNull Context context, @NonNull Account ownerAccount, app.fedilab.android.client.entities.api.Account targetedAccount, Callback callback) {
 
 
         MastodonSearchService mastodonSearchService = init(context, MainActivity.currentInstance);
@@ -354,13 +354,6 @@ public class CrossActionHelper {
         }).start();
     }
 
-    public interface Callback {
-        void federatedStatus(Status status);
-
-        void federatedAccount(app.fedilab.android.client.mastodon.entities.Account account);
-    }
-
-
     public enum TypeOfCrossAction {
         FOLLOW_ACTION,
         UNFOLLOW_ACTION,
@@ -376,4 +369,11 @@ public class CrossActionHelper {
         UNREBLOG_ACTION,
         REPLY_ACTION
     }
+
+
+    public interface Callback {
+        void federatedStatus(Status status);
+
+        void federatedAccount(app.fedilab.android.client.entities.api.Account account);
+    }
 }

app/src/main/java/app/fedilab/android/helper/DividerDecoration.java

@@ -31,7 +31,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.ui.drawer.StatusAdapter;
 
 public class DividerDecoration extends RecyclerView.ItemDecoration {

app/src/main/java/app/fedilab/android/helper/DividerDecorationSimple.java

@@ -29,7 +29,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.util.List;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.ui.drawer.ComposeAdapter;
 
 public class DividerDecorationSimple extends RecyclerView.ItemDecoration {

app/src/main/java/app/fedilab/android/helper/Helper.java

@@ -124,10 +124,10 @@ import app.fedilab.android.activities.LoginActivity;
 import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.activities.WebviewActivity;
 import app.fedilab.android.broadcastreceiver.ToastMessage;
-import app.fedilab.android.client.entities.Account;
-import app.fedilab.android.client.entities.QuickLoad;
-import app.fedilab.android.client.entities.StatusCache;
-import app.fedilab.android.client.mastodon.entities.Attachment;
+import app.fedilab.android.client.entities.api.Attachment;
+import app.fedilab.android.client.entities.app.Account;
+import app.fedilab.android.client.entities.app.QuickLoad;
+import app.fedilab.android.client.entities.app.StatusCache;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.sqlite.Sqlite;
 import app.fedilab.android.viewmodel.mastodon.OauthVM;
@@ -282,6 +282,11 @@ public class Helper {
             "(?i)\\b((?:[a-z][\\w-]+:(?:/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,10}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))",
 
             Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+    // --- Static Map of patterns used in spannable status content
+    public static final Map<PatternType, Pattern> patternHashMap;
+    public static final int NOTIFICATION_MEDIA = 451;
+    public static final int NOTIFICATION_USER_NOTIF = 411;
+    public static final int NOTIFICATION_THEMING = 412;
     /*
      * List from ClearUrls
      * https://gitlab.com/KevinRoebert/ClearUrls/blob/master/data/data.min.json#L106
@@ -312,9 +317,6 @@ public class Helper {
             "[\\?|&]ref[\\_]?"
 
     };
-
-    // --- Static Map of patterns used in spannable status content
-    public static final Map<PatternType, Pattern> patternHashMap;
     public static int counter = 1;
 
     static {
@@ -791,7 +793,6 @@ public class Helper {
         return cleaned_content;
     }
 
-
     @SuppressLint("DefaultLocale")
     public static String withSuffix(long count) {
         if (count < 1000) return "" + count;
@@ -1001,11 +1002,6 @@ public class Helper {
 
     }
 
-
-    public static final int NOTIFICATION_MEDIA = 451;
-    public static final int NOTIFICATION_USER_NOTIF = 411;
-    public static final int NOTIFICATION_THEMING = 412;
-
     /**
      * Sends notification with intent
      *
@@ -1465,6 +1461,25 @@ public class Helper {
         }
     }
 
+    /**
+     * Send broadcast to recreate Mainactivity
+     *
+     * @param activity - Activity
+     */
+    public static void recreateMainActivity(Activity activity) {
+        Bundle b = new Bundle();
+        b.putBoolean(Helper.RECEIVE_RECREATE_ACTIVITY, true);
+        Intent intentBD = new Intent(Helper.BROADCAST_DATA);
+        intentBD.putExtras(b);
+        LocalBroadcastManager.getInstance(activity).sendBroadcast(intentBD);
+    }
+
+    public static void showKeyboard(Context context, View view) {
+        view.requestFocus();
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+    }
+
     //Enum that described actions to replace inside a toot content
     public enum PatternType {
         MENTION,
@@ -1485,6 +1500,7 @@ public class Helper {
         TOOT
     }
 
+
     public interface OnAttachmentCopied {
         void onAttachmentCopied(Attachment attachment);
     }
@@ -1549,24 +1565,4 @@ public class Helper {
             }).start();
         }
     }
-
-
-    /**
-     * Send broadcast to recreate Mainactivity
-     *
-     * @param activity - Activity
-     */
-    public static void recreateMainActivity(Activity activity) {
-        Bundle b = new Bundle();
-        b.putBoolean(Helper.RECEIVE_RECREATE_ACTIVITY, true);
-        Intent intentBD = new Intent(Helper.BROADCAST_DATA);
-        intentBD.putExtras(b);
-        LocalBroadcastManager.getInstance(activity).sendBroadcast(intentBD);
-    }
-
-    public static void showKeyboard(Context context, View view) {
-        view.requestFocus();
-        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-    }
 }

app/src/main/java/app/fedilab/android/helper/MastodonHelper.java

@@ -49,11 +49,11 @@ import java.util.regex.Pattern;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.ScheduledBoost;
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.Pagination;
-import app.fedilab.android.client.mastodon.entities.RelationShip;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.Pagination;
+import app.fedilab.android.client.entities.api.RelationShip;
+import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.app.ScheduledBoost;
 import app.fedilab.android.databinding.DatetimePickerBinding;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.jobs.ScheduleBoostWorker;
@@ -191,11 +191,11 @@ public class MastodonHelper {
         return pagination;
     }
 */
-    public static void loadPPMastodon(ImageView view, app.fedilab.android.client.mastodon.entities.Account account) {
+    public static void loadPPMastodon(ImageView view, Account account) {
         loadProfileMediaMastodon(view, account, MediaAccountType.AVATAR);
     }
 
-    public static void loadProfileMediaMastodon(ImageView view, app.fedilab.android.client.mastodon.entities.Account account, MediaAccountType type) {
+    public static void loadProfileMediaMastodon(ImageView view, Account account, MediaAccountType type) {
         Context context = view.getContext();
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
         boolean disableGif = sharedpreferences.getBoolean(context.getString(R.string.SET_DISABLE_GIF), false);

app/src/main/java/app/fedilab/android/helper/NotificationsHelper.java

@@ -49,10 +49,10 @@ import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.MainActivity;
-import app.fedilab.android.client.entities.Account;
-import app.fedilab.android.client.mastodon.MastodonNotificationsService;
-import app.fedilab.android.client.mastodon.entities.Notification;
-import app.fedilab.android.client.mastodon.entities.Notifications;
+import app.fedilab.android.client.endpoints.MastodonNotificationsService;
+import app.fedilab.android.client.entities.api.Notification;
+import app.fedilab.android.client.entities.api.Notifications;
+import app.fedilab.android.client.entities.app.Account;
 import app.fedilab.android.exception.DBException;
 import okhttp3.OkHttpClient;
 import retrofit2.Call;

app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java

@@ -43,13 +43,13 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.BottomMenu;
-import app.fedilab.android.client.entities.Pinned;
-import app.fedilab.android.client.entities.Timeline;
+import app.fedilab.android.client.entities.api.MastodonList;
+import app.fedilab.android.client.entities.app.BottomMenu;
+import app.fedilab.android.client.entities.app.Pinned;
 import app.fedilab.android.client.entities.app.PinnedTimeline;
 import app.fedilab.android.client.entities.app.RemoteInstance;
 import app.fedilab.android.client.entities.app.TagTimeline;
-import app.fedilab.android.client.mastodon.entities.MastodonList;
+import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityMainBinding;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation;

app/src/main/java/app/fedilab/android/helper/PushHelper.java

@@ -37,7 +37,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Account;
+import app.fedilab.android.client.entities.app.Account;
 import app.fedilab.android.jobs.NotificationsWorker;
 
 public class PushHelper {

app/src/main/java/app/fedilab/android/helper/PushNotifications.java

@@ -32,9 +32,9 @@ import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.Account;
-import app.fedilab.android.client.mastodon.MastodonNotificationsService;
-import app.fedilab.android.client.mastodon.entities.PushSubscription;
+import app.fedilab.android.client.endpoints.MastodonNotificationsService;
+import app.fedilab.android.client.entities.api.PushSubscription;
+import app.fedilab.android.client.entities.app.Account;
 import app.fedilab.android.exception.DBException;
 import okhttp3.OkHttpClient;
 import retrofit2.Call;

app/src/main/java/app/fedilab/android/helper/SpannableHelper.java

@@ -75,13 +75,13 @@ import app.fedilab.android.activities.ContextActivity;
 import app.fedilab.android.activities.HashTagActivity;
 import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.activities.ProfileActivity;
-import app.fedilab.android.client.mastodon.entities.Account;
-import app.fedilab.android.client.mastodon.entities.Attachment;
-import app.fedilab.android.client.mastodon.entities.Emoji;
-import app.fedilab.android.client.mastodon.entities.Field;
-import app.fedilab.android.client.mastodon.entities.Mention;
-import app.fedilab.android.client.mastodon.entities.Poll;
-import app.fedilab.android.client.mastodon.entities.Status;
+import app.fedilab.android.client.entities.api.Account;
+import app.fedilab.android.client.entities.api.Attachment;
+import app.fedilab.android.client.entities.api.Emoji;
+import app.fedilab.android.client.entities.api.Field;
+import app.fedilab.android.client.entities.api.Mention;
+import app.fedilab.android.client.entities.api.Poll;
+import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.databinding.PopupLinksBinding;
 import es.dmoral.toasty.Toasty;