chahinebrini 4492c7b265 feat(blocker): reactivation only re-arms the VPN/filter; a11y setup is first-time-only
The a11y (App-Lock) permission flow now runs only the first time the user turns
protection on. Reactivating after a cooldown / external disable just re-starts the
VPN/DNS filter — no a11y system prompt, no modal loop ("a11y can't be activated…").

- blocker.tsx handleActivateFamilyControls: no error modal when error === 'accessibility_pending'
  (we just opened the a11y settings — that's the feedback; tapping again re-opens, no loop).
- lib/protection.ts getCombinedState: "active" = urlFilter on (App-Lock is optional hardening,
  not a precondition); "recoveringFromBypass" now means urlFilter is OFF while the backend
  says it should be on (a real bypass), instead of "lock is off".
- blocker.tsx recoveringFromBypass alert: offers "turn back on" → activateUrlFilter (VPN),
  not activateFamilyControls.
- _layout.tsx bypass re-arm (enforceProtection fallback + onBypassNotificationTap):
  protection.activate() instead of activateFamilyControls().
- new i18n keys: blocker.protection_off_title / protection_off_message / reactivate_btn.

JS-only (hot-reloadable).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-11 18:46:21 +02:00

222 lines
7.2 KiB
TypeScript

import { useEffect, useRef, useState } from 'react';
import { View, ActivityIndicator, AppState, Platform } from 'react-native';
import { useRouter } from 'expo-router';
import * as Notifications from 'expo-notifications';
import { useTranslation } from 'react-i18next';
import { useAuthStore } from '../../stores/auth';
import { useNotificationStore } from '../../stores/notifications';
import { useColors } from '../../lib/theme';
import { NativeTabs } from '../../components/NativeTabs';
import { protection } from '../../lib/protection';
import { preloadTabIcons, getTabIcon } from '../../lib/tabIcons';
export default function AppLayout() {
const router = useRouter();
const { t } = useTranslation();
const { session, loading } = useAuthStore();
const colors = useColors();
const loadNotifications = useNotificationStore((s) => s.load);
const startRealtime = useNotificationStore((s) => s.startRealtime);
const stopRealtime = useNotificationStore((s) => s.stopRealtime);
const resetNotifications = useNotificationStore((s) => s.reset);
const rearmInFlightRef = useRef(false);
const bypassNotifiedRef = useRef(false);
// Android-Tab-Icons müssen async aus Ionicons-Font generiert werden (kein
// SF-Symbol-Support). preloadTabIcons() läuft schon beim Modul-Import — hier
// nur den ready-State tracken damit wir re-rendern wenn der Cache fertig ist.
const [tabIconsReady, setTabIconsReady] = useState(Platform.OS !== 'android');
useEffect(() => {
if (Platform.OS === 'android' && !tabIconsReady) {
preloadTabIcons().then(() => setTabIconsReady(true));
}
}, [tabIconsReady]);
useEffect(() => {
if (!loading && !session) {
router.replace('/signin');
}
}, [session, loading]);
useEffect(() => {
if (!session) {
resetNotifications();
return;
}
loadNotifications();
startRealtime();
return () => {
stopRealtime();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [session?.user?.id]);
useEffect(() => {
if (!session || Platform.OS !== 'ios') return;
let cancelled = false;
let pollTimer: ReturnType<typeof setInterval> | null = null;
async function notifyBypassDetected(): Promise<boolean> {
const perms = await Notifications.getPermissionsAsync();
let granted = perms.granted || perms.ios?.status === Notifications.IosAuthorizationStatus.PROVISIONAL;
if (!granted) {
const req = await Notifications.requestPermissionsAsync();
granted = req.granted || req.ios?.status === Notifications.IosAuthorizationStatus.PROVISIONAL;
}
if (!granted) return false;
await Notifications.scheduleNotificationAsync({
content: {
title: 'ReBreak Schutz manipuliert',
body: 'Tippe hier, um den Schutz sofort wieder zu aktivieren.',
sound: 'default',
data: { type: 'protection_bypass_detected' },
},
trigger: null,
});
return true;
}
async function enforceProtection() {
if (cancelled || rearmInFlightRef.current) return;
try {
const state = await protection.getCombinedState();
if (cancelled) return;
if (state.phase !== 'recoveringFromBypass') {
bypassNotifiedRef.current = false;
return;
}
if (bypassNotifiedRef.current) return;
bypassNotifiedRef.current = true;
const notified = await notifyBypassDetected();
if (!notified) {
// Fallback wenn Notifications nicht erlaubt sind. Reaktivierung setzt
// NUR den Filter/VPN wieder — kein a11y-Prompt (das passiert nur beim
// ersten Einrichten).
rearmInFlightRef.current = true;
router.replace('/blocker');
await protection.activate().catch(() => null);
}
} finally {
rearmInFlightRef.current = false;
}
}
async function onBypassNotificationTap() {
if (rearmInFlightRef.current) return;
rearmInFlightRef.current = true;
try {
router.replace('/blocker');
// Reaktivierung = nur Filter/VPN wieder setzen (a11y nur beim ersten Mal).
await protection.activate().catch(() => null);
} finally {
rearmInFlightRef.current = false;
}
}
// Initial check + foreground re-check + periodisches Polling als Fallback.
enforceProtection();
const notifTapSub = Notifications.addNotificationResponseReceivedListener((response) => {
const type = response.notification.request.content.data?.type;
if (type === 'protection_bypass_detected') {
void onBypassNotificationTap();
}
});
Notifications.getLastNotificationResponseAsync().then((response) => {
const type = response?.notification.request.content.data?.type;
if (type === 'protection_bypass_detected') {
void onBypassNotificationTap();
}
});
const appStateSub = AppState.addEventListener('change', (s) => {
if (s === 'active') {
enforceProtection();
}
});
pollTimer = setInterval(enforceProtection, 15000);
return () => {
cancelled = true;
notifTapSub.remove();
appStateSub.remove();
if (pollTimer) clearInterval(pollTimer);
};
}, [session, router]);
if (loading || !session) {
return (
<View style={{ flex: 1, backgroundColor: colors.bg, alignItems: 'center', justifyContent: 'center' }}>
<ActivityIndicator color={colors.brandOrange} size="large" />
</View>
);
}
return (
<NativeTabs
sidebarAdaptable
hapticFeedbackEnabled
tabBarActiveTintColor={colors.brandOrange}
tabBarInactiveTintColor="#d1d1d6"
scrollEdgeAppearance="default"
tabLabelStyle={{
fontFamily: 'Nunito_600SemiBold',
fontSize: 11,
}}
>
<NativeTabs.Screen
name="index"
options={{
title: t('tabs.home'),
tabBarIcon: () =>
Platform.OS === 'ios'
? { sfSymbol: 'house.fill' }
: (getTabIcon('home') as any),
}}
/>
<NativeTabs.Screen
name="chat"
options={{
title: t('tabs.chat'),
tabBarIcon: () =>
Platform.OS === 'ios'
? { sfSymbol: 'bubble.left.and.bubble.right.fill' }
: (getTabIcon('chat') as any),
}}
/>
<NativeTabs.Screen
name="coach"
options={{
title: t('tabs.coach'),
tabBarIcon: () =>
Platform.OS === 'ios'
? { sfSymbol: 'sparkles' }
: (getTabIcon('coach') as any),
}}
/>
<NativeTabs.Screen
name="blocker"
options={{
title: t('tabs.blocker'),
tabBarIcon: () =>
Platform.OS === 'ios'
? { sfSymbol: 'checkmark.shield.fill' }
: (getTabIcon('blocker') as any),
}}
/>
<NativeTabs.Screen
name="mail"
options={{
title: t('tabs.mail'),
tabBarIcon: () =>
Platform.OS === 'ios'
? { sfSymbol: 'envelope.fill' }
: (getTabIcon('mail') as any),
}}
/>
<NativeTabs.Screen name="notifications" options={{ href: null }} />
</NativeTabs>
);
}