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 89b0c4235..217e09d73 100644 --- a/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java +++ b/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java @@ -61,6 +61,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{ info=new UpdateInfo(); info.version=prefs.getString("version", null); info.size=prefs.getLong("apkSize", 0); + info.changelog=prefs.getString("changelog", null); downloadID=prefs.getLong("downloadID", 0); if(downloadID==0 || !getUpdateApkFile().exists()){ state=UpdateState.UPDATE_AVAILABLE; @@ -84,6 +85,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{ .remove("apkURL") .remove("checkedByBuild") .remove("downloadID") + .remove("changelog") .apply(); } } @@ -160,6 +162,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{ .putString("version", version) .putString("apkURL", url) .putInt("checkedByBuild", BuildConfig.VERSION_CODE) + .putString("changelog", changelog) .remove("downloadID") .apply(); 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 3f5fa9941..89787ca8a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -839,7 +839,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ private class UpdateViewHolder extends BindableViewHolder{ - private final TextView text; + private final TextView text, changelog; private final Button button; private final ImageButton cancelBtn; private final ProgressBar progress; @@ -850,6 +850,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ public UpdateViewHolder(){ super(getActivity(), R.layout.item_settings_update, list); text=findViewById(R.id.text); + changelog=findViewById(R.id.changelog); button=findViewById(R.id.button); cancelBtn=findViewById(R.id.cancel_btn); progress=findViewById(R.id.progress); @@ -893,6 +894,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ progress.setVisibility(View.GONE); progress.removeCallbacks(progressUpdater); } + changelog.setText(getString(R.string.sk_changelog, info.changelog)); } private void updateProgress(){ diff --git a/mastodon/src/main/res/layout/item_settings_update.xml b/mastodon/src/main/res/layout/item_settings_update.xml index 263c8f1c1..6c985312c 100644 --- a/mastodon/src/main/res/layout/item_settings_update.xml +++ b/mastodon/src/main/res/layout/item_settings_update.xml @@ -7,69 +7,86 @@ + android:orientation="vertical"> + + + + + + + +