felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-06 16:07:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/4905_add_migration_progress_information' into 'develop'

Browse Source 
Feature/4905 add migration progress information

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!165
This commit is contained in:
Arnfried Griesert
2023-07-26 14:30:33 +00:00
parent 1f03bd22a6 dec65229ff
commit 4357b2ac0b
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Podfile
+1 -1
View File
@@ -43,7 +43,7 @@ when String # specific MatrixSDK released version
$matrixSDKVersionSpec = $matrixSDKVersion
end
$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v0.26.12_bwi_beta_2' }
$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v0.26.12_bwi_beta_4905' }
# Method to import the MatrixSDK
def import_MatrixSDK
Riot/Assets/de.lproj/Bwi.strings
+4
View File
@@ -629,3 +629,7 @@
// MARK: - Accessibility declaration
"bwi_accessibility_declaration_button_title" = "Barrierefreiheitserklärung";
// MARK: - Crypto Store migration
"bwi_launch_loading_crypto_store_migration_info" = "Die Ver-/Entschlüsselung von Nachrichten wird verbessert, dies kann ein paar Minuten dauern, bitte schließe die App nicht. Verbesserung läuft.";
Riot/Assets/en.lproj/Bwi.strings
+3
View File
@@ -539,3 +539,6 @@
// MARK: - Accessibility declaration
"bwi_accessibility_declaration_button_title" = "Accessibility declaration";
// MARK: - Crypto Store migration
"bwi_launch_loading_crypto_store_migration_info" = "Message encryption/decryption has been updated to improve app performance, this may take a few minutes. Please do not close the app during the update. The update is running.";
Riot/Modules/Application/LegacyAppDelegate.m
+14 -15
View File
@@ -2573,25 +2573,24 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
MXLogDebug(@"[AppDelegate] showLaunchAnimation");
/* bwi: 4782 removed by nv
// bwi: #4905 show loading animation
UIView *launchLoadingView;
if (MXSDKOptions.sharedInstance.enableStartupProgress)
if (BWIBuildSettings.shared.showBUMLottieAnimation)
{
if (BWIBuildSettings.shared.showBUMLottieAnimation)
{
launchLoadingView = [BUMLaunchLoadingViewController makeView];
} else {
MXSession *mainSession = self.mxSessions.firstObject;
launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
[(LaunchLoadingView *) launchLoadingView updateWithTheme:ThemeService.shared.theme];
}
launchLoadingView = [BUMLaunchLoadingViewController makeView];
launchLoadingView.frame = window.bounds;
launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
[window addSubview:launchLoadingView];
} else {
MXSession *mainSession = self.mxSessions.firstObject;
launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
[(LaunchLoadingView *) launchLoadingView updateWithTheme:ThemeService.shared.theme];
}
*/
launchLoadingView.frame = window.bounds;
launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
[window addSubview:launchLoadingView];
launchAnimationContainerView = launchLoadingView;
/* bwi: 4782 - new code from nv
MXSession *mainSession = self.mxSessions.firstObject;
Riot/Modules/LaunchLoading/LaunchLoadingView.swift
+5 -1
View File
@@ -86,7 +86,11 @@ extension LaunchLoadingView: MXSessionStartupProgressDelegate {
CATransaction.begin()
progressContainer.isHidden = false
progressView.progress = Float(state.progress)
statusLabel.text = state.showDelayWarning ? VectorL10n.launchLoadingDelayWarning : VectorL10n.launchLoadingGeneric
if state.stage == .storeMigration {
statusLabel.text = BWIL10n.bwiLaunchLoadingCryptoStoreMigrationInfo
} else {
statusLabel.text = state.showDelayWarning ? VectorL10n.launchLoadingDelayWarning : VectorL10n.launchLoadingGeneric
}
CATransaction.commit()
}
}