implement pre-release toggle

mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java

@@ -14,12 +14,14 @@ import android.os.Build;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
 import org.joinmastodon.android.BuildConfig;
 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.MastodonAPIController;
@@ -117,9 +119,13 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){
-			JsonObject obj=JsonParser.parseReader(resp.body().charStream()).getAsJsonObject();
+			JsonArray arr=JsonParser.parseReader(resp.body().charStream()).getAsJsonArray();
-			String changelog=obj.get("body").getAsString();
+			for (JsonElement jsonElement : arr) {
+				JsonObject obj = jsonElement.getAsJsonObject();
+				if (obj.get("prerelease").getAsBoolean() && !GlobalUserPreferences.enablePreReleases) continue;
+
 				String tag=obj.get("tag_name").getAsString();
+				String changelog=obj.get("body").getAsString();
 				Pattern pattern=Pattern.compile("v?(\\d+)\\.(\\d+)\\.(\\d+)\\+fork\\.(\\d+)");
 				Matcher matcher=pattern.matcher(tag);
 				if(!matcher.find()){
@@ -161,8 +167,8 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 									.putLong("apkSize", size)
 									.putString("version", version)
 									.putString("apkURL", url)
-								.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
 									.putString("changelog", changelog)
+									.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
 									.remove("downloadID")
 									.apply();
 
@@ -171,6 +177,8 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 					}
 				}
 				getPrefs().edit().putLong("lastCheck", System.currentTimeMillis()).apply();
+				break;
+			}
 		}catch(Exception x){
 			Log.w(TAG, "actuallyCheckForUpdates", x);
 		}finally{

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -38,6 +38,7 @@ public class GlobalUserPreferences{
 	public static boolean disableAltTextReminder;
 	public static boolean showAltIndicator;
 	public static boolean showNoAltIndicator;
+	public static boolean enablePreReleases;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
@@ -81,8 +82,9 @@ public class GlobalUserPreferences{
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
 		enableFabAutoHide=prefs.getBoolean("enableFabAutoHide", true);
 		disableAltTextReminder=prefs.getBoolean("disableAltTextReminder", false);
-		showAltIndicator =prefs.getBoolean("showAltIndicator", true);
+		showAltIndicator=prefs.getBoolean("showAltIndicator", true);
-		showNoAltIndicator =prefs.getBoolean("showNoAltIndicator", true);
+		showNoAltIndicator=prefs.getBoolean("showNoAltIndicator", true);
+		enablePreReleases=prefs.getBoolean("enablePreReleases", false);
 		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
@@ -124,6 +126,7 @@ public class GlobalUserPreferences{
 				.putBoolean("disableAltTextReminder", disableAltTextReminder)
 				.putBoolean("showAltIndicator", showAltIndicator)
 				.putBoolean("showNoAltIndicator", showNoAltIndicator)
+				.putBoolean("enablePreReleases", enablePreReleases)
 				.putString("publishButtonText", publishButtonText)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())

mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java

@@ -298,6 +298,14 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.recentLanguages.remove(accountID);
 			GlobalUserPreferences.save();
 		})));
+		if (GithubSelfUpdater.needSelfUpdating()) {
+			items.add(new SwitchItem(R.string.sk_updater_enable_pre_releases, 0, GlobalUserPreferences.enablePreReleases, i->{
+				GlobalUserPreferences.enablePreReleases=i.checked;
+				GlobalUserPreferences.save();
+			}));
+			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
+			items.add(checkForUpdateItem);
+		}
 		items.add(new TextItem(R.string.mo_clear_recent_emoji, ()-> {
 			GlobalUserPreferences.recentEmojis.clear();
 			GlobalUserPreferences.save();
@@ -806,7 +814,12 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		@Override
 		public void onBind(SwitchItem item){
 			text.setText(item.text);
+			if (item.icon == 0) {
+				icon.setVisibility(View.GONE);
+			} else {
+				icon.setVisibility(View.VISIBLE);
 				icon.setImageResource(item.icon);
+			}
 			checkbox.setChecked(item.checked && item.enabled);
 			checkbox.setEnabled(item.enabled);
 		}

mastodon/src/main/res/layout/item_settings_switch.xml

@@ -12,8 +12,7 @@
 		android:id="@+id/icon"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
-		android:layout_marginStart="16dp"
+		android:layout_marginHorizontal="16dp"
-		android:layout_marginEnd="32dp"
 		android:importantForAccessibility="no"
 		android:tint="?android:textColorPrimary"
 		tools:src="@drawable/ic_fluent_star_24_regular"/>
@@ -23,6 +22,7 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
+		android:layout_marginStart="16dp"
 		android:paddingVertical="8dp"
 		android:textSize="16sp"
 		android:textColor="?android:textColorPrimary"

mastodon/src/main/res/values/strings_sk.xml

@@ -234,4 +234,5 @@
     <string name="sk_no_alt_text">No alt text available</string>
     <string name="sk_settings_show_alt_indicator">Indicator for alt texts</string>
     <string name="sk_settings_show_no_alt_indicator">Indicator for missing alt texts</string>
+    <string name="sk_updater_enable_pre_releases">Enable pre-releases</string>
 </resources>