Show WifDirect passphrase on robot controller screen

Former-commit-id: 725f55df4cf8e24fac319e9591f2da2f329a23c2
Former-commit-id: 6892bf5

FtcRobotController/src/main/java/com/qualcomm/ftcrobotcontroller/FtcRobotControllerActivity.java

@@ -91,12 +91,13 @@ public class FtcRobotControllerActivity extends Activity {
   protected TextView textDeviceName;
   protected TextView textWifiDirectStatus;
   protected TextView textRobotStatus;
+  protected TextView textWifiDirectPassphrase;
   protected TextView[] textGamepad = new TextView[NUM_GAMEPADS];
   protected TextView textOpMode;
   protected TextView textErrorMessage;
   protected ImmersiveMode immersion;
 
-  protected UpdateUI updateUI;
+  protected UpdateUIHook updateUI;
   protected Dimmer dimmer;
   protected LinearLayout entireScreenLayout;
 
@@ -156,18 +157,19 @@ public void onClick(View v) {
     textRobotStatus = (TextView) findViewById(R.id.textRobotStatus);
     textOpMode = (TextView) findViewById(R.id.textOpMode);
     textErrorMessage = (TextView) findViewById(R.id.textErrorMessage);
+    textWifiDirectPassphrase = (TextView) findViewById(R.id.textWifiDirectPassphrase);
     textGamepad[0] = (TextView) findViewById(R.id.textGamepad1);
     textGamepad[1] = (TextView) findViewById(R.id.textGamepad2);
     immersion = new ImmersiveMode(getWindow().getDecorView());
     dimmer = new Dimmer(this);
     dimmer.longBright();
     Restarter restarter = new RobotRestarter();
 
-    updateUI = new UpdateUI(this, dimmer);
+    updateUI = new UpdateUIHook(this, dimmer);
     updateUI.setRestarter(restarter);
     updateUI.setTextViews(textWifiDirectStatus, textRobotStatus,
-        textGamepad, textOpMode, textErrorMessage, textDeviceName);
-    callback = updateUI.new Callback();
+            textGamepad, textOpMode, textErrorMessage, textDeviceName);
+    callback = updateUI.new CallbackHook();
 
     PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
     preferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -386,4 +388,75 @@ public void run() {
       }
     });
   }
-}
+
+class UpdateUIHook extends UpdateUI
+  {
+  //------------------------------------------------------------------------------------------------
+  // State
+  //------------------------------------------------------------------------------------------------
+
+  FtcRobotControllerActivity activity;
+  FtcRobotControllerService  controllerService;
+
+  //------------------------------------------------------------------------------------------------
+  // Construction
+  //------------------------------------------------------------------------------------------------
+
+  UpdateUIHook(FtcRobotControllerActivity activity, Dimmer dimmer)
+    {
+    super(activity, dimmer);
+    this.activity = activity;
+    this.controllerService = null;
+    }
+
+  @Override public void setControllerService(FtcRobotControllerService controllerService)
+    {
+    super.setControllerService(controllerService);
+    this.controllerService = controllerService;
+    }
+
+  //------------------------------------------------------------------------------------------------
+  // Operations
+  //------------------------------------------------------------------------------------------------
+
+  class CallbackHook extends UpdateUI.Callback
+    {
+    @Override public void wifiDirectUpdate(WifiDirectAssistant.Event event)
+      {
+      super.wifiDirectUpdate(event);
+
+      final String message = controllerService == null
+        ? "" :
+        String.format("Wifi Direct passphrase: %s", controllerService.getWifiDirectAssistant().getPassphrase());
+
+      UpdateUIHook.this.activity.runOnUiThread(new Runnable()
+      {
+      @Override public void run()
+        {
+        activity.textWifiDirectPassphrase.setText(message);
+        }
+      });
+      }
+    }
+  }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

FtcRobotController/src/main/res/layout/activity_ftc_controller.xml

@@ -74,10 +74,18 @@
       android:text="" />
 
     <TextView
-      android:id="@+id/textRobotStatus"
+      android:id="@+id/textWifiDirectPassphrase"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:textAppearance="?android:attr/textAppearanceMedium"
       android:layout_below="@+id/textWifiDirectStatus"
+      android:text="" />
+
+    <TextView
+      android:id="@+id/textRobotStatus"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/textWifiDirectPassphrase"
       android:textAppearance="?android:attr/textAppearanceMedium"
       android:text="" />