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;
@@ -113,64 +115,70 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 
 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/sk22/megalodon/releases/latest")
+				.url("https://api.github.com/repos/sk22/megalodon/releases")
 				.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 tag=obj.get("tag_name").getAsString();
+			for (JsonElement jsonElement : arr) {
-			String changelog=obj.get("body").getAsString();
+				JsonObject obj = jsonElement.getAsJsonObject();
-			Pattern pattern=Pattern.compile("v?(\\d+)\\.(\\d+)\\.(\\d+)\\+fork\\.(\\d+)");
+				if (obj.get("prerelease").getAsBoolean() && !GlobalUserPreferences.enablePreReleases) continue;
-			Matcher matcher=pattern.matcher(tag);
-			if(!matcher.find()){
-				Log.w(TAG, "actuallyCheckForUpdates: release tag has wrong format: "+tag);
-				return;
-			}
-			int newMajor=Integer.parseInt(matcher.group(1)),
-				newMinor=Integer.parseInt(matcher.group(2)),
-				newRevision=Integer.parseInt(matcher.group(3)),
-				newForkNumber=Integer.parseInt(matcher.group(4));
-			matcher=pattern.matcher(BuildConfig.VERSION_NAME);
-			String[] currentParts=BuildConfig.VERSION_NAME.split("[.+]");
-			if(!matcher.find()){
-				Log.w(TAG, "actuallyCheckForUpdates: current version has wrong format: "+BuildConfig.VERSION_NAME);
-				return;
-			}
-			int curMajor=Integer.parseInt(matcher.group(1)),
-				curMinor=Integer.parseInt(matcher.group(2)),
-				curRevision=Integer.parseInt(matcher.group(3)),
-				curForkNumber=Integer.parseInt(matcher.group(4));
-			long newVersion=((long)newMajor << 32) | ((long)newMinor << 16) | newRevision;
-			long curVersion=((long)curMajor << 32) | ((long)curMinor << 16) | curRevision;
-			if(newVersion>curVersion || newForkNumber>curForkNumber){
-				String version=newMajor+"."+newMinor+"."+newRevision+"+fork."+newForkNumber;
-				Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
-				for(JsonElement el:obj.getAsJsonArray("assets")){
-					JsonObject asset=el.getAsJsonObject();
-					if("megalodon.apk".equals(asset.get("name").getAsString()) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
-						long size=asset.get("size").getAsLong();
-						String url=asset.get("browser_download_url").getAsString();
 
-						UpdateInfo info=new UpdateInfo();
+				String tag=obj.get("tag_name").getAsString();
-						info.size=size;
+				String changelog=obj.get("body").getAsString();
-						info.version=version;
+				Pattern pattern=Pattern.compile("v?(\\d+)\\.(\\d+)\\.(\\d+)\\+fork\\.(\\d+)");
-						info.changelog=changelog;
+				Matcher matcher=pattern.matcher(tag);
-						this.info=info;
+				if(!matcher.find()){
+					Log.w(TAG, "actuallyCheckForUpdates: release tag has wrong format: "+tag);
+					return;
+				}
+				int newMajor=Integer.parseInt(matcher.group(1)),
+						newMinor=Integer.parseInt(matcher.group(2)),
+						newRevision=Integer.parseInt(matcher.group(3)),
+						newForkNumber=Integer.parseInt(matcher.group(4));
+				matcher=pattern.matcher(BuildConfig.VERSION_NAME);
+				String[] currentParts=BuildConfig.VERSION_NAME.split("[.+]");
+				if(!matcher.find()){
+					Log.w(TAG, "actuallyCheckForUpdates: current version has wrong format: "+BuildConfig.VERSION_NAME);
+					return;
+				}
+				int curMajor=Integer.parseInt(matcher.group(1)),
+						curMinor=Integer.parseInt(matcher.group(2)),
+						curRevision=Integer.parseInt(matcher.group(3)),
+						curForkNumber=Integer.parseInt(matcher.group(4));
+				long newVersion=((long)newMajor << 32) | ((long)newMinor << 16) | newRevision;
+				long curVersion=((long)curMajor << 32) | ((long)curMinor << 16) | curRevision;
+				if(newVersion>curVersion || newForkNumber>curForkNumber){
+					String version=newMajor+"."+newMinor+"."+newRevision+"+fork."+newForkNumber;
+					Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
+					for(JsonElement el:obj.getAsJsonArray("assets")){
+						JsonObject asset=el.getAsJsonObject();
+						if("megalodon.apk".equals(asset.get("name").getAsString()) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
+							long size=asset.get("size").getAsLong();
+							String url=asset.get("browser_download_url").getAsString();
 
-						getPrefs().edit()
+							UpdateInfo info=new UpdateInfo();
-								.putLong("apkSize", size)
+							info.size=size;
-								.putString("version", version)
+							info.version=version;
-								.putString("apkURL", url)
+							info.changelog=changelog;
-								.putString("changelog", changelog)
+							this.info=info;
-								.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
-								.remove("downloadID")
-								.apply();
 
-						break;
+							getPrefs().edit()
+									.putLong("apkSize", size)
+									.putString("version", version)
+									.putString("apkURL", url)
+									.putString("changelog", changelog)
+									.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
+									.remove("downloadID")
+									.apply();
+
+							break;
+						}
 					}
 				}
+				getPrefs().edit().putLong("lastCheck", System.currentTimeMillis()).apply();
+				break;
 			}
-			getPrefs().edit().putLong("lastCheck", System.currentTimeMillis()).apply();
 		}catch(Exception x){
 			Log.w(TAG, "actuallyCheckForUpdates", x);
 		}finally{

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

@@ -35,6 +35,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;
@@ -73,8 +74,9 @@ public class GlobalUserPreferences{
 		reduceMotion=prefs.getBoolean("reduceMotion", false);
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
 		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", null), recentLanguagesType, new HashMap<>());
@@ -108,6 +110,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

@@ -259,16 +259,20 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new HeaderItem(R.string.sk_settings_about));
 		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://ko-fi.com/xsk22"), R.drawable.ic_fluent_heart_24_regular));
-		if (GithubSelfUpdater.needSelfUpdating()) {
-			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
-			items.add(checkForUpdateItem);
-		}
 		clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), imageCache.getDiskCache().size(), true), this::clearImageCache, 0);
 		items.add(clearImageCacheItem);
 		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, ()->{
 			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 FooterItem(getString(R.string.sk_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
 	}
@@ -757,7 +761,12 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		@Override
 		public void onBind(SwitchItem item){
 			text.setText(item.text);
-			icon.setImageResource(item.icon);
+			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>