From ac3b6ad43c52b46ea005430781d3975aa7c5e3da Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Wed, 23 Aug 2023 08:17:18 -0300 Subject: [PATCH] refactor: deleting legacy DomainManager.java implementation Remove DomainManager.java in favor of getWebUri --- .../joinmastodon/android/DomainManager.java | 83 ------------------- .../CustomLocalTimelineFragment.java | 6 -- .../fragments/HashtagTimelineFragment.java | 7 -- .../android/fragments/ProfileFragment.java | 7 -- .../settings/SettingsBaseFragment.java | 6 -- 5 files changed, 109 deletions(-) delete mode 100644 mastodon/src/main/java/org/joinmastodon/android/DomainManager.java diff --git a/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java b/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java deleted file mode 100644 index 93a9791ae..000000000 --- a/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.joinmastodon.android; - -import android.app.Activity; -import android.app.NotificationManager; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.pm.ShortcutInfo; -import android.content.pm.ShortcutManager; -import android.graphics.drawable.Icon; -import android.net.Uri; -import android.os.Build; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.browser.customtabs.CustomTabsIntent; - -import org.joinmastodon.android.api.MastodonAPIController; -import org.joinmastodon.android.api.PushSubscriptionManager; -import org.joinmastodon.android.api.requests.accounts.GetOwnAccount; -import org.joinmastodon.android.api.requests.accounts.GetPreferences; -import org.joinmastodon.android.api.requests.accounts.GetWordFilters; -import org.joinmastodon.android.api.requests.instance.GetCustomEmojis; -import org.joinmastodon.android.api.requests.instance.GetInstance; -import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp; -import org.joinmastodon.android.api.session.AccountActivationInfo; -import org.joinmastodon.android.api.session.AccountSession; -import org.joinmastodon.android.api.session.AccountSessionManager; -import org.joinmastodon.android.events.EmojiUpdatedEvent; -import org.joinmastodon.android.model.Account; -import org.joinmastodon.android.model.Application; -import org.joinmastodon.android.model.Emoji; -import org.joinmastodon.android.model.EmojiCategory; -import org.joinmastodon.android.model.Filter; -import org.joinmastodon.android.model.Instance; -import org.joinmastodon.android.model.Preferences; -import org.joinmastodon.android.model.Token; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import me.grishka.appkit.api.Callback; -import me.grishka.appkit.api.ErrorResponse; - -public class DomainManager { - private static final String TAG="DomainManager"; - - private static final DomainManager instance=new DomainManager(); - - private String currentDomain = ""; - - - public static DomainManager getInstance(){ - return instance; - } - - private DomainManager(){ - - } - - public String getCurrentDomain() { - return currentDomain; - } - - public void setCurrentDomain(String domain) { - this.currentDomain = domain; - } -} diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java index b23e9ef8d..e5676950a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java @@ -5,13 +5,9 @@ import android.net.Uri; import android.view.Menu; import android.view.MenuInflater; -import org.joinmastodon.android.DomainManager; -import org.joinmastodon.android.MainActivity; import org.joinmastodon.android.R; -import org.joinmastodon.android.api.requests.tags.GetHashtag; import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline; import org.joinmastodon.android.model.Filter; -import org.joinmastodon.android.model.Hashtag; import org.joinmastodon.android.model.Status; import org.joinmastodon.android.model.TimelineDefinition; import org.joinmastodon.android.ui.utils.UiUtils; @@ -21,8 +17,6 @@ import org.joinmastodon.android.utils.StatusFilterPredicate; import java.util.List; import java.util.stream.Collectors; -import me.grishka.appkit.api.Callback; -import me.grishka.appkit.api.ErrorResponse; import me.grishka.appkit.api.SimpleCallback; public class CustomLocalTimelineFragment extends PinnableStatusListFragment implements ProvidesAssistContent.ProvidesWebUri{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java index 6670b3480..de127bd7a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java @@ -11,7 +11,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.E; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.tags.GetHashtag; @@ -48,11 +47,6 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment { return true; } - @Override - public String getDomain() { - return super.getDomain() + "/tags/" + hashtag; - } - @Override public void onAttach(Activity activity){ @@ -64,7 +58,6 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment { all=getArguments().getStringArrayList("all"); none=getArguments().getStringArrayList("none"); setHasOptionsMenu(true); - DomainManager.getInstance().setCurrentDomain(getDomain()); } private void updateTitle(String hashtagName) { diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index 8ee1c4052..366cf5155 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -26,7 +26,6 @@ import android.transition.ChangeBounds; import android.transition.Fade; import android.transition.TransitionManager; import android.transition.TransitionSet; -import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; import android.view.Menu; @@ -56,9 +55,7 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.viewpager2.widget.ViewPager2; -import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.GlobalUserPreferences; -import org.joinmastodon.android.MainActivity; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.accounts.GetAccountByID; import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; @@ -107,13 +104,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.viewpager2.widget.ViewPager2; import me.grishka.appkit.Nav; import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.ErrorResponse; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java index ae30f0689..23a46ef53 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java @@ -3,8 +3,6 @@ package org.joinmastodon.android.fragments.settings; import android.animation.ObjectAnimator; import android.annotation.SuppressLint; import android.app.Fragment; -import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Rect; import android.os.Build; import android.os.Bundle; @@ -14,7 +12,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; -import android.view.WindowManager; import android.view.animation.AlphaAnimation; import android.view.animation.LinearInterpolator; import android.widget.Button; @@ -33,10 +30,8 @@ import androidx.annotation.StringRes; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.E; import org.joinmastodon.android.GlobalUserPreferences; -import org.joinmastodon.android.MastodonApp; import org.joinmastodon.android.R; import org.joinmastodon.android.api.PushSubscriptionManager; import org.joinmastodon.android.api.session.AccountSession; @@ -95,7 +90,6 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple session = AccountSessionManager.getInstance().getAccount(accountID); instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain); instanceName = UiUtils.getInstanceName(accountID); - DomainManager.getInstance().setCurrentDomain(session.domain + "/settings"); if (GithubSelfUpdater.needSelfUpdating()) E.register(this);