Update pending status

lazarkov · lazarkov · commit 31cb3256d7d7 · 2024-07-02T18:48:43.000+02:00
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
@@ -5264,7 +5264,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }
diff --git a/examples/common/m5stack-tft/repo b/examples/common/m5stack-tft/repo
@@ -1 +1 @@
-Subproject commit d99f5ef8df180ab34b3d9fff6888d5bede7665c5
+Subproject commit a6299b6c7c0b2e3eb62fa08ee4bf7155c39bad1f
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -7895,7 +7895,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }
@@ -7957,7 +7957,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
@@ -7852,7 +7852,7 @@ cluster ApplicationLauncher = 1292 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
-    kPending = 3;
+    kPendingUserApproval = 3;
     kDownloading = 4;
     kInstalling = 5;
   }
@@ -7914,7 +7914,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/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/handlers/ApplicationLauncherManagerImpl.java b/examples/tv-app/android/App/platform-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
@@ -2928,7 +2928,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
@@ -2390,7 +2390,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
@@ -8870,7 +8870,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

Original file line number	Diff line number	Diff line change
`@@ -5264,7 +5264,7 @@ cluster ApplicationLauncher = 1292 {`
`5264`	`5264`	`kSuccess = 0;`
`5265`	`5265`	`kAppNotAvailable = 1;`
`5266`	`5266`	`kSystemBusy = 2;`
`5267`		`- kPending = 3;`
	`5267`	`+ kPendingUserApproval = 3;`
`5268`	`5268`	`kDownloading = 4;`
`5269`	`5269`	`kInstalling = 5;`
`5270`	`5270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2928,7 +2928,7 @@ cluster ApplicationLauncher = 1292 {`
`2928`	`2928`	`kSuccess = 0;`
`2929`	`2929`	`kAppNotAvailable = 1;`
`2930`	`2930`	`kSystemBusy = 2;`
`2931`		`- kPending = 3;`
	`2931`	`+ kPendingUserApproval = 3;`
`2932`	`2932`	`kDownloading = 4;`
`2933`	`2933`	`kInstalling = 5;`
`2934`	`2934`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2390,7 +2390,7 @@ cluster ApplicationLauncher = 1292 {`
`2390`	`2390`	`kSuccess = 0;`
`2391`	`2391`	`kAppNotAvailable = 1;`
`2392`	`2392`	`kSystemBusy = 2;`
`2393`		`- kPending = 3;`
	`2393`	`+ kPendingUserApproval = 3;`
`2394`	`2394`	`kDownloading = 4;`
`2395`	`2395`	`kInstalling = 5;`
`2396`	`2396`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8870,7 +8870,7 @@ cluster ApplicationLauncher = 1292 {`
`8870`	`8870`	`kSuccess = 0;`
`8871`	`8871`	`kAppNotAvailable = 1;`
`8872`	`8872`	`kSystemBusy = 2;`
`8873`		`- kPending = 3;`
	`8873`	`+ kPendingUserApproval = 3;`
`8874`	`8874`	`kDownloading = 4;`
`8875`	`8875`	`kInstalling = 5;`
`8876`	`8876`	`}`