From 10601000d6e721f13980ff26de0c2621f08699b7 Mon Sep 17 00:00:00 2001
From: "Hui.Li-TCL" <xylophone21@gmail.com>
Date: Sat, 8 Jan 2022 03:20:30 +0800
Subject: [PATCH] added restart server on android tv server (#13177)

* added restart server on android tv server

* fix restyled-io and ci errors

* ChipThreadWork can only work on android & linux

* remove chip thread work on darwin because there is no "non-main" CHIP thread on darwin

* move ChipThreadWork to server/java folder as bzbarsky-apple's suggestion because is it not suit for all platforms

* change ChipAndroidAppShutdown to void and remove no mean [&]
---
 .../tcl/chip/chiptvserver/MainActivity.java   | 10 ++++
 .../chiptvserver/service/MatterServant.java   |  9 ++-
 .../app/src/main/res/layout/activity_main.xml | 10 ++++
 .../server/java/AndroidAppServerWrapper.cpp   |  6 ++
 src/app/server/java/AndroidAppServerWrapper.h |  2 +
 src/app/server/java/BUILD.gn                  |  2 +
 src/app/server/java/CHIPAppServer-JNI.cpp     |  7 +++
 src/app/server/java/ChipThreadWork.cpp        | 58 +++++++++++++++++++
 src/app/server/java/ChipThreadWork.h          | 37 ++++++++++++
 .../src/chip/appserver/ChipAppServer.java     |  2 +
 10 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 src/app/server/java/ChipThreadWork.cpp
 create mode 100644 src/app/server/java/ChipThreadWork.h

diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
index 7475aa4e7e8e85..e71a4663ea412d 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
+++ b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
@@ -2,12 +2,14 @@
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import chip.setuppayload.DiscoveryCapability;
 import chip.setuppayload.SetupPayload;
 import chip.setuppayload.SetupPayloadParser;
+import com.tcl.chip.chiptvserver.service.MatterServant;
 import java.util.HashSet;
 
 public class MainActivity extends AppCompatActivity {
@@ -23,6 +25,14 @@ protected void onCreate(Bundle savedInstanceState) {
     mQrCodeImg = findViewById(R.id.qrCodeImg);
     mQrCodeTxt = findViewById(R.id.qrCodeTxt);
     mManualPairingCodeTxt = findViewById(R.id.manualPairingCodeTxt);
+    findViewById(R.id.resetBtn)
+        .setOnClickListener(
+            new View.OnClickListener() {
+              @Override
+              public void onClick(View view) {
+                MatterServant.get().restart();
+              }
+            });
 
     // TODO: Get these parameters from PreferencesConfigurationManager
     HashSet<DiscoveryCapability> discoveryCapabilities = new HashSet<>();
diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
index e6637744ab9dd3..fffb60be46040b 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
+++ b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
@@ -20,6 +20,8 @@
 
 public class MatterServant {
 
+  private ChipAppServer chipAppServer;
+
   private MatterServant() {}
 
   private static class SingletonHolder {
@@ -49,7 +51,12 @@ public void init(@NonNull Context context) {
             new NsdManagerServiceResolver(applicationContext),
             new ChipMdnsCallbackImpl());
 
-    ChipAppServer chipAppServer = new ChipAppServer();
+    chipAppServer = new ChipAppServer();
+    chipAppServer.startApp();
+  }
+
+  public void restart() {
+    chipAppServer.stopApp();
     chipAppServer.startApp();
   }
 }
diff --git a/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml b/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml
index 65b4ee55984ea5..f26237c235c4eb 100644
--- a/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml
+++ b/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml
@@ -32,4 +32,14 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <Button
+        android:id="@+id/resetBtn"
+        android:text="Reset"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/manualPairingCodeTxt"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/app/server/java/AndroidAppServerWrapper.cpp b/src/app/server/java/AndroidAppServerWrapper.cpp
index f32c9bdd25c393..2dd91246d8f942 100644
--- a/src/app/server/java/AndroidAppServerWrapper.cpp
+++ b/src/app/server/java/AndroidAppServerWrapper.cpp
@@ -62,3 +62,9 @@ CHIP_ERROR ChipAndroidAppInit(void)
     }
     return err;
 }
+
+void ChipAndroidAppShutdown(void)
+{
+    chip::Server::GetInstance().Shutdown();
+    chip::Platform::MemoryShutdown();
+}
diff --git a/src/app/server/java/AndroidAppServerWrapper.h b/src/app/server/java/AndroidAppServerWrapper.h
index c128328564920c..ef530de60e232c 100644
--- a/src/app/server/java/AndroidAppServerWrapper.h
+++ b/src/app/server/java/AndroidAppServerWrapper.h
@@ -22,6 +22,8 @@
 
 CHIP_ERROR ChipAndroidAppInit(void);
 
+void ChipAndroidAppShutdown(void);
+
 jint AndroidAppServerJNI_OnLoad(JavaVM * jvm, void * reserved);
 
 void AndroidAppServerJNI_OnUnload(JavaVM * jvm, void * reserved);
diff --git a/src/app/server/java/BUILD.gn b/src/app/server/java/BUILD.gn
index dd40c94eaf1862..166cdd82ade5a2 100644
--- a/src/app/server/java/BUILD.gn
+++ b/src/app/server/java/BUILD.gn
@@ -27,6 +27,8 @@ static_library("jni") {
     "AndroidAppServerWrapper.cpp",
     "AndroidAppServerWrapper.h",
     "CHIPAppServer-JNI.cpp",
+    "ChipThreadWork.cpp",
+    "ChipThreadWork.h",
   ]
 
   deps = [
diff --git a/src/app/server/java/CHIPAppServer-JNI.cpp b/src/app/server/java/CHIPAppServer-JNI.cpp
index 57301485269b8d..52f9a55c78a947 100644
--- a/src/app/server/java/CHIPAppServer-JNI.cpp
+++ b/src/app/server/java/CHIPAppServer-JNI.cpp
@@ -22,6 +22,7 @@
  *
  */
 #include "AndroidAppServerWrapper.h"
+#include "ChipThreadWork.h"
 #include <jni.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/CHIPJNIError.h>
@@ -130,6 +131,12 @@ JNI_METHOD(jboolean, startApp)(JNIEnv * env, jobject self)
     return JNI_TRUE;
 }
 
+JNI_METHOD(jboolean, stopApp)(JNIEnv * env, jobject self)
+{
+    chip::ThreadWork::ChipMainThreadScheduleAndWait([] { ChipAndroidAppShutdown(); });
+    return JNI_TRUE;
+}
+
 void * IOThreadAppMain(void * arg)
 {
     JNIEnv * env;
diff --git a/src/app/server/java/ChipThreadWork.cpp b/src/app/server/java/ChipThreadWork.cpp
new file mode 100644
index 00000000000000..334e3052211e42
--- /dev/null
+++ b/src/app/server/java/ChipThreadWork.cpp
@@ -0,0 +1,58 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "ChipThreadWork.h"
+#include <platform/CHIPDeviceLayer.h>
+#include <semaphore.h>
+
+namespace chip {
+namespace ThreadWork {
+namespace {
+
+struct WorkData
+{
+    WorkCallback callback;
+    sem_t done;
+
+    WorkData() { sem_init(&done, 0 /* shared */, 0); }
+    ~WorkData() { sem_destroy(&done); }
+    void Post() { sem_post(&done); }
+    void Wait() { sem_wait(&done); }
+};
+
+void PerformWork(intptr_t arg)
+{
+    WorkData * work = reinterpret_cast<WorkData *>(arg);
+
+    work->callback();
+    work->Post();
+}
+
+} // namespace
+
+void ChipMainThreadScheduleAndWait(WorkCallback callback)
+{
+    WorkData workdata;
+    workdata.callback = callback;
+
+    chip::DeviceLayer::PlatformMgr().ScheduleWork(PerformWork, reinterpret_cast<intptr_t>(&workdata));
+
+    workdata.Wait();
+}
+
+} // namespace ThreadWork
+} // namespace chip
diff --git a/src/app/server/java/ChipThreadWork.h b/src/app/server/java/ChipThreadWork.h
new file mode 100644
index 00000000000000..88e7209c150498
--- /dev/null
+++ b/src/app/server/java/ChipThreadWork.h
@@ -0,0 +1,37 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <functional>
+
+#include <lib/core/CHIPError.h>
+
+namespace chip {
+namespace ThreadWork {
+
+using WorkCallback = std::function<void()>;
+
+/// Schedules a task to be run on the CHIP main thread and waits for that
+/// task to be complete.
+///
+/// Returns only once callback has been completely executed (callback
+/// will not be running anymore when this returns).
+void ChipMainThreadScheduleAndWait(WorkCallback callback);
+
+} // namespace ThreadWork
+} // namespace chip
diff --git a/src/app/server/java/src/chip/appserver/ChipAppServer.java b/src/app/server/java/src/chip/appserver/ChipAppServer.java
index 79a8d5eb23751c..a954dc1f9d8379 100644
--- a/src/app/server/java/src/chip/appserver/ChipAppServer.java
+++ b/src/app/server/java/src/chip/appserver/ChipAppServer.java
@@ -22,4 +22,6 @@ public class ChipAppServer {
   private static final String TAG = ChipAppServer.class.getSimpleName();
 
   public native boolean startApp();
+
+  public native boolean stopApp();
 }