Merge pull request #1

1on7 patch 1
smith8h · Sep 24, 2023 · 99a76ca · 99a76ca
2 parents c73e9db + 8ac4ff9
commit 99a76ca
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 6 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -0,0 +1,26 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
diff --git a/SConnect/src/main/java/smith/lib/net/SConnect.java b/SConnect/src/main/java/smith/lib/net/SConnect.java
@@ -42,6 +42,7 @@ public class SConnect {
 	private int paramsType = PARAM;
     private String url;
     private String tag = SCONNECT_TAG;
+    private String mediaType;
 
     /**
      * Create new Instance of SConnect.
@@ -101,6 +102,11 @@ public SConnect addParam(String key, Object value) {
         this.params.put(key, value);
         return this;
     }
+
+    public SConnect addMediaType(String type) {
+        this.mediaType = type;
+        return this;
+    }
 
     /**
      * Set the type as params or body to your connection.
@@ -218,6 +224,10 @@ protected int getParamsType() {
 		return paramsType;
 	}
 
+    protected String getMediaType() {
+    	return mediaType;
+    }
+
     protected Activity getActivity() {
         return (Activity) context;
     }
@@ -236,4 +246,4 @@ public static boolean isDeviceConnected(@NonNull Context context) {
         var capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.getActiveNetwork());
         return capabilities != null && (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI));
     }
-}
+}
diff --git a/SConnect/src/main/java/smith/lib/net/SConnectController.java b/SConnect/src/main/java/smith/lib/net/SConnectController.java
@@ -83,10 +83,15 @@ public void connect(@NonNull final SConnect sconnect, String method, String url,
                     reqBuilder.url(url).headers(headerBuilder.build()).method(method, reqBody);
                 }
             } else {
-                var reqBody = RequestBody.create("application/json; charset=utf-8;",
-                        MediaType.parse(new Gson().toJson(sconnect.getParams())));
-                if (method.equals("GET")) reqBuilder.url(url).headers(headerBuilder.build()).get();
-                else reqBuilder.url(url).headers(headerBuilder.build()).method(method, reqBody);
+                if(sconnect.getMediaType() == "") {
+                	var reqBody = RequestBody.create("application/json; charset=utf-8;",MediaType.parse(new Gson().toJson(sconnect.getParams())));
+                        if (method.equals("GET")) reqBuilder.url(url).headers(headerBuilder.build()).get();
+                        else reqBuilder.url(url).headers(headerBuilder.build()).method(method, reqBody);
+                } else {
+                    var reqBody = RequestBody.create(MediaType.parse(sconnect.getMediaType()), sconnect.getParams().toString().replace("{", "").replace("}", ""));
+                        if (method.equals("GET")) reqBuilder.url(url).headers(headerBuilder.build()).get();
+                        else reqBuilder.url(url).headers(headerBuilder.build()).method(method, reqBody);
+                }
             }
 
             var req = reqBuilder.build();
@@ -111,4 +116,4 @@ public void connect(@NonNull final SConnect sconnect, String method, String url,
             });
         } catch (Exception e) {callback.onFailure(new SResponse(e.getMessage()), tag);}
     }
-}
+}