From 036445a57b149dec82c72e48b98ae4b7b7c6c2b8 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sun, 8 Jan 2023 23:56:30 -0600
Subject: Initial progress of huge refactoring job that I really, really
 shouldn't be doing

---
 .../github/daneren2005/dsub/domain/Version.java    | 80 +++++++++++-----------
 1 file changed, 41 insertions(+), 39 deletions(-)

(limited to 'app/src/main/java/github/daneren2005/dsub/domain/Version.java')

diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Version.java b/app/src/main/java/github/daneren2005/dsub/domain/Version.java
index 9df0dbb4..39e83c3c 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Version.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/Version.java
@@ -18,6 +18,8 @@
  */
 package github.daneren2005.dsub.domain;
 
+import androidx.annotation.NonNull;
+
 import java.io.Serializable;
 
 /**
@@ -42,14 +44,14 @@ public class Version implements Comparable<Version>, Serializable {
 	 */
 	public Version(String version) {
 		String[] s = version.split("\\.");
-		major = Integer.valueOf(s[0]);
-		minor = Integer.valueOf(s[1]);
+		major = Integer.parseInt(s[0]);
+		minor = Integer.parseInt(s[1]);
 
 		if (s.length > 2) {
 			if (s[2].contains("beta")) {
-				beta = Integer.valueOf(s[2].replace("beta", ""));
+				beta = Integer.parseInt(s[2].replace("beta", ""));
 			} else {
-				bugfix = Integer.valueOf(s[2]);
+				bugfix = Integer.parseInt(s[2]);
 			}
 		}
 	}
@@ -63,40 +65,39 @@ public class Version implements Comparable<Version>, Serializable {
 	}
 
 	public String getVersion() {
-		switch(major) {
-			case 1:
-				switch(minor) {
-					case 0:
-						return "3.8";
-					case 1:
-						return "3.9";
-					case 2:
-						return "4.0";
-					case 3:
-						return "4.1";
-					case 4:
-						return "4.2";
-					case 5:
-						return "4.3.1";
-					case 6:
-						return "4.5";
-					case 7:
-						return "4.6";
-					case 8:
-						return "4.7";
-					case 9:
-						return "4.8";
-					case 10:
-						return "4.9";
-					case 11:
-						return "5.1";
-					case 12:
-						return "5.2";
-					case 13:
-						return "5.3";
-					case 14:
-						return "6.0";
-				}
+		if (major == 1) {
+			switch (minor) {
+				case 0:
+					return "3.8";
+				case 1:
+					return "3.9";
+				case 2:
+					return "4.0";
+				case 3:
+					return "4.1";
+				case 4:
+					return "4.2";
+				case 5:
+					return "4.3.1";
+				case 6:
+					return "4.5";
+				case 7:
+					return "4.6";
+				case 8:
+					return "4.7";
+				case 9:
+					return "4.8";
+				case 10:
+					return "4.9";
+				case 11:
+					return "5.1";
+				case 12:
+					return "5.2";
+				case 13:
+					return "5.3";
+				case 14:
+					return "6.0";
+			}
 		}
 		return "";
 	}
@@ -135,8 +136,9 @@ public class Version implements Comparable<Version>, Serializable {
 	 * Returns a string representation of the form "1.27", "1.27.2" or "1.27.beta3".
 	 * @return A string representation of the form "1.27", "1.27.2" or "1.27.beta3".
 	 */
+	@NonNull
 	public String toString() {
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		buf.append(major).append('.').append(minor);
 		if (beta != 0) {
 			buf.append(".beta").append(beta);
-- 
cgit v1.2.3