Qortal/qortal-mobile
1
0
Fork 0
mirror of https://github.com/Qortal/qortal-mobile.git synced 2025-03-28 16:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for threads

Browse Source
This commit is contained in:
PhilReact 2024-11-01 14:28:48 +02:00
parent 1c43396c75
commit 35652327aa
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/background-cases.ts
View File

@ -493,8 +493,8 @@ export async function cancelInvitationToGroupCase(request, event) {
export async function leaveGroupCase(request, event) { export async function leaveGroupCase(request, event) {
try { try {
const { groupId, qortalAddress } = request.payload; const { groupId } = request.payload;
const response = await leaveGroup({ groupId, qortalAddress }); const response = await leaveGroup({ groupId });
event.source.postMessage( event.source.postMessage(
{ {
@ -611,7 +611,8 @@ export async function banFromGroupCase(request, event) {
export async function addDataPublishesCase(request, event) { export async function addDataPublishesCase(request, event) {
try { try {
const { data, groupId, type } = request.payload; const { data, groupId, type } = request.payload;
const response = await addDataPublishes({ data, groupId, type }); const response = await addDataPublishes( data, groupId, type );
event.source.postMessage( event.source.postMessage(
{ {
@ -638,7 +639,8 @@ export async function addDataPublishesCase(request, event) {
export async function getDataPublishesCase(request, event) { export async function getDataPublishesCase(request, event) {
try { try {
const { groupId, type } = request.payload; const { groupId, type } = request.payload;
const response = await getDataPublishes({ groupId, type }); const response = await getDataPublishes(groupId, type );
event.source.postMessage( event.source.postMessage(
{ {
@ -1028,6 +1030,7 @@ export async function addGroupNotificationTimestampCase(request, event) {
const response = await addTimestampGroupAnnouncement({ const response = await addTimestampGroupAnnouncement({
groupId, groupId,
timestamp, timestamp,
seenTimestamp: true
}); });
event.source.postMessage( event.source.postMessage(
@ -1546,7 +1549,7 @@ export async function publishGroupEncryptedResourceCase(request, event) {
export async function decryptSingleForPublishesCase(request, event) { export async function decryptSingleForPublishesCase(request, event) {
try { try {
const { data, secretKeyObject, skipDecodeBase64} = request.payload; const { data, secretKeyObject, skipDecodeBase64} = request.payload;
const response = await decryptSingleForPublishes({ data, secretKeyObject, skipDecodeBase64 }); const response = await decryptSingleForPublishes({ messages: data, secretKeyObject, skipDecodeBase64 });
event.source.postMessage( event.source.postMessage(
{ {

38
src/utils/chromeStorage.ts
View File

@ -95,33 +95,39 @@ export const storeData = async (key: string, payload: any): Promise<string> => {
}; };
export const getData = async <T = any>(key: string): Promise<T> => { export const getData = async <T = any>(key: string): Promise<T | null> => {
await initializeKeyAndIV(); await initializeKeyAndIV();
const storedDataBase64 = await SecureStoragePlugin.get({ key }); try {
if (storedDataBase64.value) { const storedDataBase64 = await SecureStoragePlugin.get({ key });
if (keysToEncrypt.includes(key) && inMemoryKey) {
// Decode the Base64-encoded encrypted data
const combinedData = atob(storedDataBase64.value)
.split("")
.map((c) => c.charCodeAt(0));
const iv = new Uint8Array(combinedData.slice(0, 12)); // First 12 bytes are the IV if (storedDataBase64.value) {
const encryptedData = new Uint8Array(combinedData.slice(12)).buffer; if (keysToEncrypt.includes(key) && inMemoryKey) {
// Decode the Base64-encoded encrypted data
const combinedData = atob(storedDataBase64.value)
.split("")
.map((c) => c.charCodeAt(0));
const decryptedBase64Data = await decryptData(encryptedData, inMemoryKey, iv); const iv = new Uint8Array(combinedData.slice(0, 12)); // First 12 bytes are the IV
return base64ToJson(decryptedBase64Data); const encryptedData = new Uint8Array(combinedData.slice(12)).buffer;
const decryptedBase64Data = await decryptData(encryptedData, inMemoryKey, iv);
return base64ToJson(decryptedBase64Data);
} else {
// Decode non-encrypted data
return base64ToJson(storedDataBase64.value);
}
} else { } else {
// Decode non-encrypted data return null;
return base64ToJson(storedDataBase64.value);
} }
} else { } catch (error) {
throw new Error(`No data found for key: ${key}`); return null
} }
}; };
// Remove keys from storage and log out // Remove keys from storage and log out
export async function removeKeysAndLogout(keys: string[], event: MessageEvent, request: any) { export async function removeKeysAndLogout(keys: string[], event: MessageEvent, request: any) {
try { try {