Update to v1.1.1 - fix login and session

Author: Inc21

CHANGELOG.md

@@ -15,11 +15,23 @@ From **v1.0.1** onwards, the app includes a "Smart Migration" feature to handle
 >
 > **Upgrading from v1.0.2 or earlier:** The old Startup-folder shortcut (`GarminUploader.lnk`) and XOR-encrypted password in `uploader_config.json` are automatically migrated on first launch of v1.0.3. No manual steps required.
 
+## [1.1.1] - 2026-04-30
+
+### Changed (1.1.1)
+
+- **More reliable Garmin login setup:** This release locks the app to the Garmin login version that worked in testing, so fresh sign-ins are more consistent.
+- **Update button now opens the right page:** In-app update prompts now take you to the current GitHub releases page.
+
+### Fixed (1.1.1)
+
+- **Fixed some Garmin login problems on first setup:** This should reduce the chance of hitting Garmin login errors when testing a new account.
+- **Fixed a bad environment mismatch:** The app now warns you clearly if it is running with an unsupported Garmin login library.
+
 ## [1.1.0] - TBD
 
 ### 🔐 Major Authentication Upgrade (1.1.0)
 
-- **NEW: Mobile SSO Authentication:** Upgraded to `garminconnect` v0.3.1 which uses Garmin's official mobile SSO authentication flow (same as the Android app). This replaces the deprecated `garth` library that was causing authentication failures and rate limiting issues.
+- **NEW: Mobile SSO Authentication:** Upgraded to `garminconnect` v0.3.2 which uses Garmin's official mobile SSO authentication flow (same as the Android app). This replaces the deprecated `garth` library that was causing authentication failures and rate limiting issues.
 - **More reliable authentication:** The new mobile SSO endpoint (`sso.garmin.com/mobile/api/login`) is actively maintained by Garmin and significantly more stable than the previous method.
 - **Automatic token refresh:** Authentication tokens now auto-refresh indefinitely without user interaction, eliminating the need for periodic re-authentication.
 

README.md

@@ -2,7 +2,7 @@
 
 Automatically upload workout activities from Wahoo, MyWhoosh, and TrainerDay to Garmin Connect.
 
-Version 1.0.7 | Windows Desktop Application (Nuitka onefile + folder build)
+Version 1.1.1 | Windows Desktop Application (Nuitka onefile + folder build)
 
 ---
 
@@ -70,20 +70,18 @@ I built this originally as a personal Python script to solve my own manual uploa
 
 **Two download options are available:**
 
-| Option | File | Best for |
-|--------|------|----------|
-| **Folder build (recommended)** | `GarminUploader-v1.0.7-folder.zip` | Most users — less likely to trigger Windows Defender |
-| **Single-file build** | `GarminUploader-v1.0.7.exe` | Advanced users who prefer a single executable |
+- **Folder build (recommended):** `GarminUploader-v1.1.1-folder.zip` — Most users; less likely to trigger Windows Defender.
+- **Single-file build:** `GarminUploader-v1.1.1.exe` — Advanced users who prefer a single executable.
 
 #### Option A: Folder build (recommended)
 
-1. Download `GarminUploader-v1.0.7-folder.zip` from Releases
+1. Download `GarminUploader-v1.1.1-folder.zip` from Releases
 2. Extract the ZIP to a folder (e.g., `C:\GarminUploader\` or your Desktop)
 3. Run `GarminUploader.exe` from the extracted folder
 
 #### Option B: Single-file build
 
-1. Download `GarminUploader-v1.0.7.exe` from Releases
+1. Download `GarminUploader-v1.1.1.exe` from Releases
 2. Place it anywhere you like (Desktop, Documents, etc.)
 3. Double-click to run
 
@@ -242,11 +240,11 @@ The app stores its configuration and log files alongside the app, usually in a s
 **Recommended layout for folder builds (for easy upgrades):**
 
 ```text
-C:\\GarminUploader\\
+C:\GarminUploader\
     uploader_config.json
     garmin_uploader.log
     garmin_uploads.log
-    GarminUploader-v1.0.7-folder\\
+    GarminUploader-v1.1.1-folder\
         GarminUploader.exe
 ```
 
@@ -329,7 +327,7 @@ Because this app is a small, niche tool that logs in to a website, stores creden
 
 **What you can do:**
 
-1. **Try the folder build:** Download `GarminUploader-v1.0.5-folder.zip` instead of the single `.exe`. Unpacked builds are less likely to trigger false positives.
+1. **Try the folder build:** Download `GarminUploader-v1.1.1-folder.zip` instead of the single `.exe`. Unpacked builds are less likely to trigger false positives.
 
 2. **Add an exception:** If you trust the source, add the app folder to Windows Defender's exclusion list:
    - Open **Windows Security** → **Virus & threat protection** → **Manage settings**
@@ -344,8 +342,8 @@ Because this app is a small, niche tool that logs in to a website, stores creden
 4. **Build from source:** If you prefer not to trust pre-built binaries:
 
    ```bash
-   git clone https://github.com/Inc21/Wahoo-and-MyWhoos-to-Garmin-Conect-Auto-Uploader.git
-   cd Wahoo-and-MyWhoos-to-Garmin-Conect-Auto-Uploader
+   git clone https://github.com/Inc21/Garmin-Connect-Auto-Uploader.git
+   cd Garmin-Connect-Auto-Uploader
    pip install -r requirements.txt
    python uploader_gui.py
    ```

__pycache__/uploader_gui.cpython-311.pyc

@@ -0,0 +1,6 @@
+garminconnect==0.3.2
+curl_cffi
+Pillow==11.2.1
+pystray==0.19.5
+keyring
+fitdecode

requirements.txt

@@ -23,7 +23,13 @@
 import xml.etree.ElementTree as ET
 import urllib.request
 import urllib.error
-from garminconnect import Garmin
+from importlib.metadata import PackageNotFoundError, version as get_installed_package_version
+try:
+    from garminconnect import Garmin
+    GARMINCONNECT_IMPORT_ERROR = None
+except Exception as exc:
+    Garmin = None
+    GARMINCONNECT_IMPORT_ERROR = exc
 from PIL import Image, ImageTk
 from pystray import Icon, Menu, MenuItem
 import webbrowser
@@ -53,6 +59,16 @@ def _get_base_and_log_dirs():
     script_dir = os.path.dirname(os.path.abspath(__file__))
     return script_dir, script_dir
 
+def _should_prefer_parent_files(default_dir):
+    if not (getattr(sys, "frozen", False) or "__compiled__" in globals()):
+        return True
+    bundle_markers = (
+        os.path.join(default_dir, "python311.dll"),
+        os.path.join(default_dir, "assets"),
+        os.path.join(default_dir, "tcl"),
+    )
+    return any(os.path.exists(marker) for marker in bundle_markers)
+
 def _resolve_existing_or_default(filename, default_dir):
     """Return a path for config/log files, preferring existing files.
 
@@ -63,10 +79,11 @@ def _resolve_existing_or_default(filename, default_dir):
     """
     parent_dir = os.path.dirname(default_dir) if default_dir else ""
     parent_path = os.path.join(parent_dir, filename) if parent_dir else ""
+    prefer_parent = _should_prefer_parent_files(default_dir)
 
     # Prefer an existing file in the parent directory so multiple versioned
     # folders (or different builds) automatically share the same files.
-    if parent_path and os.path.isfile(parent_path):
+    if prefer_parent and parent_path and os.path.isfile(parent_path):
         return parent_path
 
     # Fall back to any existing file in the current (exe) directory to remain
@@ -86,7 +103,7 @@ def _is_drive_root(path: str) -> bool:
         # e.g. "C:\\" -> tail == ""
         return bool(drive) and tail == ""
 
-    if parent_dir and not _is_drive_root(parent_dir):
+    if prefer_parent and parent_dir and not _is_drive_root(parent_dir):
         return parent_path
 
     # As a last resort (e.g. onefile exe placed directly in an app folder
@@ -114,10 +131,12 @@ def find_resource(filename):
 WAHOO_LOGO_PATH = find_resource(os.path.join("assets", "wahoo.png"))
 MYWHOOSH_LOGO_PATH = find_resource(os.path.join("assets", "mywhoosh.png"))
 TRAINERDAY_LOGO_PATH = find_resource(os.path.join("assets", "trainerday.png"))
-VERSION = "1.1.0"
+VERSION = "1.1.1"
 GITHUB_REPO_URL = "https://github.com/Inc21/Garmin-Connect-Auto-Uploader"
 VERSION_JSON_URL = "https://raw.githubusercontent.com/Inc21/Garmin-Connect-Auto-Uploader/main/version.json"
 LEGACY_VERSION_JSON_URL = "https://raw.githubusercontent.com/Inc21/Wahoo-and-MyWhoos-to-Garmin-Conect-Auto-Uploader/main/version.json"
+MIN_GARMINCONNECT_VERSION = "0.3.2"
+RECOMMENDED_GARMINCONNECT_VERSION = "0.3.2"
 LOG_FILE = _resolve_existing_or_default("garmin_uploader.log", LOG_DIR)
 # Upload log (single file; month separators written when month changes)
 UPLOAD_LOG_FILE = _resolve_existing_or_default("garmin_uploads.log", LOG_DIR)
@@ -143,6 +162,70 @@ def find_resource(filename):
 )
 logger = logging.getLogger(__name__)
 
+def _version_key(version_text):
+    parts = []
+    for raw_part in str(version_text).split("."):
+        digits = "".join(ch for ch in raw_part if ch.isdigit())
+        parts.append(int(digits) if digits else 0)
+    while len(parts) < 3:
+        parts.append(0)
+    return tuple(parts[:3])
+
+def _get_installed_garminconnect_version():
+    try:
+        return get_installed_package_version("garminconnect")
+    except PackageNotFoundError:
+        return None
+    except Exception as exc:
+        logger.warning(f"Could not read installed garminconnect version: {exc}")
+        return None
+
+def ensure_supported_garminconnect():
+    installed_version = _get_installed_garminconnect_version()
+    if GARMINCONNECT_IMPORT_ERROR is not None:
+        logger.error(f"garminconnect import failed: {GARMINCONNECT_IMPORT_ERROR}")
+        messagebox.showerror(
+            "Unsupported Garmin Login Library",
+            "Garmin Connect support could not be loaded.\n\n"
+            f"Installed garminconnect version: {installed_version or 'not installed'}\n"
+            f"Import error: {GARMINCONNECT_IMPORT_ERROR}\n\n"
+            f"This app requires garminconnect {MIN_GARMINCONNECT_VERSION} or newer.\n"
+            f"The recommended version is {RECOMMENDED_GARMINCONNECT_VERSION}.\n\n"
+            "Please reinstall dependencies from requirements.txt and rebuild the app."
+        )
+        return False
+    if not installed_version:
+        logger.error("garminconnect is not installed")
+        messagebox.showerror(
+            "Unsupported Garmin Login Library",
+            "garminconnect is not installed.\n\n"
+            f"This app requires garminconnect {MIN_GARMINCONNECT_VERSION} or newer.\n"
+            f"The recommended version is {RECOMMENDED_GARMINCONNECT_VERSION}.\n\n"
+            "Please reinstall dependencies from requirements.txt and rebuild the app."
+        )
+        return False
+    logger.info(f"Detected garminconnect {installed_version}")
+    if _version_key(installed_version) < _version_key(MIN_GARMINCONNECT_VERSION):
+        logger.error(
+            f"Unsupported garminconnect version detected: {installed_version}. "
+            f"Minimum supported version is {MIN_GARMINCONNECT_VERSION}."
+        )
+        messagebox.showerror(
+            "Unsupported Garmin Login Library",
+            f"This build is using garminconnect {installed_version}.\n\n"
+            f"Garmin Connect Uploader v{VERSION} requires garminconnect "
+            f"{MIN_GARMINCONNECT_VERSION} or newer.\n"
+            f"The recommended version is {RECOMMENDED_GARMINCONNECT_VERSION}.\n\n"
+            "Please reinstall dependencies from requirements.txt and rebuild the app."
+        )
+        return False
+    if _version_key(installed_version) < _version_key(RECOMMENDED_GARMINCONNECT_VERSION):
+        logger.warning(
+            f"garminconnect {installed_version} is supported but older than the recommended "
+            f"version {RECOMMENDED_GARMINCONNECT_VERSION}."
+        )
+    return True
+
 # Dedicated upload-only logger (separate file, no rotation; date markers in file)
 upload_logger = logging.getLogger("upload_log")
 upload_handler = logging.FileHandler(UPLOAD_LOG_FILE, encoding='utf-8')
@@ -2782,7 +2865,7 @@ def do_search():
                 btn_frame.pack(pady=20)
                 ttk.Button(btn_frame, text="Find Next", command=do_search, width=15).pack(side='left', padx=10)
                 ttk.Button(btn_frame, text="Close", command=search_window.destroy, width=15).pack(side='left', padx=10)
-                
+
                 # Bind Enter key to search
                 search_entry.bind('<Return>', lambda e: do_search())
 
@@ -2809,38 +2892,38 @@ def open_upload_log(self):
                     f"Uploads log not found yet.\n\nIt will be created at:\n{UPLOAD_LOG_FILE}\n\nonce uploads occur."
                 )
                 return
-            
+
             log_window = tk.Toplevel(self.root)
             log_window.title("Garmin Uploader - Uploads Log")
-            
+
             base_width, base_height = 800, 500
             width = int(base_width * (self.scaling / 1.33))
             height = int(base_height * (self.scaling / 1.33))
             log_window.geometry(f"{width}x{height}")
-            
+
             text_widget = scrolledtext.ScrolledText(
                 log_window,
                 wrap=tk.WORD,
                 font=('Courier New', 9)
             )
             text_widget.pack(fill=tk.BOTH, expand=True, padx=5, pady=5)
-            
+
             with open(UPLOAD_LOG_FILE, 'r', encoding='utf-8') as f:
                 log_content = f.read()
                 text_widget.insert(1.0, log_content)
             text_widget.see(tk.END)
-            
+
             def block_edit(event):
                 if event.state & 0x4:
                     return
                 if event.keysym in ('Left', 'Right', 'Up', 'Down', 'Home', 'End', 'Prior', 'Next'):
                     return
                 return "break"
             text_widget.bind("<Key>", block_edit)
-            
+
             close_btn = ttk.Button(log_window, text="Close", command=log_window.destroy)
             close_btn.pack(pady=5)
-            
+
             logger.info("Uploads log opened by user")
         except Exception as e:
             log_error(f"Failed to open uploads log file: {str(e)}")
@@ -2857,6 +2940,11 @@ def main():
     start_minimized = '--minimized' in sys.argv or '--startup' in sys.argv
 
     root = tk.Tk()
+    root.withdraw()
+    if not ensure_supported_garminconnect():
+        root.destroy()
+        return
+    root.deiconify()
     app = ConnectUploaderGUI(root)
 
     # Auto-start monitoring if both settings are enabled and starting from startup

uploader_gui.py

@@ -1,4 +1,4 @@
 {
-  "version": "1.1.0",
-  "url": "https://github.com/Inc21/Wahoo-and-MyWhoos-to-Garmin-Conect-Auto-Uploader/releases/latest"
+  "version": "1.1.1",
+  "url": "https://github.com/Inc21/Garmin-Connect-Auto-Uploader/releases/latest"
 }