New Intro string

iOSClient/Brand/Intro/CCIntro.m

@@ -202,19 +202,21 @@
     
     EAIntroPage *page1 = [EAIntroPage page];
     
-    page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro1"]];
-    page1.title = NSLocalizedStringFromTable(@"_intro_1_title_", @"Intro", nil);
-    page1.desc = NSLocalizedStringFromTable(@"_intro_1_text_",  @"Intro", nil);
-    
+    page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"IntroNoCryptoCloud"]];
+    page1.bgImage = [UIImage imageNamed:@"bgbianco"];
+    page1.showTitleView = NO;
+
     page1.titlePositionY = titlePositionY;
     page1.titleColor = [UIColor blackColor];
     page1.titleFont = [UIFont systemFontOfSize:20];
+    page1.title = NSLocalizedStringFromTable(@"_introNoCryptoCloud_1_title_", @"Intro", nil);
+
     page1.descPositionY = descPositionY;
     page1.descColor = [UIColor blackColor];
     page1.descFont = [UIFont systemFontOfSize:14];
-    page1.bgImage = [UIImage imageNamed:@"bgbianco"];
+    page1.desc = NSLocalizedStringFromTable(@"_introNoCryptoCloud_1_text_",  @"Intro", nil);
+
     page1.titleIconPositionY = titleIconPositionY;
-    page1.showTitleView = NO;
     
     EAIntroView *intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds];
     
@@ -228,7 +230,7 @@
     
     [intro setDelegate:self];
     [intro setPages:@[page1]];
-    [intro showInView:self.rootView animateDuration:0];
+    [intro showInView:self.rootView animateDuration:0.3];
 }
 
 @end

iOSClient/Brand/Intro/ImagesIntro.xcassets/IntroNoCryptoCloud.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "IntroNoCryptoCloud.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IntroNoCryptoCloud@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IntroNoCryptoCloud@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iOSClient/Main/CCSplit.m

@@ -104,7 +104,7 @@
         [CCUtility setIntroMessage:k_Intro view:YES];
         [CCUtility setIntroMessage:k_Intro_no_cryptocloud view:YES];
     
-        [self performSelector:@selector(newAccount) withObject:nil afterDelay:0.1];
+        [self introWillFinish:nil type:nil wasSkipped:NO];
 
     } else {
     
@@ -126,7 +126,7 @@
         // NO INTRO
         else {
             
-            [self performSelector:@selector(newAccount) withObject:nil afterDelay:0.1];
+            [self introWillFinish:nil type:nil wasSkipped:NO];
         }
     }
 }
@@ -135,17 +135,23 @@
 {
     // -1-
     if ([type isEqualToString:k_Intro]) {
+        
         [CCUtility setIntroMessage:k_Intro view:YES];
         // next
         _intro = [[CCIntro alloc] initWithDelegate:self delegateView:self.view type:k_Intro_no_cryptocloud];
         [_intro show];
+        //
+        return;
     }
     
     // -2-
-    else if ([type isEqualToString:k_Intro_no_cryptocloud]) {
+    if ([type isEqualToString:k_Intro_no_cryptocloud]) {
+        
         [CCUtility setIntroMessage:k_Intro_no_cryptocloud view:YES];
-        [self performSelector:@selector(newAccount) withObject:nil afterDelay:0.1];
     }
+    
+    // check account
+    [self performSelector:@selector(newAccount) withObject:nil afterDelay:0.1];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Supporting Files/en.lproj/Intro.strings

@@ -19,3 +19,6 @@
 
 "_intro_3_title_"   = "Start";
 "_intro_3_text_"    = "Good, your Nextcloud is ready for use. Further information, news and contact-information to be found on https://nextcloud.com";
+
+"_introNoCryptoCloud_1_title_" = "Crypto Cloud";
+"_introNoCryptoCloud_1_text_"  = "Crypto Cloud encryption protocol is no longer available, you can still decrypt your files by downloading the free app from AppStore\n\n'CryptoCloud for Nextcloud'\n\nSoon there will be a new EndToEnd protocol available on all Nextcloud clients\n\n\nTap to Start";