diff --git a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java index 7a780a11..54974a2c 100644 --- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java @@ -30,6 +30,7 @@ import androidx.lifecycle.ViewModelProvider; import java.util.ArrayList; import java.util.List; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BuildConfig; import app.fedilab.android.R; import app.fedilab.android.client.entities.api.Account; @@ -112,12 +113,12 @@ public class AboutActivity extends BaseActivity { AccountsVM accountsVM = new ViewModelProvider(AboutActivity.this).get(AccountsVM.class); List ids = new ArrayList<>(); ids.add(account.id); - accountsVM.getRelationships(MainActivity.currentInstance, MainActivity.currentToken, ids) + accountsVM.getRelationships(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, ids) .observe(AboutActivity.this, relationShips -> { if (relationShips != null && relationShips.size() > 0) { if (!relationShips.get(0).following) { binding.accountFollow.setVisibility(View.VISIBLE); - binding.accountFollow.setOnClickListener(v -> accountsVM.follow(MainActivity.currentInstance, MainActivity.currentToken, account.id, true, false) + binding.accountFollow.setOnClickListener(v -> accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false) .observe(AboutActivity.this, relationShip -> binding.accountFollow.setVisibility(View.GONE))); } } diff --git a/app/src/main/java/app/fedilab/android/activities/AdminAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/AdminAccountActivity.java index 9ebe475d..8421d924 100644 --- a/app/src/main/java/app/fedilab/android/activities/AdminAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AdminAccountActivity.java @@ -171,14 +171,14 @@ public class AdminAccountActivity extends BaseActivity { binding.disableAction.setOnClickListener(v -> { if (adminAccount.disabled) { - adminVM.enable(MainActivity.currentInstance, MainActivity.currentToken, account.id) + adminVM.enable(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe(AdminAccountActivity.this, adminAccountResult -> { adminAccount.disabled = false; binding.disableAction.setText(R.string.disable); binding.disabled.setText(R.string.no); }); } else { - adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "disable ", null, null, null, null); + adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "disable ", null, null, null, null); adminAccount.disabled = true; binding.disableAction.setText(R.string.undisable); binding.disabled.setText(R.string.yes); @@ -187,14 +187,14 @@ public class AdminAccountActivity extends BaseActivity { binding.approveAction.setOnClickListener(v -> { if (adminAccount.approved) { - adminVM.reject(MainActivity.currentInstance, MainActivity.currentToken, account.id) + adminVM.reject(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe(AdminAccountActivity.this, adminAccountResult -> { adminAccount.approved = false; binding.approveAction.setText(R.string.approve); binding.approved.setText(R.string.no); }); } else { - adminVM.approve(MainActivity.currentInstance, MainActivity.currentToken, account.id); + adminVM.approve(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id); adminAccount.approved = true; binding.approveAction.setText(R.string.reject); binding.approved.setText(R.string.yes); @@ -203,14 +203,14 @@ public class AdminAccountActivity extends BaseActivity { binding.silenceAction.setOnClickListener(v -> { if (adminAccount.disabled) { - adminVM.unsilence(MainActivity.currentInstance, MainActivity.currentToken, account.id) + adminVM.unsilence(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe(AdminAccountActivity.this, adminAccountResult -> { adminAccount.silenced = false; binding.silenceAction.setText(R.string.silence); binding.disabled.setText(R.string.no); }); } else { - adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "silence", null, null, null, null); + adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "silence", null, null, null, null); adminAccount.silenced = true; binding.disableAction.setText(R.string.unsilence); binding.disabled.setText(R.string.yes); @@ -219,14 +219,14 @@ public class AdminAccountActivity extends BaseActivity { binding.suspendAction.setOnClickListener(v -> { if (adminAccount.disabled) { - adminVM.unsuspend(MainActivity.currentInstance, MainActivity.currentToken, account.id) + adminVM.unsuspend(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe(AdminAccountActivity.this, adminAccountResult -> { adminAccount.suspended = false; binding.suspendAction.setText(R.string.suspend); binding.suspended.setText(R.string.no); }); } else { - adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "suspend", null, null, null, null); + adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "suspend", null, null, null, null); adminAccount.suspended = true; binding.disableAction.setText(R.string.unsuspend); binding.suspended.setText(R.string.yes); diff --git a/app/src/main/java/app/fedilab/android/activities/AdminReportActivity.java b/app/src/main/java/app/fedilab/android/activities/AdminReportActivity.java index d3727cf3..701dbd07 100644 --- a/app/src/main/java/app/fedilab/android/activities/AdminReportActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AdminReportActivity.java @@ -171,7 +171,7 @@ public class AdminReportActivity extends BaseActivity { binding.disableAction.setOnClickListener(v -> { if (adminAccount.disabled) { - adminVM.enable(MainActivity.currentInstance, MainActivity.currentToken, account.id) + adminVM.enable(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe(AdminReportActivity.this, adminAccountResult -> { if (adminAccountResult != null) { adminAccount.disabled = false; @@ -183,7 +183,7 @@ public class AdminReportActivity extends BaseActivity { }); } else { - adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "disable ", null, null, null, null); + adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "disable ", null, null, null, null); adminAccount.disabled = true; binding.disableAction.setText(R.string.undisable); binding.disabled.setText(R.string.yes); @@ -192,7 +192,7 @@ public class AdminReportActivity extends BaseActivity { binding.approveAction.setOnClickListener(v -> { if (adminAccount.approved) { - adminVM.reject(MainActivity.currentInstance, MainActivity.currentToken, account.id) + adminVM.reject(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe(AdminReportActivity.this, adminAccountResult -> { if (adminAccountResult != null) { adminAccount.approved = false; @@ -204,7 +204,7 @@ public class AdminReportActivity extends BaseActivity { }); } else { - adminVM.approve(MainActivity.currentInstance, MainActivity.currentToken, account.id); + adminVM.approve(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id); adminAccount.approved = true; binding.approveAction.setText(R.string.reject); binding.approved.setText(R.string.yes); @@ -213,7 +213,7 @@ public class AdminReportActivity extends BaseActivity { binding.silenceAction.setOnClickListener(v -> { if (adminAccount.disabled) { - adminVM.unsilence(MainActivity.currentInstance, MainActivity.currentToken, account.id) + adminVM.unsilence(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe(AdminReportActivity.this, adminAccountResult -> { if (adminAccountResult != null) { adminAccount.silenced = false; @@ -224,7 +224,7 @@ public class AdminReportActivity extends BaseActivity { } }); } else { - adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "silence", null, null, null, null); + adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "silence", null, null, null, null); adminAccount.silenced = true; binding.disableAction.setText(R.string.unsilence); binding.disabled.setText(R.string.yes); @@ -233,7 +233,7 @@ public class AdminReportActivity extends BaseActivity { binding.suspendAction.setOnClickListener(v -> { if (adminAccount.disabled) { - adminVM.unsuspend(MainActivity.currentInstance, MainActivity.currentToken, account.id) + adminVM.unsuspend(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe(AdminReportActivity.this, adminAccountResult -> { if (adminAccountResult != null) { adminAccount.suspended = false; @@ -244,7 +244,7 @@ public class AdminReportActivity extends BaseActivity { } }); } else { - adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "suspend", null, null, null, null); + adminVM.performAction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, "suspend", null, null, null, null); adminAccount.suspended = true; binding.disableAction.setText(R.string.unsuspend); binding.suspended.setText(R.string.yes); diff --git a/app/src/main/java/app/fedilab/android/activities/ContextActivity.java b/app/src/main/java/app/fedilab/android/activities/ContextActivity.java index 3710edf7..51fd8f32 100644 --- a/app/src/main/java/app/fedilab/android/activities/ContextActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ContextActivity.java @@ -34,6 +34,7 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.preference.PreferenceManager; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; import app.fedilab.android.client.entities.api.Status; import app.fedilab.android.client.entities.app.QuickLoad; @@ -97,11 +98,11 @@ public class ContextActivity extends BaseActivity { mainHandler.post(myRunnable); }).start(); StatusesVM timelinesVM = new ViewModelProvider(ContextActivity.this).get(StatusesVM.class); - timelinesVM.getStatus(MainActivity.currentInstance, MainActivity.currentToken, focusedStatus.id).observe(ContextActivity.this, status -> { + timelinesVM.getStatus(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, focusedStatus.id).observe(ContextActivity.this, status -> { if (status != null) { StatusCache statusCache = new StatusCache(); - statusCache.instance = MainActivity.currentInstance; - statusCache.user_id = MainActivity.currentUserID; + statusCache.instance = BaseMainActivity.currentInstance; + statusCache.user_id = BaseMainActivity.currentUserID; statusCache.status = status; statusCache.status_id = status.id; //Update cache diff --git a/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java b/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java index ffa8e130..353897f1 100644 --- a/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java @@ -31,6 +31,7 @@ import androidx.lifecycle.ViewModelProvider; import java.util.ArrayList; import java.util.List; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; import app.fedilab.android.client.entities.api.Account; import app.fedilab.android.client.entities.api.Status; @@ -92,12 +93,12 @@ public class PartnerShipActivity extends BaseActivity { AccountsVM accountsVM = new ViewModelProvider(PartnerShipActivity.this).get(AccountsVM.class); List ids = new ArrayList<>(); ids.add(account.id); - accountsVM.getRelationships(MainActivity.currentInstance, MainActivity.currentToken, ids) + accountsVM.getRelationships(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, ids) .observe(PartnerShipActivity.this, relationShips -> { if (relationShips != null && relationShips.size() > 0) { if (!relationShips.get(0).following) { binding.accountFollow.setVisibility(View.VISIBLE); - binding.accountFollow.setOnClickListener(v -> accountsVM.follow(MainActivity.currentInstance, MainActivity.currentToken, account.id, true, false) + binding.accountFollow.setOnClickListener(v -> accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false) .observe(PartnerShipActivity.this, relationShip -> binding.accountFollow.setVisibility(View.GONE))); } } diff --git a/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java b/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java index 1fc6159c..2120a7fb 100644 --- a/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java @@ -46,6 +46,7 @@ import androidx.preference.PreferenceManager; import java.util.regex.Matcher; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; import app.fedilab.android.client.entities.app.Account; import app.fedilab.android.databinding.ActivityWebviewConnectBinding; @@ -90,16 +91,16 @@ public class WebviewConnectActivity extends BaseActivity { //update the database new Account(activity).insertOrUpdate(account); Handler mainHandler = new Handler(Looper.getMainLooper()); - MainActivity.currentToken = account.token; - MainActivity.currentUserID = account.user_id; - MainActivity.api = Account.API.MASTODON; + BaseMainActivity.currentToken = account.token; + BaseMainActivity.currentUserID = account.user_id; + BaseMainActivity.api = Account.API.MASTODON; SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity); SharedPreferences.Editor editor = sharedpreferences.edit(); editor.putString(PREF_USER_TOKEN, account.token); editor.commit(); //The user is now authenticated, it will be redirected to MainActivity Runnable myRunnable = () -> { - Intent mainActivity = new Intent(activity, MainActivity.class); + Intent mainActivity = new Intent(activity, BaseMainActivity.class); activity.startActivity(mainActivity); activity.finish(); }; diff --git a/app/src/main/java/app/fedilab/android/helper/CrossActionHelper.java b/app/src/main/java/app/fedilab/android/helper/CrossActionHelper.java index 72089125..93048628 100644 --- a/app/src/main/java/app/fedilab/android/helper/CrossActionHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/CrossActionHelper.java @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; 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.endpoints.MastodonSearchService; import app.fedilab.android.client.entities.api.Results; import app.fedilab.android.client.entities.api.Status; @@ -265,7 +264,7 @@ public class CrossActionHelper { * Fetch and federate the remote status */ public static void fetchRemoteStatus(@NonNull Context context, @NonNull BaseAccount ownerAccount, String url, Callback callback) { - MastodonSearchService mastodonSearchService = init(context, MainActivity.currentInstance); + MastodonSearchService mastodonSearchService = init(context, BaseMainActivity.currentInstance); new Thread(() -> { Call resultsCall = mastodonSearchService.search(ownerAccount.token, url, null, "statuses", false, true, false, 0, null, null, 1); Results results = null; @@ -310,7 +309,7 @@ public class CrossActionHelper { public static void fetchRemoteAccount(@NonNull Context context, @NonNull BaseAccount ownerAccount, app.fedilab.android.client.entities.api.Account targetedAccount, Callback callback) { - MastodonSearchService mastodonSearchService = init(context, MainActivity.currentInstance); + MastodonSearchService mastodonSearchService = init(context, BaseMainActivity.currentInstance); String search; if (targetedAccount.acct.contains("@")) { //Not from same instance search = targetedAccount.acct; @@ -361,9 +360,9 @@ public class CrossActionHelper { public static void fetchRemoteAccount(@NonNull Context context, String acct, Callback callback) { - MastodonSearchService mastodonSearchService = init(context, MainActivity.currentInstance); + MastodonSearchService mastodonSearchService = init(context, BaseMainActivity.currentInstance); new Thread(() -> { - Call resultsCall = mastodonSearchService.search(MainActivity.currentToken, acct, null, "accounts", false, true, false, 0, null, null, 1); + Call resultsCall = mastodonSearchService.search(BaseMainActivity.currentToken, acct, null, "accounts", false, true, false, 0, null, null, 1); Results results = null; if (resultsCall != null) { try { diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 6d5454d5..c4be44a0 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -124,7 +124,6 @@ import app.fedilab.android.BaseMainActivity; import app.fedilab.android.MainApplication; import app.fedilab.android.R; 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.api.Attachment; @@ -907,7 +906,7 @@ public class Helper { BaseMainActivity.currentToken = newAccount.token; BaseMainActivity.currentInstance = newAccount.instance; editor.commit(); - Intent changeAccount = new Intent(activity, MainActivity.class); + Intent changeAccount = new Intent(activity, BaseMainActivity.class); changeAccount.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); activity.startActivity(changeAccount); } diff --git a/app/src/main/java/app/fedilab/android/helper/NotificationsHelper.java b/app/src/main/java/app/fedilab/android/helper/NotificationsHelper.java index 34c2f9cd..8e74a8b8 100644 --- a/app/src/main/java/app/fedilab/android/helper/NotificationsHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/NotificationsHelper.java @@ -47,8 +47,8 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.TimeUnit; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.client.endpoints.MastodonNotificationsService; import app.fedilab.android.client.entities.api.Notification; import app.fedilab.android.client.entities.api.Notifications; @@ -273,7 +273,7 @@ public class NotificationsHelper { notifType = Helper.NotifType.POLL; if (notif_poll) { title = context.getString(R.string.channel_notif_poll); - if (notification.account.id != null && notification.account.id.equals(MainActivity.currentUserID)) + if (notification.account.id != null && notification.account.id.equals(BaseMainActivity.currentUserID)) message = context.getString(R.string.notif_poll_self); else message = context.getString(R.string.notif_poll); @@ -283,7 +283,7 @@ public class NotificationsHelper { } if (message != null) { //Some others notification - final Intent intent = new Intent(context, MainActivity.class); + final Intent intent = new Intent(context, BaseMainActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(Helper.INTENT_ACTION, Helper.NOTIFICATION_INTENT); intent.putExtra(Helper.PREF_KEY_ID, account.user_id); diff --git a/app/src/main/java/app/fedilab/android/helper/TimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/TimelineHelper.java index ba4589e1..fe43f14b 100644 --- a/app/src/main/java/app/fedilab/android/helper/TimelineHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/TimelineHelper.java @@ -32,7 +32,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import app.fedilab.android.BaseMainActivity; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.client.endpoints.MastodonAccountsService; import app.fedilab.android.client.entities.api.Filter; import app.fedilab.android.client.entities.api.Notification; @@ -53,7 +52,7 @@ public class TimelineHelper { .proxy(Helper.getProxy(context)) .build(); Retrofit retrofit = new Retrofit.Builder() - .baseUrl("https://" + MainActivity.currentInstance + "/api/v1/") + .baseUrl("https://" + BaseMainActivity.currentInstance + "/api/v1/") .addConverterFactory(GsonConverterFactory.create()) .client(okHttpClient) .build(); @@ -74,7 +73,7 @@ public class TimelineHelper { if (!BaseMainActivity.filterFetched) { MastodonAccountsService mastodonAccountsService = init(context); List filterList; - Call> getFiltersCall = mastodonAccountsService.getFilters(MainActivity.currentToken); + Call> getFiltersCall = mastodonAccountsService.getFilters(BaseMainActivity.currentToken); if (getFiltersCall != null) { try { Response> getFiltersResponse = getFiltersCall.execute(); diff --git a/app/src/main/java/app/fedilab/android/services/PostMessageService.java b/app/src/main/java/app/fedilab/android/services/PostMessageService.java index aac8be34..e842aad0 100644 --- a/app/src/main/java/app/fedilab/android/services/PostMessageService.java +++ b/app/src/main/java/app/fedilab/android/services/PostMessageService.java @@ -38,7 +38,6 @@ import java.util.concurrent.TimeUnit; import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.client.endpoints.MastodonStatusesService; import app.fedilab.android.client.entities.api.Attachment; import app.fedilab.android.client.entities.api.Poll; @@ -132,7 +131,7 @@ public class PostMessageService extends IntentService { totalBitRead = 0; SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); boolean watermark = sharedPreferences.getBoolean(context.getString(R.string.SET_WATERMARK), false); - String watermarkText = sharedPreferences.getString(context.getString(R.string.SET_WATERMARK_TEXT) + MainActivity.currentUserID + MainActivity.currentInstance, null); + String watermarkText = sharedPreferences.getString(context.getString(R.string.SET_WATERMARK_TEXT) + BaseMainActivity.currentUserID + BaseMainActivity.currentInstance, null); for (int i = startingPosition; i < statuses.size(); i++) { if (statuses.get(i).media_attachments != null && statuses.get(i).media_attachments.size() > 0) { for (Attachment attachment : statuses.get(i).media_attachments) { diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/AccountFollowRequestAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/AccountFollowRequestAdapter.java index f1009ab9..4931c927 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/AccountFollowRequestAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/AccountFollowRequestAdapter.java @@ -31,8 +31,8 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.List; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.activities.ProfileActivity; import app.fedilab.android.client.entities.api.Account; import app.fedilab.android.databinding.DrawerFollowBinding; @@ -77,14 +77,14 @@ public class AccountFollowRequestAdapter extends RecyclerView.Adapter { - accountsVM.acceptFollow(MainActivity.currentInstance, MainActivity.currentToken, account.id) + accountsVM.acceptFollow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe((LifecycleOwner) context, relationShip -> { accountList.remove(position); notifyItemRemoved(position); }); }); holderFollow.binding.rejectButton.setOnClickListener(v -> { - accountsVM.rejectFollow(MainActivity.currentInstance, MainActivity.currentToken, account.id) + accountsVM.rejectFollow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe((LifecycleOwner) context, relationShip -> { accountList.remove(position); notifyItemRemoved(position); diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java index 41471cff..4983cbda 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java @@ -39,8 +39,8 @@ import com.vanniktech.emoji.one.EmojiOneProvider; import java.util.List; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.client.entities.api.Announcement; import app.fedilab.android.client.entities.api.Reaction; import app.fedilab.android.databinding.DrawerAnnouncementBinding; @@ -133,9 +133,9 @@ public class AnnouncementAdapter extends RecyclerView.Adapter 0) { GridView gridView = new GridView(context); - gridView.setAdapter(new EmojiAdapter(emojis.get(MainActivity.currentInstance))); + gridView.setAdapter(new EmojiAdapter(emojis.get(BaseMainActivity.currentInstance))); gridView.setNumColumns(5); gridView.setOnItemClickListener((parent, view, index, id) -> { - String emojiStr = emojis.get(MainActivity.currentInstance).get(index).shortcode; - String url = emojis.get(MainActivity.currentInstance).get(index).url; - String static_url = emojis.get(MainActivity.currentInstance).get(index).static_url; + String emojiStr = emojis.get(BaseMainActivity.currentInstance).get(index).shortcode; + String url = emojis.get(BaseMainActivity.currentInstance).get(index).url; + String static_url = emojis.get(BaseMainActivity.currentInstance).get(index).static_url; boolean alreadyAdded = false; for (Reaction reaction : announcement.reactions) { if (reaction.name.compareTo(emojiStr) == 0) { @@ -180,9 +180,9 @@ public class AnnouncementAdapter extends RecyclerView.Adapter 0) { GridView gridView = new GridView(context); - gridView.setAdapter(new EmojiAdapter(emojis.get(MainActivity.currentInstance))); + gridView.setAdapter(new EmojiAdapter(emojis.get(BaseMainActivity.currentInstance))); gridView.setNumColumns(5); gridView.setOnItemClickListener((parent, view, position, id) -> { - holder.binding.content.getText().insert(holder.binding.content.getSelectionStart(), " :" + emojis.get(MainActivity.currentInstance).get(position).shortcode + ": "); + holder.binding.content.getText().insert(holder.binding.content.getSelectionStart(), " :" + emojis.get(BaseMainActivity.currentInstance).get(position).shortcode + ": "); alertDialogEmoji.dismiss(); }); gridView.setPadding(paddingDp, paddingDp, paddingDp, paddingDp); diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ReactionAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ReactionAdapter.java index 7067c0c7..1e24d310 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/ReactionAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/ReactionAdapter.java @@ -27,8 +27,8 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.List; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.client.entities.api.Reaction; import app.fedilab.android.databinding.DrawerReactionBinding; import app.fedilab.android.helper.Helper; @@ -81,10 +81,10 @@ public class ReactionAdapter extends RecyclerView.Adapter { if (reaction.me) { - announcementsVM.removeReaction(MainActivity.currentInstance, MainActivity.currentToken, announcementId, reaction.name); + announcementsVM.removeReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, announcementId, reaction.name); reaction.me = false; } else { - announcementsVM.addReaction(MainActivity.currentInstance, MainActivity.currentToken, announcementId, reaction.name); + announcementsVM.addReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, announcementId, reaction.name); reaction.me = true; } notifyItemChanged(position); diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java index 48b772ab..90a4f7f0 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java @@ -96,7 +96,6 @@ import app.fedilab.android.R; import app.fedilab.android.activities.ComposeActivity; import app.fedilab.android.activities.ContextActivity; import app.fedilab.android.activities.CustomSharingActivity; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.activities.MediaActivity; import app.fedilab.android.activities.ProfileActivity; import app.fedilab.android.activities.ReportActivity; @@ -257,8 +256,8 @@ public class StatusAdapter extends RecyclerView.Adapter if (!remote) { new Thread(() -> { StatusCache statusCache = new StatusCache(); - statusCache.instance = MainActivity.currentInstance; - statusCache.user_id = MainActivity.currentUserID; + statusCache.instance = BaseMainActivity.currentInstance; + statusCache.user_id = BaseMainActivity.currentUserID; statusCache.status = statusToDeal; statusCache.status_id = statusToDeal.id; try { diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentComposeSettings.java b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentComposeSettings.java index d4b08e88..699ed0cd 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentComposeSettings.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentComposeSettings.java @@ -22,8 +22,8 @@ import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceManager; import androidx.preference.SwitchPreferenceCompat; +import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.helper.Helper; public class FragmentComposeSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -42,7 +42,7 @@ public class FragmentComposeSettings extends PreferenceFragmentCompat implements SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity()); EditTextPreference SET_WATERMARK_TEXT = findPreference(getString(R.string.SET_WATERMARK_TEXT)); if (SET_WATERMARK_TEXT != null) { - String val = sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT) + MainActivity.currentUserID + MainActivity.currentInstance, sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT), null)); + String val = sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT) + BaseMainActivity.currentUserID + BaseMainActivity.currentInstance, sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT), null)); SET_WATERMARK_TEXT.setText(val); } } @@ -51,7 +51,7 @@ public class FragmentComposeSettings extends PreferenceFragmentCompat implements public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if (key.equalsIgnoreCase(getString(R.string.SET_WATERMARK_TEXT))) { SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString(getString(R.string.SET_WATERMARK_TEXT) + MainActivity.currentUserID + MainActivity.currentInstance, sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT), null)); + editor.putString(getString(R.string.SET_WATERMARK_TEXT) + BaseMainActivity.currentUserID + BaseMainActivity.currentInstance, sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT), null)); editor.apply(); } } diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java index c7313f55..9e39d61c 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java @@ -43,7 +43,6 @@ import java.util.List; import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; -import app.fedilab.android.activities.MainActivity; import app.fedilab.android.client.entities.api.Notification; import app.fedilab.android.client.entities.api.Notifications; import app.fedilab.android.client.entities.api.Pagination; @@ -118,8 +117,8 @@ public class FragmentMastodonNotification extends Fragment implements Notificati ViewGroup container, Bundle savedInstanceState) { flagLoading = false; - instance = MainActivity.currentInstance; - user_id = MainActivity.currentUserID; + instance = BaseMainActivity.currentInstance; + user_id = BaseMainActivity.currentUserID; idOfAddedNotifications = new ArrayList<>(); binding = FragmentPaginationBinding.inflate(inflater, container, false); View root = binding.getRoot(); @@ -287,7 +286,7 @@ public class FragmentMastodonNotification extends Fragment implements Notificati return; } new Thread(() -> { - QuickLoad quickLoad = new QuickLoad(requireActivity()).getSavedValue(MainActivity.currentUserID, MainActivity.currentInstance, notificationType); + QuickLoad quickLoad = new QuickLoad(requireActivity()).getSavedValue(BaseMainActivity.currentUserID, BaseMainActivity.currentInstance, notificationType); if (direction != FragmentMastodonTimeline.DIRECTION.REFRESH && !fetchingMissing && !binding.swipeContainer.isRefreshing() && direction == null && quickLoad != null && quickLoad.notifications != null && quickLoad.notifications.size() > 0) { Notifications notifications = new Notifications(); notifications.notifications = quickLoad.notifications; diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java index f61acf1c..10fd7ad6 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java @@ -197,8 +197,8 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. ViewGroup container, Bundle savedInstanceState) { timelineType = Timeline.TimeLineEnum.HOME; - instance = MainActivity.currentInstance; - user_id = MainActivity.currentUserID; + instance = BaseMainActivity.currentInstance; + user_id = BaseMainActivity.currentUserID; canBeFederated = true; if (getArguments() != null) { timelineType = (Timeline.TimeLineEnum) getArguments().get(Helper.ARG_TIMELINE_TYPE); @@ -592,7 +592,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. if (binding == null || getActivity() == null || !isAdded()) { return; } - QuickLoad quickLoad = new QuickLoad(requireActivity()).getSavedValue(MainActivity.currentUserID, MainActivity.currentInstance, timelineType, ident); + QuickLoad quickLoad = new QuickLoad(requireActivity()).getSavedValue(BaseMainActivity.currentUserID, BaseMainActivity.currentInstance, timelineType, ident); if (!fetchingMissing && !binding.swipeContainer.isRefreshing() && direction == null && quickLoad != null && quickLoad.statuses != null && quickLoad.statuses.size() > 0) { Statuses statuses = new Statuses(); statuses.statuses = quickLoad.statuses;