Bläddra i källkod

Corrects HTTP status codes, adds exception stack trace

RebekkaMa 4 år sedan
förälder
incheckning
1b6049fc05
1 ändrade filer med 16 tillägg och 7 borttagningar
  1. 16 7
      app/src/main/java/net/folivo/android/smsGatewayServer/RestApiWorker.kt

+ 16 - 7
app/src/main/java/net/folivo/android/smsGatewayServer/RestApiWorker.kt

@@ -139,11 +139,20 @@ class RestApiWorker(appContext: Context, workerParams: WorkerParameters) :
                                             smsMessage.recipientPhoneNumber,
                                             smsMessage.message
                                         )
-                                    } catch (exception: java.lang.Exception) {
-                                        Log.i(logTag, exception.toString())
+                                    }
+                                    catch (illegalArgumentException : java.lang.IllegalArgumentException){
+                                        Log.i(logTag, illegalArgumentException.stackTraceToString())
+                                        call.respondText(
+                                                illegalArgumentException.stackTraceToString(),
+                                                status = HttpStatusCode.BadRequest
+                                        )
+                                        return@post
+                                    }
+                                    catch (exception: java.lang.Exception) {
+                                        Log.i(logTag, exception.stackTraceToString())
                                         call.respondText(
-                                            exception.toString(),
-                                            status = HttpStatusCode.BadRequest
+                                            exception.stackTraceToString(),
+                                            status = HttpStatusCode.InternalServerError
                                         )
                                         return@post
                                     }
@@ -170,7 +179,7 @@ class RestApiWorker(appContext: Context, workerParams: WorkerParameters) :
                                                 } catch (e: Exception) {
                                                     Log.w(logTag, e.stackTraceToString())
                                                     call.respondText(
-                                                        e.toString(),
+                                                        e.stackTraceToString(),
                                                         status = HttpStatusCode.InternalServerError
                                                     )
                                                     return@get
@@ -196,7 +205,7 @@ class RestApiWorker(appContext: Context, workerParams: WorkerParameters) :
                                                 } catch (e: Exception) {
                                                     Log.w(logTag, e.stackTraceToString())
                                                     call.respondText(
-                                                        e.toString(),
+                                                        e.stackTraceToString(),
                                                         status = HttpStatusCode.InternalServerError
                                                     )
                                                     return@get
@@ -231,7 +240,7 @@ class RestApiWorker(appContext: Context, workerParams: WorkerParameters) :
             }
         } catch (exception: java.lang.Exception) {
             if (exception !is CancellationException) {
-                Log.w(logTag, exception.toString())
+                Log.w(logTag, exception.stackTraceToString())
                 return@coroutineScope Result.failure()
             }
         }