Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Instance): improve compatible version checking

This commit is contained in:
FineFindus 2024-07-06 14:30:25 +02:00
parent 0788b03828
commit 31a52c2790
No known key found for this signature in database
GPG Key ID: 64873EE210FF8E6B
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
View File

@ -219,7 +219,7 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
public void onClick(){
//TODO: enable timeline for all servers once 4.3.0 is released
if(getInstance().isEmpty() ||
!getInstance().get().version.contains("4.3.0")){
!getInstance().get().checkVersion(4,3,0)){
UiUtils.launchWebBrowser(getActivity(), item.url);
return;
}

27
mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
View File

@ -1,6 +1,7 @@
package org.joinmastodon.android.model;
import android.text.Html;
import android.util.Log;
import org.joinmastodon.android.api.ObjectValidationException;
import org.joinmastodon.android.api.RequiredField;
@ -8,6 +9,7 @@ import org.joinmastodon.android.model.catalog.CatalogInstance;
import org.parceler.Parcel;
import java.net.IDN;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -166,6 +168,31 @@ public class Instance extends BaseModel{
.orElse(false);
};
}
/**
* Returns true if the instance version is the same as or newer than the passed in version.
* @param major: The major version to check for.
* @param minor: the minor version to check for.
* @param patch: The patch version to check for.
*/
public boolean checkVersion(int major, int minor, int patch) {
try{
String[] parts=version.split("-", 2);
String[] numbers=parts[0].split("\\.", 3);
if(numbers.length < 3)
throw new IllegalArgumentException("Invalid version format. Expected format: major.minor.micro");
int majorVersion=Integer.parseInt(numbers[0]);
int minorVersion=Integer.parseInt(numbers[1]);
int patchVersion=Integer.parseInt(numbers[2]);
return (majorVersion > major ||
(majorVersion == major && minorVersion > minor) ||
(majorVersion == major && minorVersion == minor &&
patchVersion>= patch));
} catch(Exception e) {
Log.w("Instance", "checkVersion: failed to parse " + version + ", " + e);
return false;
}
}
public enum Feature {
BUBBLE_TIMELINE,