Fix crash: View my recovery phrase with less than 24 words

MyEtherWallet · Feb 20, 2019 · 84096f0 · 84096f0
1 parent c2542f1
commit 84096f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Configurations/application.xcconfig b/Configurations/application.xcconfig
@@ -1,2 +1,2 @@
 APPLICATION_VERSION=1.0.9
-APPLICATION_BUILD=19021901
+APPLICATION_BUILD=19022002
diff --git a/...ionLayer/UserStories/BackupUserStory/Modules/BackupWords/View/BackupWordsViewController.m b/...ionLayer/UserStories/BackupUserStory/Modules/BackupWords/View/BackupWordsViewController.m
@@ -118,10 +118,12 @@ - (void) setupInitialStateWithWords:(NSArray<NSString *> *)words readOnly:(BOOL)
     self.descriptionLabel.attributedText = [[NSAttributedString alloc] initWithString:self.descriptionLabel.text attributes:attributes];
   }
   { //Words
-    NSArray *wordsPart1 = [words subarrayWithRange:NSMakeRange(0, 12)];
+    NSUInteger firstHalfCount = [words count] / 2 + [words count] % 2;
+    NSArray *wordsPart1 = [words subarrayWithRange:NSMakeRange(0, firstHalfCount)];
     [self _prepareWordsList:wordsPart1 inLabel:self.wordsPart1Label startIndex:1];
-    NSArray *wordsPart2 = [words subarrayWithRange:NSMakeRange(12, 12)];
-    [self _prepareWordsList:wordsPart2 inLabel:self.wordsPart2Label startIndex:13];
+    NSUInteger secondHalpCount = [words count] - firstHalfCount;
+    NSArray *wordsPart2 = [words subarrayWithRange:NSMakeRange(firstHalfCount, secondHalpCount)];
+    [self _prepareWordsList:wordsPart2 inLabel:self.wordsPart2Label startIndex:firstHalfCount + 1];
   }
   { //Beware label
     NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];