From 11f668b1ea962d02ccdf9ae8771181a7288e2a4e Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 16 May 2023 18:03:41 +0800 Subject: [PATCH] [mobile] fix crash --- app/build.gradle | 4 ++-- .../java/com/fongmi/android/tv/server/Nano.java | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b9cd8530a..612622f6b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,12 +22,12 @@ android { leanback { dimension "mode" versionCode 76 - versionName "20230516#1" + versionName "20230516#2" } mobile { dimension "mode" versionCode 14 - versionName "20230516#1" + versionName "20230516#2" } java { dimension "api" diff --git a/app/src/main/java/com/fongmi/android/tv/server/Nano.java b/app/src/main/java/com/fongmi/android/tv/server/Nano.java index 0b41c3616..44b749d95 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/Nano.java +++ b/app/src/main/java/com/fongmi/android/tv/server/Nano.java @@ -1,5 +1,7 @@ package com.fongmi.android.tv.server; +import android.text.TextUtils; + import com.fongmi.android.tv.R; import com.fongmi.android.tv.api.ApiConfig; import com.fongmi.android.tv.bean.Config; @@ -124,17 +126,19 @@ public class Nano extends NanoHTTPD { } private Response doCast(Map params) { - Config config = Config.find(params.get("config").trim(), 0); - Device device = Device.objectFrom(params.get("device").trim()); - History history = History.objectFrom(params.get("history").trim()); + Config config = Config.find(params.get("url"), 0); + Device device = Device.objectFrom(params.get("device")); + History history = History.objectFrom(params.get("history")); CastEvent.post(config, device, history); return createSuccessResponse(); } private Response doSync(Map params) { - Config config = Config.find(params.get("config").trim(), 0); - List history = History.arrayFrom(params.get("history").trim()); - SyncEvent.post(config, history); + String url = params.get("url"); + if (TextUtils.isEmpty(url)) url = ApiConfig.getUrl(); + if (TextUtils.isEmpty(url)) return createErrorResponse(""); + Config config = Config.find(url, 0); + SyncEvent.post(config, History.arrayFrom(params.get("history"))); return createSuccessResponse(new Gson().toJson(History.get(config.getId()))); }