mirror of
https://github.com/streamyfin/streamyfin.git
synced 2025-08-20 18:37:18 +02:00
fix: update textContentType for username input to oneTimeCode (#587)
This commit is contained in:
@@ -3,7 +3,7 @@ import { Ionicons, Feather } from "@expo/vector-icons";
|
|||||||
import { Stack, useRouter } from "expo-router";
|
import { Stack, useRouter } from "expo-router";
|
||||||
import { Platform, TouchableOpacity, View } from "react-native";
|
import { Platform, TouchableOpacity, View } from "react-native";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
const Chromecast = !Platform.isTV ? require("@/components/Chromecast") : null;
|
const Chromecast = Platform.isTV ? null : require("@/components/Chromecast");
|
||||||
import { useAtom } from "jotai";
|
import { useAtom } from "jotai";
|
||||||
import { userAtom } from "@/providers/JellyfinProvider";
|
import { userAtom } from "@/providers/JellyfinProvider";
|
||||||
import { useSessions, useSessionsProps } from "@/hooks/useSessions";
|
import { useSessions, useSessionsProps } from "@/hooks/useSessions";
|
||||||
@@ -25,7 +25,7 @@ export default function IndexLayout() {
|
|||||||
headerLargeStyle: {
|
headerLargeStyle: {
|
||||||
backgroundColor: "black",
|
backgroundColor: "black",
|
||||||
},
|
},
|
||||||
headerTransparent: Platform.OS === "ios" ? true : false,
|
headerTransparent: Platform.OS === "ios",
|
||||||
headerShadowVisible: false,
|
headerShadowVisible: false,
|
||||||
headerRight: () => (
|
headerRight: () => (
|
||||||
<View className="flex flex-row items-center space-x-2">
|
<View className="flex flex-row items-center space-x-2">
|
||||||
@@ -113,7 +113,7 @@ export default function IndexLayout() {
|
|||||||
title: "",
|
title: "",
|
||||||
headerShown: true,
|
headerShown: true,
|
||||||
headerBlurEffect: "prominent",
|
headerBlurEffect: "prominent",
|
||||||
headerTransparent: Platform.OS === "ios" ? true : false,
|
headerTransparent: Platform.OS === "ios",
|
||||||
headerShadowVisible: false,
|
headerShadowVisible: false,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
@@ -137,7 +137,7 @@ const SettingsButton = () => {
|
|||||||
|
|
||||||
const SessionsButton = () => {
|
const SessionsButton = () => {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { sessions = [], _ } = useSessions({} as useSessionsProps);
|
const { sessions = [] } = useSessions({} as useSessionsProps);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
@@ -146,7 +146,7 @@ const SessionsButton = () => {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<View className="mr-4">
|
<View className="mr-4">
|
||||||
<Ionicons
|
<Ionicons
|
||||||
name="play-circle"
|
name="play-circle"
|
||||||
color={sessions.length === 0 ? "white" : "#9333ea"}
|
color={sessions.length === 0 ? "white" : "#9333ea"}
|
||||||
size={25}
|
size={25}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
|
|||||||
import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
|
import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
|
||||||
import { Image } from "expo-image";
|
import { Image } from "expo-image";
|
||||||
import { useLocalSearchParams, useNavigation } from "expo-router";
|
import { useLocalSearchParams, useNavigation } from "expo-router";
|
||||||
import { useAtom, useAtomValue } from "jotai";
|
import { useAtomValue } from "jotai";
|
||||||
import React, { useCallback, useEffect, useState } from "react";
|
import React, { useCallback, useEffect, useState } from "react";
|
||||||
import {
|
import {
|
||||||
Alert,
|
Alert,
|
||||||
@@ -58,7 +58,7 @@ const Login: React.FC = () => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
if (_apiUrl) {
|
if (_apiUrl) {
|
||||||
setServer({
|
await setServer({
|
||||||
address: _apiUrl,
|
address: _apiUrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -181,7 +181,7 @@ const Login: React.FC = () => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
setServer({ address: url });
|
await setServer({ address: url });
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleQuickConnect = async () => {
|
const handleQuickConnect = async () => {
|
||||||
@@ -237,11 +237,12 @@ const Login: React.FC = () => {
|
|||||||
setCredentials({ ...credentials, username: text })
|
setCredentials({ ...credentials, username: text })
|
||||||
}
|
}
|
||||||
value={credentials.username}
|
value={credentials.username}
|
||||||
secureTextEntry={false}
|
|
||||||
keyboardType="default"
|
keyboardType="default"
|
||||||
returnKeyType="done"
|
returnKeyType="done"
|
||||||
autoCapitalize="none"
|
autoCapitalize="none"
|
||||||
textContentType="username"
|
// Changed from username to oneTimeCode because it is a known issue in RN
|
||||||
|
// https://github.com/facebook/react-native/issues/47106#issuecomment-2521270037
|
||||||
|
textContentType="oneTimeCode"
|
||||||
clearButtonMode="while-editing"
|
clearButtonMode="while-editing"
|
||||||
maxLength={500}
|
maxLength={500}
|
||||||
/>
|
/>
|
||||||
@@ -324,17 +325,17 @@ const Login: React.FC = () => {
|
|||||||
{t("server.connect_button")}
|
{t("server.connect_button")}
|
||||||
</Button>
|
</Button>
|
||||||
<JellyfinServerDiscovery
|
<JellyfinServerDiscovery
|
||||||
onServerSelect={(server) => {
|
onServerSelect={async (server) => {
|
||||||
setServerURL(server.address);
|
setServerURL(server.address);
|
||||||
if (server.serverName) {
|
if (server.serverName) {
|
||||||
setServerName(server.serverName);
|
setServerName(server.serverName);
|
||||||
}
|
}
|
||||||
handleConnect(server.address);
|
await handleConnect(server.address);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<PreviousServersList
|
<PreviousServersList
|
||||||
onServerSelect={(s) => {
|
onServerSelect={async (s) => {
|
||||||
handleConnect(s.address);
|
await handleConnect(s.address);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
@@ -1,16 +1,17 @@
|
|||||||
|
|
||||||
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
|
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
|
||||||
import { useFavorite } from "@/hooks/useFavorite";
|
import { useFavorite } from "@/hooks/useFavorite";
|
||||||
import { View } from "react-native";
|
import {View, ViewProps} from "react-native";
|
||||||
import { RoundButton } from "@/components/RoundButton";
|
import { RoundButton } from "@/components/RoundButton";
|
||||||
|
import {FC} from "react";
|
||||||
|
|
||||||
interface Props extends ViewProps {
|
interface Props extends ViewProps {
|
||||||
item: BaseItemDto;
|
item: BaseItemDto;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const AddToFavorites = ({ item, ...props }) => {
|
export const AddToFavorites:FC<Props> = ({ item, ...props }) => {
|
||||||
const { isFavorite, toggleFavorite, _} = useFavorite(item);
|
const { isFavorite, toggleFavorite } = useFavorite(item);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View {...props}>
|
<View {...props}>
|
||||||
<RoundButton
|
<RoundButton
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
import { useImageColors } from "@/hooks/useImageColors";
|
|
||||||
import { apiAtom } from "@/providers/JellyfinProvider";
|
import { apiAtom } from "@/providers/JellyfinProvider";
|
||||||
import { getItemImage } from "@/utils/getItemImage";
|
import { getItemImage } from "@/utils/getItemImage";
|
||||||
import { Ionicons } from "@expo/vector-icons";
|
import { Ionicons } from "@expo/vector-icons";
|
||||||
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
|
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
|
||||||
import { Image, ImageProps, ImageSource } from "expo-image";
|
import { Image, ImageProps } from "expo-image";
|
||||||
import { useAtom } from "jotai";
|
import { useAtom } from "jotai";
|
||||||
import { useMemo } from "react";
|
import {FC, useMemo} from "react";
|
||||||
import { View } from "react-native";
|
import { View, ViewProps } from "react-native";
|
||||||
|
|
||||||
interface Props extends ImageProps {
|
interface Props extends ImageProps {
|
||||||
item: BaseItemDto;
|
item: BaseItemDto;
|
||||||
@@ -25,7 +24,7 @@ interface Props extends ImageProps {
|
|||||||
onError?: () => void;
|
onError?: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ItemImage: React.FC<Props> = ({
|
export const ItemImage: FC<Props> = ({
|
||||||
item,
|
item,
|
||||||
variant = "Primary",
|
variant = "Primary",
|
||||||
quality = 90,
|
quality = 90,
|
||||||
@@ -53,7 +52,7 @@ export const ItemImage: React.FC<Props> = ({
|
|||||||
if (!source?.uri)
|
if (!source?.uri)
|
||||||
return (
|
return (
|
||||||
<View
|
<View
|
||||||
{...props}
|
{...props as ViewProps}
|
||||||
className="flex flex-col items-center justify-center border border-neutral-800 bg-neutral-900"
|
className="flex flex-col items-center justify-center border border-neutral-800 bg-neutral-900"
|
||||||
>
|
>
|
||||||
<Ionicons
|
<Ionicons
|
||||||
|
|||||||
@@ -2,24 +2,24 @@ import React, { useEffect, useRef } from "react";
|
|||||||
import { View, StyleSheet, Platform } from "react-native";
|
import { View, StyleSheet, Platform } from "react-native";
|
||||||
import { useSharedValue } from "react-native-reanimated";
|
import { useSharedValue } from "react-native-reanimated";
|
||||||
import { Slider } from "react-native-awesome-slider";
|
import { Slider } from "react-native-awesome-slider";
|
||||||
// import { VolumeManager } from "react-native-volume-manager";
|
const VolumeManager = Platform.isTV ? null : require("react-native-volume-manager");
|
||||||
const VolumeManager = !Platform.isTV
|
|
||||||
? require("react-native-volume-manager")
|
|
||||||
: null;
|
|
||||||
import { Ionicons } from "@expo/vector-icons";
|
import { Ionicons } from "@expo/vector-icons";
|
||||||
|
import { VolumeResult } from "react-native-volume-manager";
|
||||||
|
|
||||||
interface AudioSliderProps {
|
interface AudioSliderProps {
|
||||||
setVisibility: (show: boolean) => void;
|
setVisibility: (show: boolean) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
|
const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
|
||||||
if (Platform.isTV) return;
|
if (Platform.isTV) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const volume = useSharedValue<number>(50); // Explicitly type as number
|
const volume = useSharedValue<number>(50); // Explicitly type as number
|
||||||
const min = useSharedValue<number>(0); // Explicitly type as number
|
const min = useSharedValue<number>(0); // Explicitly type as number
|
||||||
const max = useSharedValue<number>(100); // Explicitly type as number
|
const max = useSharedValue<number>(100); // Explicitly type as number
|
||||||
|
|
||||||
const timeoutRef = useRef<NodeJS.Timeout | null>(null); // Use a ref to store the timeout ID
|
const timeoutRef = useRef<number | null>(null); // Use a ref to store the timeout ID
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchInitialVolume = async () => {
|
const fetchInitialVolume = async () => {
|
||||||
@@ -50,7 +50,7 @@ const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const volumeListener = VolumeManager.addVolumeListener((result) => {
|
const volumeListener = VolumeManager.addVolumeListener((result: VolumeResult) => {
|
||||||
volume.value = result.volume * 100;
|
volume.value = result.volume * 100;
|
||||||
setVisibility(true);
|
setVisibility(true);
|
||||||
|
|
||||||
|
|||||||
@@ -7,16 +7,13 @@ import React, {
|
|||||||
useMemo,
|
useMemo,
|
||||||
useCallback,
|
useCallback,
|
||||||
} from "react";
|
} from "react";
|
||||||
import { Alert, AppState, AppStateStatus } from "react-native";
|
import { AppState, AppStateStatus } from "react-native";
|
||||||
import { useAtomValue } from "jotai";
|
import { useAtomValue } from "jotai";
|
||||||
import { useQuery } from "@tanstack/react-query";
|
|
||||||
import {
|
import {
|
||||||
apiAtom,
|
apiAtom,
|
||||||
getOrSetDeviceId,
|
getOrSetDeviceId,
|
||||||
userAtom,
|
|
||||||
} from "@/providers/JellyfinProvider";
|
} from "@/providers/JellyfinProvider";
|
||||||
import { getSessionApi } from "@jellyfin/sdk/lib/utils/api";
|
import { getSessionApi } from "@jellyfin/sdk/lib/utils/api";
|
||||||
import native from "@/utils/profiles/native";
|
|
||||||
|
|
||||||
interface WebSocketProviderProps {
|
interface WebSocketProviderProps {
|
||||||
children: ReactNode;
|
children: ReactNode;
|
||||||
@@ -30,7 +27,6 @@ interface WebSocketContextType {
|
|||||||
const WebSocketContext = createContext<WebSocketContextType | null>(null);
|
const WebSocketContext = createContext<WebSocketContextType | null>(null);
|
||||||
|
|
||||||
export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
|
export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
|
||||||
const user = useAtomValue(userAtom);
|
|
||||||
const api = useAtomValue(apiAtom);
|
const api = useAtomValue(apiAtom);
|
||||||
const [ws, setWs] = useState<WebSocket | null>(null);
|
const [ws, setWs] = useState<WebSocket | null>(null);
|
||||||
const [isConnected, setIsConnected] = useState(false);
|
const [isConnected, setIsConnected] = useState(false);
|
||||||
@@ -40,7 +36,9 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const connectWebSocket = useCallback(() => {
|
const connectWebSocket = useCallback(() => {
|
||||||
if (!deviceId || !api?.accessToken) return;
|
if (!deviceId || !api?.accessToken) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const protocol = api.basePath.includes("https") ? "wss" : "ws";
|
const protocol = api.basePath.includes("https") ? "wss" : "ws";
|
||||||
const url = `${protocol}://${api.basePath
|
const url = `${protocol}://${api.basePath
|
||||||
@@ -50,7 +48,7 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
|
|||||||
}&deviceId=${deviceId}`;
|
}&deviceId=${deviceId}`;
|
||||||
|
|
||||||
const newWebSocket = new WebSocket(url);
|
const newWebSocket = new WebSocket(url);
|
||||||
let keepAliveInterval: NodeJS.Timeout | null = null;
|
let keepAliveInterval: number | null = null;
|
||||||
|
|
||||||
newWebSocket.onopen = () => {
|
newWebSocket.onopen = () => {
|
||||||
setIsConnected(true);
|
setIsConnected(true);
|
||||||
@@ -67,14 +65,18 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
newWebSocket.onclose = () => {
|
newWebSocket.onclose = () => {
|
||||||
if (keepAliveInterval) clearInterval(keepAliveInterval);
|
if (keepAliveInterval) {
|
||||||
|
clearInterval(keepAliveInterval);
|
||||||
|
}
|
||||||
setIsConnected(false);
|
setIsConnected(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
setWs(newWebSocket);
|
setWs(newWebSocket);
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
if (keepAliveInterval) clearInterval(keepAliveInterval);
|
if (keepAliveInterval) {
|
||||||
|
clearInterval(keepAliveInterval);
|
||||||
|
}
|
||||||
newWebSocket.close();
|
newWebSocket.close();
|
||||||
};
|
};
|
||||||
}, [api, deviceId]);
|
}, [api, deviceId]);
|
||||||
@@ -85,7 +87,9 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
|
|||||||
}, [connectWebSocket]);
|
}, [connectWebSocket]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!deviceId || !api || !api?.accessToken) return;
|
if (!deviceId || !api || !api?.accessToken) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const init = async () => {
|
const init = async () => {
|
||||||
await getSessionApi(api).postFullCapabilities({
|
await getSessionApi(api).postFullCapabilities({
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
import { Settings } from "@/utils/atoms/settings";
|
import { Settings } from "@/utils/atoms/settings";
|
||||||
import ios from "@/utils/profiles/ios";
|
|
||||||
import native from "@/utils/profiles/native";
|
import native from "@/utils/profiles/native";
|
||||||
import old from "@/utils/profiles/old";
|
|
||||||
import { Api } from "@jellyfin/sdk";
|
import { Api } from "@jellyfin/sdk";
|
||||||
import { AxiosError, AxiosResponse } from "axios";
|
import { AxiosError, AxiosResponse } from "axios";
|
||||||
import { useMemo } from "react";
|
|
||||||
import { getAuthHeaders } from "../jellyfin";
|
import { getAuthHeaders } from "../jellyfin";
|
||||||
import iosFmp4 from "@/utils/profiles/iosFmp4";
|
|
||||||
|
|
||||||
interface PostCapabilitiesParams {
|
interface PostCapabilitiesParams {
|
||||||
api: Api | null | undefined;
|
api: Api | null | undefined;
|
||||||
@@ -25,7 +21,6 @@ export const postCapabilities = async ({
|
|||||||
api,
|
api,
|
||||||
itemId,
|
itemId,
|
||||||
sessionId,
|
sessionId,
|
||||||
deviceProfile,
|
|
||||||
}: PostCapabilitiesParams): Promise<AxiosResponse> => {
|
}: PostCapabilitiesParams): Promise<AxiosResponse> => {
|
||||||
if (!api || !itemId || !sessionId) {
|
if (!api || !itemId || !sessionId) {
|
||||||
throw new Error("Missing parameters for marking item as not played");
|
throw new Error("Missing parameters for marking item as not played");
|
||||||
|
|||||||
Reference in New Issue
Block a user