Smol bugfix

Author: MadeByIToncek

api/.gitignore

@@ -0,0 +1 @@
+/build

api/build.gradle

@@ -0,0 +1,13 @@
+plugins {
+    id 'java-library'
+}
+
+dependencies {
+    implementation libs.json
+    implementation libs.okhttp
+}
+
+java {
+    sourceCompatibility JavaVersion.VERSION_21
+    targetCompatibility JavaVersion.VERSION_21
+}

api/src/main/java/space/itoncek/trailcompass/client/api/HideAndSeekAPI.java

@@ -0,0 +1,103 @@
+package space.itoncek.trailcompass.client.api;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+public abstract class HideAndSeekAPI {
+    public static final MediaType JSON = MediaType.get("application/json");
+
+    OkHttpClient client = new OkHttpClient();
+
+    public abstract HideAndSeekConfig getConfig();
+    public abstract void saveConfig(HideAndSeekConfig cfg);
+
+    public ServerValidity checkValidity() throws IOException {
+        Response response = get(getConfig().base_url + "/");
+        boolean successful = response.isSuccessful();
+        if(!successful) return ServerValidity.NOT_FOUND;
+        assert response.body() != null;
+        String version = response.body().string();
+        response.close();
+        if(version.equals("vDEVELOPMENT")) return ServerValidity.DEVELOPMENT_VERSION;
+        else return SERVER_VERSIONS.SERVER_VERSION.equals(version)?ServerValidity.OK:ServerValidity.INCOMPATIBLE_VERSION;
+    }
+
+    public long getPing() throws IOException {
+        Request request = new Request.Builder()
+                .url(getConfig().base_url+"/time")
+                .build();
+
+        long start = System.currentTimeMillis();
+        Response execute = client.newCall(request).execute();
+        long end = System.currentTimeMillis();
+
+        assert execute.body() != null;
+        long mid = Long.parseLong(execute.body().string());
+        execute.close();
+        return ((mid-start) + (end-mid))/2L;
+    }
+
+    public LoginResponse login() throws IOException {
+        HideAndSeekConfig cfg = getConfig();
+
+        ServerValidity serverValidity = checkValidity();
+        if(serverValidity == ServerValidity.NOT_FOUND) return LoginResponse.UNABLE_TO_CONNECT;
+        if(serverValidity.equals(ServerValidity.INCOMPATIBLE_VERSION)) return LoginResponse.INCOMPATIBLE_BACKEND;
+
+        String req = new JSONObject()
+                .put("username", cfg.username)
+                .put("passwordhash", cfg.passwordHash)
+                .toString(4);
+
+        Response res = post(cfg.base_url + "/uac/login", req);
+
+        if(!res.isSuccessful()) return LoginResponse.UNABLE_TO_AUTH;
+
+        try {
+            assert res.body() != null;
+            cfg.jwt_token = new JSONObject(res.body().string()).getString("token");
+            saveConfig(cfg);
+        } catch (IOException | JSONException e) {
+            return LoginResponse.UNABLE_TO_AUTH;
+        }
+        res.close();
+        return LoginResponse.OK;
+    }
+
+    public Response get(String url) throws IOException {
+        Request request = new Request.Builder()
+                .url(url)
+                .build();
+
+        return client.newCall(request).execute();
+    }
+
+    public Response post(String url, String json) throws IOException {
+        RequestBody body = RequestBody.create(json, JSON);
+        Request request = new Request.Builder()
+                .url(url)
+                .post(body)
+                .build();
+
+        return client.newCall(request).execute();
+    }
+
+    public Response postAuthd(String url, String json) throws IOException {
+        RequestBody body = RequestBody.create(json, JSON);
+        Request request = new Request.Builder()
+                .url(url)
+                .addHeader("Authorization","Bearer " + getConfig().jwt_token)
+                .post(body)
+                .build();
+
+        return client.newCall(request).execute();
+    }
+}

api/src/main/java/space/itoncek/trailcompass/client/api/HideAndSeekConfig.java

@@ -0,0 +1,29 @@
+package space.itoncek.trailcompass.client.api;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Objects;
+
+public final class HideAndSeekConfig implements Serializable {
+    public String jwt_token;
+    public String base_url;
+    public String username;
+    public String passwordHash;
+
+    public HideAndSeekConfig(String jwt_token,
+                             String base_url,
+                             String username,
+                             String passwordHash) {
+
+        this.jwt_token = jwt_token;
+        this.base_url = base_url;
+        this.username = username;
+        this.passwordHash = passwordHash;
+    }
+
+    public static HideAndSeekConfig generateEmptyConfig() {
+        return new HideAndSeekConfig("","","","");
+    }
+}

api/src/main/java/space/itoncek/trailcompass/client/api/LoginResponse.java

@@ -0,0 +1,8 @@
+package space.itoncek.trailcompass.client.api;
+
+public enum LoginResponse {
+    UNABLE_TO_CONNECT,
+    INCOMPATIBLE_BACKEND,
+    UNABLE_TO_AUTH,
+    OK
+}

api/src/main/java/space/itoncek/trailcompass/client/api/SERVER_VERSIONS.java

@@ -0,0 +1,5 @@
+package space.itoncek.trailcompass.client.api;
+
+public class SERVER_VERSIONS {
+    public static final String SERVER_VERSION = "v0.0.0.4";
+}

api/src/main/java/space/itoncek/trailcompass/client/api/ServerValidity.java

@@ -0,0 +1,8 @@
+package space.itoncek.trailcompass.client.api;
+
+public enum ServerValidity {
+    NOT_FOUND,
+    INCOMPATIBLE_VERSION,
+    DEVELOPMENT_VERSION,
+    OK
+}

app/build.gradle

@@ -53,6 +53,7 @@ dependencies {
     implementation libs.firebase.analytics
     implementation libs.firebase.crashlytics
     implementation libs.firebase.perf
+    implementation project(':api')
     //tests
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit

app/src/main/AndroidManifest.xml

@@ -27,12 +27,20 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/icon_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.TrailCompass">
+        <activity
+            android:name=".hideandseek.ui.LoginActivity"
+            android:exported="false" />
+        <activity
+            android:name=".hideandseek.ui.MapView"
+            android:exported="false" />
         <activity
             android:name=".mainmenu.MainMenuActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -47,8 +55,7 @@
             android:exported="false" />
         <activity
             android:name=".debug.TestActivity"
-            android:exported="true">
-        </activity>
+            android:exported="true" />
     </application>
 
 </manifest>