qd

keystone-app/app.json

@@ -16,10 +16,14 @@
           "photosPermission": "Allow KeyStone to access your photos and videos to back them up to your private cloud.",
           "savePhotosPermission": "Allow KeyStone to save photos.",
           "isAccessMediaLocationEnabled": true,
-          "granularPermissions": ["photo", "video"]
+          "granularPermissions": [
+            "photo",
+            "video"
+          ]
         }
       ],
-      "expo-router"
+      "expo-router",
+      "expo-font"
     ],
     "extra": {
       "eas": {

keystone-app/app/(tabs)/index.tsx

@@ -19,7 +19,7 @@ import { Image } from 'expo-image';
 import * as FileSystem from 'expo-file-system/legacy';
 import { Video, ResizeMode } from 'expo-av';
 import * as Sharing from 'expo-sharing';
-import NetInfo, { NetInfoState } from '@react-native-community/netinfo';
+import * as Network from 'expo-network';
 import { StatusBar } from 'expo-status-bar';
 import { MaterialIcons } from '@expo/vector-icons';
 import { format, isToday, isYesterday } from 'date-fns';
@@ -70,7 +70,7 @@ export default function PhotosScreen() {
   const [syncProgress, setSyncProgress] = useState(0);
   const [syncTotal, setSyncTotal] = useState(0);
   const [syncStatus, setSyncStatus] = useState<'idle' | 'syncing' | 'done'>('idle');
-  const [netInfo, setNetInfo] = useState<NetInfoState | null>(null);
+  const [netInfo, setNetInfo] = useState<Network.NetworkState | null>(null);
   const [allowCellular, setAllowCellular] = useState(false);
   const [itemsToBackup, setItemsToBackup] = useState(0);
 
@@ -80,10 +80,13 @@ export default function PhotosScreen() {
   // ── Network & Settings Listeners ──────────────────────────────
   useEffect(() => {
     // Listen to network changes
-    const unsubscribeNet = NetInfo.addEventListener(state => {
+    const subscriptionNet = Network.addNetworkStateListener(state => {
       setNetInfo(state);
     });
 
+    // Also get initial state
+    Network.getNetworkStateAsync().then(setNetInfo).catch(() => {});
+
     // Load cellular setting
     const loadSetting = async () => {
       try {
@@ -101,7 +104,7 @@ export default function PhotosScreen() {
     });
 
     return () => {
-      unsubscribeNet();
+      subscriptionNet.remove();
       subscription.remove();
     };
   }, []);
@@ -193,7 +196,7 @@ export default function PhotosScreen() {
       return;
     }
     
-    if (netInfo?.type === 'cellular' && !allowCellular) {
+    if (netInfo?.type === Network.NetworkStateType.CELLULAR && !allowCellular) {
       Alert.alert('Waiting for Wi-Fi', 'Syncing on mobile data is disabled in Settings.');
       return;
     }
@@ -221,12 +224,12 @@ export default function PhotosScreen() {
       try {
         const info = await MediaLibrary.getAssetInfoAsync(asset);
         const localUri = info.localUri || asset.uri;
-        const resp = await FileSystem.uploadAsync(`${BACKEND_URL}/upload`, localUri, {
+        const resp = await FileSystem.uploadAsync(`${BACKEND_URL}/upload?token=${MOCK_TOKEN}`, localUri, {
           fieldName: 'file',
           httpMethod: 'POST',
           uploadType: FileSystem.FileSystemUploadType.MULTIPART,
           parameters: { creation_time: asset.creationTime.toString() },
-          headers: { Authorization: `Bearer ${MOCK_TOKEN}` },
+          headers: { authorization: `Bearer ${MOCK_TOKEN}` },
         });
         if (resp.status === 200) {
           synced = await addSyncedId(asset.id, synced);
@@ -318,7 +321,7 @@ export default function PhotosScreen() {
       return { text: 'Offline', icon: 'cloud-off', color: '#d93025', spinning: false };
     }
     
-    if (netInfo.type === 'cellular' && !allowCellular && itemsToBackup > 0) {
+    if (netInfo.type === Network.NetworkStateType.CELLULAR && !allowCellular && itemsToBackup > 0) {
       return { text: 'Waiting for Wi-Fi', icon: 'cloud-sync', color: '#f29900', spinning: false };
     }
 
@@ -447,7 +450,7 @@ export default function PhotosScreen() {
             <TouchableOpacity 
               style={styles.syncIconContainer} 
               onPress={syncAssets} 
-              disabled={isSyncing || (!netInfo?.isConnected) || (netInfo?.type === 'cellular' && !allowCellular) || itemsToBackup === 0}
+              disabled={isSyncing || (!netInfo?.isConnected) || (netInfo?.type === Network.NetworkStateType.CELLULAR && !allowCellular) || itemsToBackup === 0}
             >
               {statusUI.spinning ? (
                 <ActivityIndicator size="small" color={statusUI.color} />

keystone-app/package-lock.json

@@ -9,14 +9,14 @@
       "version": "1.0.0",
       "dependencies": {
         "@expo/metro-runtime": "~6.1.2",
-        "@expo/vector-icons": "^15.1.1",
+        "@expo/vector-icons": "^15.0.3",
         "@react-native-async-storage/async-storage": "2.2.0",
-        "@react-native-community/netinfo": "11.4.1",
         "date-fns": "^4.4.0",
         "expo": "^54.0.36",
         "expo-av": "~16.0.8",
         "expo-dev-client": "~6.0.21",
         "expo-file-system": "~19.0.23",
+        "expo-font": "~14.0.12",
         "expo-image": "~3.0.11",
         "expo-linear-gradient": "~15.0.8",
         "expo-media-library": "~18.2.1",
@@ -2762,15 +2762,6 @@
         "react-native": "^0.0.0-0 || >=0.65 <1.0"
       }
     },
-    "node_modules/@react-native-community/netinfo": {
-      "version": "11.4.1",
-      "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.4.1.tgz",
-      "integrity": "sha512-B0BYAkghz3Q2V09BF88RA601XursIEA111tnc2JOaN7axJWmNefmfjZqw/KdSxKZp7CZUuPpjBmz/WCR9uaHYg==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react-native": ">=0.59"
-      }
-    },
     "node_modules/@react-native/assets-registry": {
       "version": "0.81.5",
       "license": "MIT",
@@ -4587,11 +4578,10 @@
       }
     },
     "node_modules/expo-font": {
-      "version": "57.0.1",
-      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-57.0.1.tgz",
-      "integrity": "sha512-QyS9L1Kh9sKJg4gfU6rdbpxpmH+DyzBX8z6jVvXMUDoqLr1GqmkO/Wu379KCXjL///kWbhpNlbi7AgBuj4VdIQ==",
+      "version": "14.0.12",
+      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-14.0.12.tgz",
+      "integrity": "sha512-QQzunE2Mxk45AsCWm3tK7OpVljbtVnKD58q4/qliev+cbye1IOduUnRIdD+P7DyButw17G9MTX795kgaQiz5hQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fontfaceobserver": "^2.1.0"
       },
@@ -5358,18 +5348,6 @@
         "react-native": "*"
       }
     },
-    "node_modules/expo/node_modules/expo-font": {
-      "version": "14.0.12",
-      "license": "MIT",
-      "dependencies": {
-        "fontfaceobserver": "^2.1.0"
-      },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*",
-        "react-native": "*"
-      }
-    },
     "node_modules/expo/node_modules/expo-keep-awake": {
       "version": "15.0.8",
       "license": "MIT",

keystone-app/package.json

@@ -4,14 +4,14 @@
   "main": "expo-router/entry",
   "dependencies": {
     "@expo/metro-runtime": "~6.1.2",
-    "@expo/vector-icons": "^15.1.1",
+    "@expo/vector-icons": "^15.0.3",
     "@react-native-async-storage/async-storage": "2.2.0",
-    "@react-native-community/netinfo": "11.4.1",
     "date-fns": "^4.4.0",
     "expo": "^54.0.36",
     "expo-av": "~16.0.8",
     "expo-dev-client": "~6.0.21",
     "expo-file-system": "~19.0.23",
+    "expo-font": "~14.0.12",
     "expo-image": "~3.0.11",
     "expo-linear-gradient": "~15.0.8",
     "expo-media-library": "~18.2.1",

keystone-backend/main.py

@@ -1,6 +1,6 @@
 import os
 from datetime import datetime
-from fastapi import FastAPI, HTTPException, Header, Depends, UploadFile, File, Form
+from fastapi import FastAPI, HTTPException, Header, Depends, UploadFile, File, Form, Request
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
 from dotenv import load_dotenv
@@ -59,11 +59,15 @@ class LoginPayload(BaseModel):
     username: str
     password: str
 
-def verify_mock_token(authorization: str = Header(None)):
-    if not authorization or not authorization.startswith("Bearer "):
-        raise HTTPException(status_code=401, detail="Missing or invalid token format")
-    
-    token = authorization.split(" ")[1]
+def verify_mock_token(request: Request, authorization: str = Header(None)):
+    token = None
+    if authorization and authorization.startswith("Bearer "):
+        token = authorization.split(" ")[1]
+        
+    # Fallback to query parameter (useful if proxy strips Authorization header)
+    if not token:
+        token = request.query_params.get("token")
+        
     if token != MOCK_TOKEN:
         raise HTTPException(status_code=401, detail="Unauthorized: Invalid Token")
     return token