Qortal/qortal-mobile
1
0
Fork 0
mirror of https://github.com/Qortal/qortal-mobile.git synced 2025-05-06 17:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix group embed decryption

Browse Source
This commit is contained in:
PhilReact 2024-12-01 21:09:21 +02:00
parent 417db3a39b
commit e22072db72
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/atoms/global.ts
View File

@ -130,3 +130,9 @@ export const blobKeySelector = selectorFamily({
return blobs[key] || null; // Return the value for the key or null if not found return blobs[key] || null; // Return the value for the key or null if not found
}, },
}); });
export const selectedGroupIdAtom = atom({
key: 'selectedGroupIdAtom',
default: null,
});

5
src/components/Embeds/AttachmentEmbed.tsx
View File

@ -41,7 +41,8 @@ export const AttachmentCard = ({
errorMsg, errorMsg,
encryptionType, encryptionType,
setInfoSnack, setInfoSnack,
setOpenSnack setOpenSnack,
selectedGroupId
}) => { }) => {
const [isOpen, setIsOpen] = useState(true); const [isOpen, setIsOpen] = useState(true);
@ -100,7 +101,7 @@ export const AttachmentCard = ({
{ {
data64: data, data64: data,
groupId: 683, groupId: selectedGroupId,
} }
); );

11
src/components/Embeds/Embed.tsx
View File

@ -8,8 +8,8 @@ import { extractComponents } from "../Chat/MessageDisplay";
import { executeEvent } from "../../utils/events"; import { executeEvent } from "../../utils/events";
import { base64ToBlobUrl } from "../../utils/fileReading"; import { base64ToBlobUrl } from "../../utils/fileReading";
import { useRecoilValue, useSetRecoilState } from "recoil"; import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
import { blobControllerAtom, blobKeySelector, resourceKeySelector } from "../../atoms/global"; import { blobControllerAtom, blobKeySelector, resourceKeySelector, selectedGroupIdAtom } from "../../atoms/global";
import { parseQortalLink } from "./embed-utils"; import { parseQortalLink } from "./embed-utils";
import { PollCard } from "./PollEmbed"; import { PollCard } from "./PollEmbed";
import { ImageCard } from "./ImageEmbed"; import { ImageCard } from "./ImageEmbed";
@ -59,6 +59,7 @@ export const Embed = ({ embedLink }) => {
const [imageUrl, setImageUrl] = useState(""); const [imageUrl, setImageUrl] = useState("");
const [parsedData, setParsedData] = useState(null); const [parsedData, setParsedData] = useState(null);
const setBlobs = useSetRecoilState(blobControllerAtom); const setBlobs = useSetRecoilState(blobControllerAtom);
const [selectedGroupId] = useRecoilState(selectedGroupIdAtom)
const resourceData = useMemo(()=> { const resourceData = useMemo(()=> {
const parsedDataOnTheFly = parseQortalLink(embedLink); const parsedDataOnTheFly = parseQortalLink(embedLink);
@ -153,7 +154,7 @@ export const Embed = ({ embedLink }) => {
{ {
data64: data, data64: data,
groupId: 683, groupId: selectedGroupId,
} }
); );
@ -163,7 +164,7 @@ export const Embed = ({ embedLink }) => {
} }
if (!decryptedData || decryptedData?.error) throw new Error("Could not decrypt data"); if (!decryptedData || decryptedData?.error) throw new Error("Could not decrypt data");
imageFinalUrl = base64ToBlobUrl(decryptedData) imageFinalUrl = base64ToBlobUrl(decryptedData, parsedData?.mimeType ? decodeURIComponent(parsedData?.mimeType) : undefined)
setBlobs((prev=> { setBlobs((prev=> {
return { return {
...prev, ...prev,
@ -357,6 +358,8 @@ export const Embed = ({ embedLink }) => {
isLoadingParent={isLoading} isLoadingParent={isLoading}
errorMsg={errorMsg} errorMsg={errorMsg}
encryptionType={encryptionType} encryptionType={encryptionType}
selectedGroupId={selectedGroupId}
/> />
)} )}
<CustomizedSnackbars <CustomizedSnackbars

5
src/components/Group/Group.tsx
View File

@ -94,6 +94,8 @@ import { AppsDesktop } from "../Apps/AppsDesktop";
import { formatEmailDate } from "./QMailMessages"; import { formatEmailDate } from "./QMailMessages";
import { useHandleMobileNativeBack } from "../../hooks/useHandleMobileNativeBack"; import { useHandleMobileNativeBack } from "../../hooks/useHandleMobileNativeBack";
import { AdminSpace } from "../Chat/AdminSpace"; import { AdminSpace } from "../Chat/AdminSpace";
import { useSetRecoilState } from "recoil";
import { selectedGroupIdAtom } from "../../atoms/global";
// let touchStartY = 0; // let touchStartY = 0;
// let disablePullToRefresh = false; // let disablePullToRefresh = false;
@ -473,6 +475,7 @@ export const Group = ({
const [appsMode, setAppsMode] = useState('home') const [appsMode, setAppsMode] = useState('home')
const [isOpenSideViewDirects, setIsOpenSideViewDirects] = useState(false) const [isOpenSideViewDirects, setIsOpenSideViewDirects] = useState(false)
const [isOpenSideViewGroups, setIsOpenSideViewGroups] = useState(false) const [isOpenSideViewGroups, setIsOpenSideViewGroups] = useState(false)
const setSelectedGroupId = useSetRecoilState(selectedGroupIdAtom)
const toggleSideViewDirects = ()=> { const toggleSideViewDirects = ()=> {
if(isOpenSideViewGroups){ if(isOpenSideViewGroups){
setIsOpenSideViewGroups(false) setIsOpenSideViewGroups(false)
@ -498,6 +501,8 @@ export const Group = ({
useEffect(() => { useEffect(() => {
selectedGroupRef.current = selectedGroup; selectedGroupRef.current = selectedGroup;
setSelectedGroupId(selectedGroup?.groupId)
}, [selectedGroup]); }, [selectedGroup]);
useEffect(() => { useEffect(() => {