From fd7740838ae166896bbad35b68def2f60fb0ea8e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 3 Jan 2020 23:58:12 +0300 Subject: [PATCH] VersionUtils: move isPleroma method from Instance --- app/src/main/java/com/keylesspalace/tusky/entity/Instance.kt | 4 ---- .../main/java/com/keylesspalace/tusky/util/VersionUtils.java | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Instance.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Instance.kt index f6d33dfb..a9f6f499 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/Instance.kt +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Instance.kt @@ -43,10 +43,6 @@ data class Instance ( val instance = other as Instance? return instance?.uri.equals(uri) } - - fun isPleroma(): Boolean { - return version.contains(" (compatible; Pleroma "); - } } data class PollLimits ( diff --git a/app/src/main/java/com/keylesspalace/tusky/util/VersionUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/VersionUtils.java index dceef0f3..ef4801a1 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/VersionUtils.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/VersionUtils.java @@ -25,8 +25,10 @@ public class VersionUtils { private int major; private int minor; private int patch; + private String versionString; public VersionUtils(@NonNull String versionString) { + this.versionString = versionString; String regex = "([0-9]+)\\.([0-9]+)\\.([0-9]+).*"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(versionString); @@ -41,4 +43,7 @@ public class VersionUtils { return (major == 2) ? ( (minor == 7) ? (patch >= 0) : (minor > 7) ) : (major > 2); } + public boolean isPleroma() { + return versionString.contains(" (compatible; Pleroma "); + } }