iCloud3 v3.1.4.1

custom_components/icloud3/ChangeLog.txt

@@ -5,7 +5,7 @@
 
 3.1.4
 .......................
-### Change Log - v3.1.4 (12/22/2024)
+### Release Notes - v3.1.4 (12/24/2024)
 1. APPLE ACCOUNT PASSWORD AUTHENTICATION:
     - Reverted back to the old password authentication protocol before the Secure Remote Password (SRP) protocol was implemented
     - The Password SRP protocol will be tried if the old password authentication protocol fails.
@@ -14,7 +14,7 @@
 4. TOOLS SCREEN (New Feature) - A `Tools` screen replaces the `Actions` screen on the Configure Menu screen. This is used for configuration file maintenance to reset all Devices Apple Account fields, Delete all Apple Accounts and Devices, Delete all iCloud3 and Apple Account cookie files, etc.
 5. STARTUP (Improved) - Error and warning messages have been improved when setting up Apple Accounts and the Mobile App devices. When errors are encountered (devices can not be found, invalid Apple Account information, etc), an attempt will be made to correct the error using known device names and identification codes. Sometimes it works, sometimes it doesn't and the configuration will need to be updated.
 6. ERROR & WARNING MESSAGES (Improved) - Changed various messages to improve readability and simplify the text.
-7. A lot of internal code changes to improve code maintenance and to remove dead code.
+7. MISCELLANEOUS CHANGES - A lot of internal code changes to make messages consistant, alerts all the same format with the samt highlight icons, improve code maintenance and to remove dead code and more.
 
 What's Next:
 .......................

custom_components/icloud3/config_flow.py

@@ -782,7 +782,7 @@ def common_form_handler(self, user_input=None, action_item=None, errors=None):
         elif self.step_id == "display_text_as":
             pass
         elif self.step_id == 'tracking_parameters':
-            user_input = self._validate_tracking_parameters(user_input)
+            user_input = self._validate_tracking_paramdeters(user_input)
         elif self.step_id == 'inzone_intervals':
             user_input = self._validate_inzone_intervals(user_input)
         elif self.step_id == "waze_main":
@@ -936,6 +936,7 @@ async def async_step_tracking_parameters(self, user_input=None, errors=None):
             if action_item == 'save':
                 Gb.picture_www_dirs = Gb.conf_profile[CONF_PICTURE_WWW_DIRS].copy()
                 self.picture_by_filename = {}
+                await self._build_picture_filename_selection_list()
             return await self.async_step_menu()
 
 
@@ -2907,10 +2908,13 @@ async def async_step_add_device(self, user_input=None, errors=None):
 
         user_input = self._option_text_to_parm(user_input, CONF_MOBILE_APP_DEVICE, self.mobapp_list_text_by_entity_id)
         user_input = self._option_text_to_parm(user_input, CONF_PICTURE, self.picture_by_filename)
-
+        user_input = self._option_text_to_parm(user_input, CONF_TRACKING_MODE, TRACKING_MODE_OPTIONS)
+
+        self.log_step_info(user_input, action_item)
         user_input = self._validate_ic3_devicename(user_input)
-        user_input = self._validate_data_source_selections(user_input)
+
         user_input = self._resolve_selection_list_items(user_input)
+        user_input = self._validate_data_source_selections(user_input)        
         ui_devicename = user_input[CONF_IC3_DEVICENAME]
 
         self.log_step_info(user_input, action_item)
@@ -3305,11 +3309,10 @@ def _validate_data_source_selections(self, user_input):
             self.errors[CONF_FAMSHR_DEVICENAME] = 'unknown_icloud'
 
         elif (ui_icloud_dname == 'None'
-                and ui_mobile_app_name == 'None'):
-            if user_input.get(CONF_TRACKING_MODE, TRACK_DEVICE) != INACTIVE_DEVICE:
-                user_input[CONF_TRACKING_MODE] = INACTIVE_DEVICE
-                self.errors[CONF_FAMSHR_DEVICENAME] = 'no_data_source'
-                # self.errors[CONF_MOBILE_APP_DEVICE] = 'no_device_selected'
+                and ui_mobile_app_name == 'None'
+                and user_input.get(CONF_TRACKING_MODE, TRACK_DEVICE) != INACTIVE_DEVICE):
+            self.errors[CONF_FAMSHR_DEVICENAME] = 'no_data_source'
+            self.errors[CONF_TRACKING_MODE] = 'no_data_source_set_inactive'
 
         if (ui_mobile_app_name != 'None'
                 and ui_mobile_app_name not in self.mobapp_list_text_by_entity_id

custom_components/icloud3/config_flow_forms.py

@@ -596,6 +596,10 @@ def form_add_device(self):
                     default=default_picture_filename):
                     selector.SelectSelector(selector.SelectSelectorConfig(
                         options=dict_value_to_list(self.picture_by_filename), mode='dropdown')),
+        vol.Required(CONF_TRACKING_MODE,
+                    default=self._option_parm_to_text(CONF_TRACKING_MODE, TRACKING_MODE_OPTIONS)):
+                    selector.SelectSelector(selector.SelectSelectorConfig(
+                        options=dict_value_to_list(TRACKING_MODE_OPTIONS), mode='dropdown')),
         vol.Required('action_items',
                 default=self.action_default_text('add_device')):
                 selector.SelectSelector(selector.SelectSelectorConfig(

custom_components/icloud3/const.py

@@ -10,7 +10,7 @@
 #
 #<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-VERSION                         = '3.1.4'
+VERSION                         = '3.1.4.1'
 VERSION_BETA                    = ''
 #-----------------------------------------
 ICLOUD3                         = 'iCloud3'

custom_components/icloud3/helpers/file_io.py

@@ -336,7 +336,7 @@ def get_file_or_directory_list(list_type=None, start_dir=None,  file_extn_filter
             if start_dir.endswith('/event_log_card/'):
                 pass
             elif start_dir == 'www' and Gb.picture_www_dirs:
-                valid_dir = [dir for dir in Gb.picture_www_dirs if sub_directory.startswith(dir)]
+                valid_dir = [dir for dir in Gb.picture_www_dirs if sub_directory.endswith(dir)]
                 if valid_dir == []:
                     continue
 

custom_components/icloud3/manifest.json

@@ -10,5 +10,5 @@
   "issue_tracker": "https://github.com/gcobb321/icloud3/issues",
   "loggers": ["icloud3"],
   "requirements": ["srp"],
-  "version": "3.1.4"
+  "version": "3.1.4.1"
 }