From f0ea6ef43ed558f96a05c1a90ed86f5575d4e592 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Sun, 25 Dec 2022 14:21:09 -0300 Subject: [PATCH] Revert "Getting changelogs commit number 1" This reverts commit e8a31cf86754fb8d756ad376200ff642972dbc45. --- .../updater/GithubSelfUpdaterImpl.java | 21 ------------------- .../android/fragments/SettingsFragment.java | 4 ---- .../android/updater/GithubSelfUpdater.java | 2 -- 3 files changed, 27 deletions(-) diff --git a/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java b/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java index 7c9a59b88..89b0c4235 100644 --- a/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java +++ b/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java @@ -175,27 +175,6 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{ } } - public String getChangelog(){ - String changelog = null; - Request req=new Request.Builder() - .url("https://api.github.com/repos/LucasGGamerM/moshidon/releases/latest") - .build(); - Call call=MastodonAPIController.getHttpClient().newCall(req); - try(Response resp=call.execute()){ - JsonObject obj=JsonParser.parseReader(resp.body().charStream()).getAsJsonObject(); - changelog=obj.get("body").getAsString(); - if(changelog == null){ - Log.w(TAG, "No changelog available"); - return null; - } - return changelog; - }catch(Exception x){ - Log.w(TAG, "getChangelog: ", x); - } - return changelog; - } - - private void setState(UpdateState state){ this.state=state; E.post(new SelfUpdateStateChangedEvent(state)); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index 4eb709099..3f5fa9941 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -49,7 +49,6 @@ import org.joinmastodon.android.ui.M3AlertDialogBuilder; import org.joinmastodon.android.ui.OutlineProviders; import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.updater.GithubSelfUpdater; -import org.w3c.dom.Text; import java.util.ArrayList; import java.util.function.Consumer; @@ -186,9 +185,6 @@ public class SettingsFragment extends MastodonToolbarFragment{ checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates); items.add(checkForUpdateItem); } -// TODO fix this up tomorrow, by probably just making another method for chacking and displaying the new changelog - items.add(new TextItem(R.string.get_changelog, GithubSelfUpdater.getInstance()::getChangelog); - items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"))); items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache)); items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java b/mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java index 181e18e4f..90a20e815 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java +++ b/mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java @@ -39,8 +39,6 @@ public abstract class GithubSelfUpdater{ public abstract void cancelDownload(); - public abstract String getChangelog(); - public abstract void handleIntentFromInstaller(Intent intent, Activity activity); public enum UpdateState{