Update pending status

project-chip · Aug 7, 2024 · 112ab52 · 112ab52
1 parent d44ce2e
commit 112ab52
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 29 deletions.
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -5583,7 +5583,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -8236,7 +8236,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }
@@ -8298,7 +8298,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -8193,7 +8193,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }
@@ -8255,7 +8255,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }

diff --git a/examples/tv-app/android/App/platform-app/build.gradle b/examples/tv-app/android/App/platform-app/build.gradle
@@ -47,14 +47,14 @@ android {
             aidl.srcDirs = ['../common-api/src/main/aidl']
 
             // uncomment this code to debug
-//            java.srcDirs = [
-//                    'src/main/java',
-//                    '../common-api/src/main/java',
-//                    '../../third_party/connectedhomeip/src/setup_payload/java/src',
-//                    '../../third_party/connectedhomeip/src/platform/android/java',
-//                    '../../third_party/connectedhomeip/src/app/server/java/src/',
-//                    '../../java/src',
-//            ]
+            java.srcDirs = [
+                    'src/main/java',
+                    '../common-api/src/main/java',
+                    '../../third_party/connectedhomeip/src/setup_payload/java/src',
+                    '../../third_party/connectedhomeip/src/platform/android/java',
+                    '../../third_party/connectedhomeip/src/app/server/java/src/',
+                    '../../java/src',
+            ]
         }
     }
     buildFeatures {

diff --git a/...tform-app/src/main/java/com/matter/tv/server/handlers/ApplicationLauncherManagerImpl.java b/...tform-app/src/main/java/com/matter/tv/server/handlers/ApplicationLauncherManagerImpl.java
@@ -114,7 +114,7 @@ public LauncherResponse launchApp(Application app, String data) {
       Log.i(
           TAG,
           "Matter enabled app is not installed, but app is installed. Launching app's install page");
-      status = LauncherResponse.STATUS_PENDING;
+      status = LauncherResponse.STATUS_PENDING_USER_APPROVAL;
       responseData = "App is installed, try updating";
 
       //
@@ -129,7 +129,7 @@ public LauncherResponse launchApp(Application app, String data) {
         Log.i(TAG, "App is installing");
         status = LauncherResponse.STATUS_INSTALLING;
       } else {
-        status = LauncherResponse.STATUS_PENDING;
+        status = LauncherResponse.STATUS_PENDING_USER_APPROVAL;
         if (appInstallFailed) {
           responseData = "App install failed. Try again";
         }

diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/LauncherResponse.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/LauncherResponse.java
@@ -5,7 +5,7 @@ public class LauncherResponse {
   public static final int STATUS_SUCCESS = 0;
   public static final int STATUS_APP_NOT_AVAILABLE = 1;
   public static final int STATUS_SYSTEM_BUSY = 2;
-  public static final int STATUS_PENDING = 3;
+  public static final int STATUS_PENDING_USER_APPROVAL = 3;
   public static final int STATUS_DOWNLOADING = 4;
   public static final int STATUS_INSTALLING = 5;
 

diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
@@ -3259,7 +3259,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -2699,7 +2699,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }

diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml
@@ -80,7 +80,7 @@ limitations under the License.
     <item name="Success" value="0x00"/>
     <item name="AppNotAvailable" value="0x01"/>
     <item name="SystemBusy" value="0x02"/>
-    <item name="Pending" value="0x03"/>
+    <item name="PendingUserApproval" value="0x03"/>
     <item name="Downloading" value="0x04"/>
     <item name="Installing" value="0x05"/>
   </enum>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -9114,7 +9114,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }

diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h