fixed android bug not connecting to local dev SQL

fixed notfication bug on android
changing notfication radius to 100
fixing internal files for running local dev
- latest changes pushing to azure production build

Author: Yuval

01-Database/GroundShareDB.sql

@@ -1271,17 +1271,51 @@ BEGIN
 END
 GO
 
--- Fetch every device token belonging to any user subscribed to the given location.
+-- Fetch every device token belonging to any user subscribed to a location
+-- within @RadiusMeters of the given location's coordinates (Haversine).
 CREATE OR ALTER PROCEDURE sp_GetTokensForLocation
-    @Location_ID INT
+    @Location_ID   INT,
+    @RadiusMeters  INT = 100
 AS
 BEGIN
     SET NOCOUNT ON;
-    SELECT dt.Token, dt.Platform, dt.User_ID
+
+    DECLARE @Lat  FLOAT, @Lng FLOAT;
+    SELECT @Lat = Latitude, @Lng = Longitude
+    FROM   location
+    WHERE  Location_ID = @Location_ID;
+
+    -- Fall back to exact-match when the event location has no coordinates.
+    IF @Lat IS NULL OR @Lng IS NULL
+    BEGIN
+        SELECT dt.Token, dt.Platform, dt.User_ID
+        FROM   device_token dt
+        INNER JOIN notification_subscription ns ON ns.User_ID = dt.User_ID
+        WHERE  ns.Location_ID = @Location_ID;
+        RETURN;
+    END
+
+    -- Haversine argument clamped to [-1, 1] to avoid ACOS domain errors
+    -- when two points are identical (floating-point can yield 1.0000000001).
+    SELECT DISTINCT dt.Token, dt.Platform, dt.User_ID
     FROM   device_token dt
-    INNER JOIN notification_subscription ns
-        ON ns.User_ID = dt.User_ID
-    WHERE  ns.Location_ID = @Location_ID;
+    INNER JOIN notification_subscription ns ON ns.User_ID = dt.User_ID
+    INNER JOIN location l                   ON l.Location_ID = ns.Location_ID
+    WHERE  l.Latitude  IS NOT NULL
+      AND  l.Longitude IS NOT NULL
+      AND  6371000 * ACOS(
+               CASE
+                   WHEN (COS(RADIANS(@Lat)) * COS(RADIANS(l.Latitude)) *
+                         COS(RADIANS(l.Longitude) - RADIANS(@Lng)) +
+                         SIN(RADIANS(@Lat)) * SIN(RADIANS(l.Latitude))) >  1 THEN  1
+                   WHEN (COS(RADIANS(@Lat)) * COS(RADIANS(l.Latitude)) *
+                         COS(RADIANS(l.Longitude) - RADIANS(@Lng)) +
+                         SIN(RADIANS(@Lat)) * SIN(RADIANS(l.Latitude))) < -1 THEN -1
+                   ELSE (COS(RADIANS(@Lat)) * COS(RADIANS(l.Latitude)) *
+                         COS(RADIANS(l.Longitude) - RADIANS(@Lng)) +
+                         SIN(RADIANS(@Lat)) * SIN(RADIANS(l.Latitude)))
+               END
+           ) <= @RadiusMeters;
 END
 GO
 

02-Server/Properties/launchSettings.json

@@ -14,7 +14,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5227",
+      "applicationUrl": "http://0.0.0.0:5227",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -24,7 +24,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7072;http://localhost:5227",
+      "applicationUrl": "https://0.0.0.0:7072;http://0.0.0.0:5227",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

02-Server/appsettings.json

@@ -28,12 +28,13 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "localhost",
+  "AllowedHosts": "*",
   "Cors": {
     "AllowedOrigins": [
       "http://localhost:5173",
       "http://localhost:4173",
       "https://localhost:5173",
+      "https://localhost",
       "https://app-groundshare-web-ekfneqfaahaca8ek.israelcentral-01.azurewebsites.net"
     ]
   }

03-Client/.env.example

@@ -20,6 +20,13 @@
 # Local dev (matches 02-Server Kestrel default):
 VITE_API_BASE_URL=http://localhost:5227/api
 #
+# Android device/emulator testing against your local backend:
+#   1. Find your machine's LAN IP (ipconfig → IPv4 Address, e.g. 192.168.1.50)
+#   2. Set VITE_API_BASE_URL to that IP in .env.local:
+#        VITE_API_BASE_URL=http://192.168.1.50:5227/api
+#   3. Run Vite and point Capacitor at it (no build needed):
+#        $env:CAPACITOR_DEV_SERVER_URL="http://192.168.1.50:5173"; npx cap run android
+#
 # Production (set during Phase 7 Azure deploy):
 # VITE_API_BASE_URL=https://app-groundshare-api.azurewebsites.net/api
 

03-Client/android/app/build.gradle.kts

@@ -60,4 +60,3 @@ try {
     logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
 }
 
-apply plugin: 'com.google.gms.google-services'

03-Client/android/app/capacitor.build.gradle

@@ -13,6 +13,7 @@ dependencies {
     implementation project(':capacitor-camera')
     implementation project(':capacitor-filesystem')
     implementation project(':capacitor-geolocation')
+    implementation project(':capacitor-push-notifications')
     implementation project(':capacitor-splash-screen')
     implementation project(':capacitor-status-bar')
     implementation project(':capgo-capacitor-social-login')

03-Client/android/capacitor.settings.gradle

@@ -14,6 +14,9 @@ project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacit
 include ':capacitor-geolocation'
 project(':capacitor-geolocation').projectDir = new File('../node_modules/@capacitor/geolocation/android')
 
+include ':capacitor-push-notifications'
+project(':capacitor-push-notifications').projectDir = new File('../node_modules/@capacitor/push-notifications/android')
+
 include ':capacitor-splash-screen'
 project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capacitor/splash-screen/android')
 

03-Client/capacitor.config.ts

@@ -1,19 +1,28 @@
 import type { CapacitorConfig } from '@capacitor/cli';
 
+// Default config: bundled dist/ loads from https://localhost (Capacitor's
+// Android scheme). API calls go to VITE_API_BASE_URL baked into the bundle
+// at build time — set it in .env.local for dev, .env.production for release.
+//
+// For live-reload against the Vite dev server, use the official tooling:
+//   npx cap run android --livereload --external
+// That flag injects the Capacitor bridge scripts correctly, unlike a raw
+// server.url override.
 const config: CapacitorConfig = {
   appId: 'com.groundshare.app',
   appName: 'GroundShare',
   webDir: 'dist',
   android: {
-    // Default in Capacitor 7+. Explicit here so the origin
-    // required by the server CORS allowlist is visible in the repo.
-    // WebView origin on Android: https://localhost
-    allowMixedContent: false,
+    // Needed so the WebView can hit http:// LAN backends during local dev.
+    // Safe: release builds should use https:// for VITE_API_BASE_URL anyway.
+    allowMixedContent: true,
   },
   server: {
-    // Default in Capacitor 7+. iOS origin: capacitor://localhost.
     androidScheme: 'https',
     iosScheme: 'capacitor',
+    // Needed alongside allowMixedContent for Android to permit cleartext
+    // HTTP requests to the LAN dev backend.
+    cleartext: true,
   },
 };
 

03-Client/index.html

@@ -5,6 +5,7 @@
       <meta charset="UTF-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
       <meta name="theme-color" content="#063c55" />
+      <meta name="mobile-web-app-capable" content="yes" />
       <meta name="apple-mobile-web-app-capable" content="yes" />
       <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
       <link rel="icon" href="/favicon.ico" />

03-Client/src/app/context/AuthContext.tsx

@@ -83,7 +83,11 @@ export function AuthProvider({ children }: { children: ReactNode }) {
       return;
     }
 
-    api.getMyProfile()
+    const timeout = new Promise<never>((_, reject) =>
+      setTimeout(() => reject(new Error("timeout")), 10_000)
+    );
+
+    Promise.race([api.getMyProfile(), timeout])
       .then((data) => {
         setUser(data as UserData);
         void registerForPush();