mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle error in loading screen (#1823)

Browse source 
* handle client boot error in loading screen

* use sync state hook in client root

* add loading screen options

* removed extra condition in loading finish

* add sync connection status bar
This commit is contained in:
Ajay Bura 2024-07-22 16:17:19 +05:30 • committed by GitHub
parent e046c59f7c
commit e2228a18c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
62 changed files with 609 additions and 510 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/util/matrixUtil.js
View file

@ -1,5 +1,3 @@
import initMatrix from '../client/initMatrix';
import HashIC from '../../public/res/ic/outlined/hash.svg';
import HashGlobeIC from '../../public/res/ic/outlined/hash-globe.svg';
import HashLockIC from '../../public/res/ic/outlined/hash-lock.svg';
@ -24,8 +22,7 @@ export async function getBaseUrl(servername) {
}
}
export function getUsername(userId) {
const mx = initMatrix.matrixClient;
export function getUsername(mx, userId) {
const user = mx.getUser(userId);
if (user === null) return userId;
let username = user.displayName;
@ -39,9 +36,9 @@ export function getUsernameOfRoomMember(roomMember) {
return roomMember.name || roomMember.userId;
}
export async function isRoomAliasAvailable(alias) {
export async function isRoomAliasAvailable(mx, alias) {
try {
const result = await initMatrix.matrixClient.getRoomIdForAlias(alias);
const result = await mx.getRoomIdForAlias(alias);
if (result.room_id) return false;
return false;
} catch (e) {
@ -159,9 +156,8 @@ export function genRoomVia(room) {
return via.concat(mostPop3.slice(0, 2));
}
export function isCrossVerified(deviceId) {
export function isCrossVerified(mx, deviceId) {
try {
const mx = initMatrix.matrixClient;
const crossSignInfo = mx.getStoredCrossSigningForUser(mx.getUserId());
const deviceInfo = mx.getStoredDevice(mx.getUserId(), deviceId);
const deviceTrust = crossSignInfo.checkDeviceTrust(crossSignInfo, deviceInfo, false, true);
@ -172,14 +168,12 @@ export function isCrossVerified(deviceId) {
}
}
export function hasCrossSigningAccountData() {
const mx = initMatrix.matrixClient;
export function hasCrossSigningAccountData(mx) {
const masterKeyData = mx.getAccountData('m.cross_signing.master');
return !!masterKeyData;
}
export function getDefaultSSKey() {
const mx = initMatrix.matrixClient;
export function getDefaultSSKey(mx) {
try {
return mx.getAccountData('m.secret_storage.default_key').getContent().key;
} catch {
@ -187,8 +181,7 @@ export function getDefaultSSKey() {
}
}
export function getSSKeyInfo(key) {
const mx = initMatrix.matrixClient;
export function getSSKeyInfo(mx, key) {
try {
return mx.getAccountData(`m.secret_storage.key.${key}`).getContent();
} catch {
@ -196,8 +189,7 @@ export function getSSKeyInfo(key) {
}
}
export async function hasDevices(userId) {
const mx = initMatrix.matrixClient;
export async function hasDevices(mx, userId) {
try {
const usersDeviceMap = await mx.downloadKeys([userId, mx.getUserId()]);
return Object.values(usersDeviceMap)