1.8.1 SDK. No longer allowed to set customer whitelist usernames.

Author: SteveyO

CHANGELOG.md

@@ -1,8 +1,14 @@
 # Android/Java SDK Changelog
 
+## 1.8.1beta (2015-07-23)
+Changes
+  - Removed ability to create your own whitelist username (as will be removed in the bridge in the future).</br></br>
+    <b>Important!!</b>&nbsp;If you are using the QuickStart app as your base code and updating the Java SDK, please check out the small 
+	but important changes (to setting the username) in PHHomeActivity.java , HueSharedPreferences.java and PHPushlinkActivity.java
+
 ## 1.8beta (2015-06-30)
 Changes
-  - Delete devices added(sensors and lights)
+  - Delete devices added (sensors and lights)
   - New Clip Increment Feature (new increment* attributes in PHLightState)
   - New  bridge fields added (e.g .ModelId,  Type in PHGroup, Manufacturername, UniqueId in PHLight, Bridge Id)
   - New light Models added for Color Conversions (e.g .HueGo).  

JavaDesktopApp/libs/huelocalsdk.jar

@@ -70,26 +70,21 @@ public void onAuthenticationRequired(PHAccessPoint accessPoint) {
         }
 
         @Override
-        public void onBridgeConnected(PHBridge bridge) {
+        public void onBridgeConnected(PHBridge bridge, String username) {
             phHueSDK.setSelectedBridge(bridge);
             phHueSDK.enableHeartbeat(bridge, PHHueSDK.HB_INTERVAL);
             desktopView.getFindingBridgeProgressBar().setVisible(false);
-            String username = HueProperties.getUsername();
             String lastIpAddress =  bridge.getResourceCache().getBridgeConfiguration().getIpAddress();   
-            System.out.println("On connected: IP " + lastIpAddress);
             HueProperties.storeUsername(username);
             HueProperties.storeLastIPAddress(lastIpAddress);
             HueProperties.saveProperties();
-            
             // Update the GUI.
             desktopView.getLastConnectedIP().setText(lastIpAddress);
             desktopView.getLastUserName().setText(username);
-            
             // Close the PushLink dialog (if it is showing).
             if (pushLinkDialog!=null && pushLinkDialog.isShowing()) {
                 pushLinkDialog.setVisible(false);
             }
-            
             // Enable the Buttons/Controls to change the hue bulbs.s
             desktopView.getRandomLightsButton().setEnabled(true);
             desktopView.getSetLightsButton().setEnabled(true);

JavaDesktopApp/libs/huesdkresources.jar

@@ -45,12 +45,7 @@ public static void storeUsername(String username) {
      * Returns the stored Whitelist username.  If it doesn't exist we generate a 16 character random string and store this in the properties file.
      */
     public static String getUsername() {
-        String username = props.getProperty(USER_NAME);
-        
-        if (username==null || username.equals("")) {   // If we don't have a username then we generate a unique 16 character one.
-            username = PHBridgeInternal.generateUniqueKey();
-            storeUsername(username); 
-        }
+        String username = props.getProperty(USER_NAME);        
         return username;
     }
 

JavaDesktopApp/src/com/philips/lighting/Controller.java

@@ -53,11 +53,8 @@ public AccessPointList(final List<PHAccessPoint> accessPointsList, final Control
          public void mouseClicked(MouseEvent e) {
               int mouseClickedIndex = listbox.getSelectedIndex();
 
-              String username = HueProperties.getUsername();
-              HueProperties.storeUsername(username);
               controller.showProgressBar();
               PHHueSDK phHueSDK = PHHueSDK.getInstance();
-              accessPointsList.get(mouseClickedIndex).setUsername(username);
               phHueSDK.connect(accessPointsList.get(mouseClickedIndex));
               setVisible(false);
          }

JavaDesktopApp/src/com/philips/lighting/data/HueProperties.java

@@ -35,10 +35,6 @@ private HueSharedPreferences(Context appContext) {
 
     public String getUsername() {
          String username = mSharedPreferences.getString(LAST_CONNECTED_USERNAME, "");
-         if (username==null || username.equals("")) {
-             username = PHBridgeInternal.generateUniqueKey();
-             setUsername(username);  // Persist the username in the shared prefs
-         }
     	 return username;
 	}
 

JavaDesktopApp/src/com/philips/lighting/gui/AccessPointList.java

@@ -128,12 +128,12 @@ public void onCacheUpdated(List<Integer> arg0, PHBridge bridge) {
         }
 
         @Override
-        public void onBridgeConnected(PHBridge b) {
+        public void onBridgeConnected(PHBridge b, String username) {
             phHueSDK.setSelectedBridge(b);
             phHueSDK.enableHeartbeat(b, PHHueSDK.HB_INTERVAL);
             phHueSDK.getLastHeartbeat().put(b.getResourceCache().getBridgeConfiguration() .getIpAddress(), System.currentTimeMillis());
             prefs.setLastConnectedIPAddress(b.getResourceCache().getBridgeConfiguration().getIpAddress());
-            prefs.setUsername(prefs.getUsername());
+            prefs.setUsername(username);
             PHWizardAlertDialog.getInstance().closeProgressDialog();     
             startMainActivity();
         }
@@ -250,9 +250,7 @@ public void onDestroy() {
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 
-        HueSharedPreferences prefs = HueSharedPreferences.getInstance(getApplicationContext());
         PHAccessPoint accessPoint = (PHAccessPoint) adapter.getItem(position);
-        accessPoint.setUsername(prefs.getUsername());
 
         PHBridge connectedBridge = phHueSDK.getSelectedBridge();