tv-casting-app: simplified Android discovery API (project-chip#31112)

* tv-casting-app: simplified android discovery API * Addressed comments by sharadb-amazon * Addressed comments by sharadb-amazon - 2nd review * Fixing style issue
pgregorr-amazon · Dec 29, 2023 · 420e6d4 · 420e6d4
1 parent 4855f58
commit 420e6d4
Show file tree

Hide file tree

Showing 34 changed files with 1,395 additions and 25 deletions.
diff --git a/examples/tv-casting-app/android/App/app/src/main/AndroidManifest.xml b/examples/tv-casting-app/android/App/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.chip.casting.app">
+    package="com">
 
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -10,7 +10,6 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
 
     <application
         android:allowBackup="true"
@@ -19,9 +18,9 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:name=".ChipTvCastingApplication"
+        android:name=".chip.casting.app.ChipTvCastingApplication"
         android:theme="@style/Theme.CHIPTVCastingApp">
-        <activity android:name=".MainActivity"
+        <activity android:name=".chip.casting.app.MainActivity"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/...les/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CastingContext.java b/...les/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CastingContext.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.widget.LinearLayout;
 import androidx.fragment.app.FragmentActivity;
+import com.R;
 
 public class CastingContext {
   private FragmentActivity fragmentActivity;

diff --git a/...s/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CertTestFragment.java b/...s/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CertTestFragment.java
@@ -10,6 +10,7 @@
 import android.widget.ListView;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import com.R;
 import com.chip.casting.ContentApp;
 import com.chip.casting.ContentLauncherTypes;
 import com.chip.casting.FailureCallback;

diff --git a/...app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java b/...app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
@@ -14,6 +14,7 @@
 import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import com.R;
 import com.chip.casting.DiscoveredNodeData;
 import com.chip.casting.FailureCallback;
 import com.chip.casting.MatterError;
@@ -67,6 +68,7 @@ public View onCreateView(
 
   @Override
   public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    Log.d(TAG, "onViewCreated() called");
     super.onViewCreated(view, savedInstanceState);
 
     Button manualCommissioningButton = getView().findViewById(R.id.manualCommissioningButton);
@@ -103,7 +105,10 @@ public void onClick(View v) {
         new SuccessCallback<DiscoveredNodeData>() {
           @Override
           public void handle(DiscoveredNodeData discoveredNodeData) {
-            Log.d(TAG, "Discovered a Video Player Commissioner: " + discoveredNodeData);
+            Log.d(
+                TAG,
+                "SuccessCallback handle() Discovered a Video Player Commissioner: "
+                    + discoveredNodeData);
             new Handler(Looper.getMainLooper())
                 .post(
                     () -> {
@@ -129,7 +134,10 @@ public void handle(DiscoveredNodeData discoveredNodeData) {
         new FailureCallback() {
           @Override
           public void handle(MatterError matterError) {
-            Log.e(TAG, "Error occurred during video player commissioner discovery: " + matterError);
+            Log.e(
+                TAG,
+                "FailureCallback handle() Error occurred during video player commissioner discovery: "
+                    + matterError);
             if (MatterError.DISCOVERY_SERVICE_LOST == matterError) {
               Log.d(TAG, "Attempting to restart service");
               tvCastingApp.discoverVideoPlayerCommissioners(successCallback, this);
@@ -148,7 +156,7 @@ public void handle(MatterError matterError) {
   @Override
   public void onResume() {
     super.onResume();
-    Log.d(TAG, "Auto discovering");
+    Log.d(TAG, "onResume() called. Auto discovering");
 
     poller =
         executor.scheduleAtFixedRate(

diff --git a/...tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java b/...tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java
@@ -8,6 +8,7 @@
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import com.R;
 import com.chip.casting.CommissioningCallbacks;
 import com.chip.casting.ContentApp;
 import com.chip.casting.DiscoveredNodeData;

diff --git a/...sting-app/android/App/app/src/main/java/com/chip/casting/app/ContentLauncherFragment.java b/...sting-app/android/App/app/src/main/java/com/chip/casting/app/ContentLauncherFragment.java
@@ -9,6 +9,7 @@
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import com.R;
 import com.chip.casting.ContentApp;
 import com.chip.casting.MatterCallbackHandler;
 import com.chip.casting.MatterError;

diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java
@@ -5,18 +5,22 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
+import com.R;
 import com.chip.casting.AppParameters;
 import com.chip.casting.DiscoveredNodeData;
 import com.chip.casting.TvCastingApp;
 import com.chip.casting.util.GlobalCastingConstants;
 import com.chip.casting.util.PreferencesConfigurationManager;
+import com.matter.casting.DiscoveryExampleFragment;
 import com.matter.casting.InitializationExample;
+import com.matter.casting.core.CastingPlayer;
 import java.util.Random;
 
 public class MainActivity extends AppCompatActivity
     implements CommissionerDiscoveryFragment.Callback,
         ConnectionFragment.Callback,
-        SelectClusterFragment.Callback {
+        SelectClusterFragment.Callback,
+        DiscoveryExampleFragment.Callback {
 
   private static final String TAG = MainActivity.class.getSimpleName();
 
@@ -36,7 +40,12 @@ protected void onCreate(Bundle savedInstanceState) {
       return;
     }
 
-    Fragment fragment = CommissionerDiscoveryFragment.newInstance(tvCastingApp);
+    Fragment fragment = null;
+    if (GlobalCastingConstants.ChipCastingSimplified) {
+      fragment = DiscoveryExampleFragment.newInstance();
+    } else {
+      fragment = CommissionerDiscoveryFragment.newInstance(tvCastingApp);
+    }
     getSupportFragmentManager()
         .beginTransaction()
         .add(R.id.main_fragment_container, fragment, fragment.getClass().getSimpleName())
@@ -48,6 +57,13 @@ public void handleCommissioningButtonClicked(DiscoveredNodeData commissioner) {
     showFragment(ConnectionFragment.newInstance(tvCastingApp, commissioner));
   }
 
+  @Override
+  public void handleConnectionButtonClicked(CastingPlayer player) {
+    Log.i(TAG, "MainActivity.handleConnectionButtonClicked() called");
+    // TODO: In future PR, show fragment that connects to the player.
+    // showFragment(ConnectionFragment.newInstance(CastingPlayer player));
+  }
+
   @Override
   public void handleCommissioningComplete() {
     showFragment(SelectClusterFragment.newInstance(tvCastingApp));

diff --git a/...casting-app/android/App/app/src/main/java/com/chip/casting/app/MediaPlaybackFragment.java b/...casting-app/android/App/app/src/main/java/com/chip/casting/app/MediaPlaybackFragment.java
@@ -9,6 +9,7 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
+import com.R;
 import com.chip.casting.ContentApp;
 import com.chip.casting.FailureCallback;
 import com.chip.casting.MatterError;

diff --git a/...casting-app/android/App/app/src/main/java/com/chip/casting/app/SelectClusterFragment.java b/...casting-app/android/App/app/src/main/java/com/chip/casting/app/SelectClusterFragment.java
@@ -7,6 +7,7 @@
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import com.R;
 import com.chip.casting.TvCastingApp;
 
 /** An interstitial {@link Fragment} to select one of the supported media actions to perform */