Merge pull request #12 from airrobe/hotfix

Hotfix for internet connection issues
airrobe · Apr 13, 2022 · 81b5a86 · 81b5a86
2 parents 043e1b8 + 429ea62
commit 81b5a86
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/AirRobeWidget/releases/AirRobeWidget-1.0.1.aar b/AirRobeWidget/releases/AirRobeWidget-1.0.1.aar
diff --git a/AirRobeWidget/src/main/AndroidManifest.xml b/AirRobeWidget/src/main/AndroidManifest.xml
@@ -2,4 +2,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.airrobe.widgetsdk.airrobewidget">
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/...beWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/service/AirRobeApiService.kt b/...beWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/service/AirRobeApiService.kt
@@ -1,6 +1,5 @@
 package com.airrobe.widgetsdk.airrobewidget.service
 
-import com.airrobe.widgetsdk.airrobewidget.BuildConfig
 import org.json.JSONObject
 import java.io.*
 import java.lang.Exception
@@ -12,24 +11,25 @@ import javax.net.ssl.HttpsURLConnection
 internal object AirRobeApiService {
     const val GET: String = "GET"
     const val POST: String = "POST"
-    private val userHeaderString: String = "airrobeWidget/${BuildConfig.VERSION_NAME} (Android ${android.os.Build.VERSION.RELEASE})"
+    private val userHeaderString: String = "airrobeWidget/Android ${android.os.Build.VERSION.RELEASE}"
 
     fun requestPOST(r_url: String?, postDataParams: JSONObject): String? {
         val url = URL(r_url)
-        val urlConnection: HttpURLConnection = url.openConnection() as HttpURLConnection
-        urlConnection.setRequestProperty("User-Agent", userHeaderString)
-        urlConnection.readTimeout = 3000
-        urlConnection.connectTimeout = 3000
-        urlConnection.requestMethod = POST
-        urlConnection.doInput = true
-        urlConnection.doOutput = true
-        val os: OutputStream = urlConnection.outputStream
-        val writer = BufferedWriter(OutputStreamWriter(os, "UTF-8"))
-        writer.write(encodeParams(postDataParams))
-        writer.flush()
-        writer.close()
-        os.close()
         return try {
+            val urlConnection: HttpURLConnection = url.openConnection() as HttpURLConnection
+            urlConnection.setRequestProperty("User-Agent", userHeaderString)
+            urlConnection.readTimeout = 3000
+            urlConnection.connectTimeout = 3000
+            urlConnection.requestMethod = POST
+            urlConnection.doInput = true
+            urlConnection.doOutput = true
+            val os: OutputStream = urlConnection.outputStream
+            val writer = BufferedWriter(OutputStreamWriter(os, "UTF-8"))
+            writer.write(encodeParams(postDataParams))
+            writer.flush()
+            writer.close()
+            os.close()
+
             val responseCode: Int = urlConnection.responseCode // To Check for 200
             if (responseCode == HttpsURLConnection.HTTP_OK) {
                 val `in` = BufferedReader(InputStreamReader(urlConnection.inputStream))
@@ -42,16 +42,17 @@ internal object AirRobeApiService {
                 `in`.close()
                 sb.toString()
             } else null
-        } catch (e: IOException) {
+        } catch (e: Exception) {
             return null
         }
     }
 
     fun requestGET(url: String?): String? {
         val obj = URL(url)
-        val urlConnection = obj.openConnection() as HttpURLConnection
-        urlConnection.requestMethod = GET
         return try {
+            val urlConnection = obj.openConnection() as HttpURLConnection
+            urlConnection.requestMethod = GET
+
             val responseCode = urlConnection.responseCode
             if (responseCode == HttpURLConnection.HTTP_OK) {
                 val `in` = BufferedReader(InputStreamReader(urlConnection.inputStream))
@@ -63,7 +64,7 @@ internal object AirRobeApiService {
                 `in`.close()
                 response.toString()
             } else null
-        } catch (e: IOException) {
+        } catch (e: Exception) {
             null
         }
     }
@@ -86,4 +87,4 @@ internal object AirRobeApiService {
             null
         }
     }
-}
+}
diff --git a/...beWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/widgets/AirRobeMultiOptIn.kt b/...beWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/widgets/AirRobeMultiOptIn.kt
@@ -285,4 +285,4 @@ class AirRobeMultiOptIn @JvmOverloads constructor(
             Log.d(TAG, "Category is not eligible")
         }
     }
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_gradle_plugin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/demo/libs/AirRobeWidget.aar b/demo/libs/AirRobeWidget.aar
-Original file line number
+Diff line change
@@ Expand Up / @@ -285,4 +285,4 @@ class AirRobeMultiOptIn @JvmOverloads constructor( @@
                 Log.d(TAG, "Category is not eligible")
             }
         }
-    }
+    }