Permalink
Browse files

Add OTRResources.bundle

  • Loading branch information...
1 parent 9a27f2b commit 95c83f0d1008bb4eeca00b7f4ad2dcc1cfcaaa5f @chrisballinger chrisballinger committed Sep 18, 2015
Showing with 532 additions and 118 deletions.
  1. +2 −1 .gitignore
  2. +3 −0 .gitmodules
  3. +1 −1 .travis.yml
  4. +164 −23 ChatSecure.xcodeproj/project.pbxproj
  5. +11 −4 ChatSecure.xcworkspace/xcshareddata/ChatSecure.xcscmblueprint
  6. +10 −13 ChatSecure/Classes/Categories/NSURL+ChatSecure.m
  7. +2 −2 ChatSecure/Classes/Controllers/OTRLanguageManager.m
  8. +1 −1 ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.m
  9. +1 −1 ChatSecure/Classes/Model/OTRQRCodeActivity.m
  10. +4 −4 ChatSecure/Classes/Model/Yap Storage/Accounts/OTRGoogleOAuthXMPPAccount.m
  11. +2 −2 ChatSecure/Classes/Model/Yap Storage/Accounts/OTRXMPPAccount.m
  12. +1 −1 ChatSecure/Classes/Model/Yap Storage/Accounts/OTRXMPPTorAccount.m
  13. +3 −2 ChatSecure/Classes/OTRAppDelegate.m
  14. +1 −1 ChatSecure/Classes/Utilities/OTRChatDemo.m
  15. +2 −2 ChatSecure/Classes/Utilities/OTRImages.m
  16. +0 −13 ChatSecure/Classes/Utilities/OTRSecrets-Template.m
  17. +7 −3 ChatSecure/Classes/Utilities/OTRSecrets.h
  18. +40 −0 ChatSecure/Classes/Utilities/OTRSecrets.m
  19. +2 −2 ChatSecure/Classes/View Controllers/Login View Controllers/OTRBaseLoginViewController.m
  20. +3 −3 ChatSecure/Classes/View Controllers/Login View Controllers/OTRExistingAccountViewController.m
  21. +1 −1 ChatSecure/Classes/View Controllers/OTRAboutViewController.m
  22. +3 −3 ChatSecure/Classes/View Controllers/OTRConversationViewController.m
  23. +1 −1 ChatSecure/Classes/View Controllers/OTRInviteViewController.m
  24. +3 −3 ChatSecure/Classes/View Controllers/OTRSettingsViewController.m
  25. +2 −2 ChatSecure/Classes/View Controllers/Onboarding/Onboarding.storyboard
  26. +1 −1 ChatSecure/Classes/Views/Cells/OTRBuddyImageCell.m
  27. +1 −1 ChatSecure/Classes/Views/Cells/OTRSettingTableViewCell.m
  28. +1 −1 ChatSecure/Classes/Views/Cells/OTRUsernameCell.swift
  29. +7 −3 ChatSecure/Classes/Views/Cells/XMPPServerInfoCell.m
  30. +16 −5 ChatSecure/Classes/Views/Cells/XMPPServerInfoCell.xib
  31. +6 −6 ChatSecure/Classes/Views/OTRLockButton.m
  32. +4 −0 OTRAssets/OTRAssets.h
  33. +10 −0 OTRAssets/OTRAssets.m
  34. +40 −4 OTRAssets/OTRBranding.h
  35. +98 −4 OTRAssets/OTRBranding.m
  36. +30 −0 OTRResources/Branding.plist
  37. +28 −0 OTRResources/Info.plist
  38. +12 −0 OTRResources/Secrets-template.plist
  39. +2 −1 Podfile
  40. +3 −1 Podfile.lock
  41. +2 −2 README.md
  42. +1 −0 Submodules/XLForm
View
@@ -6,8 +6,9 @@ project.xcworkspace
xcuserdata
.svn
DerivedData
-OTRSecrets.m
*.orig
*.xccheckout
/Pods/
+
+Secrets.plist
View
@@ -25,3 +25,6 @@
[submodule "Submodules/ParkedTextField"]
path = Submodules/ParkedTextField
url = git@github.com:chrisballinger/ParkedTextField.git
+[submodule "Submodules/XLForm"]
+ path = Submodules/XLForm
+ url = git@github.com:chrisballinger/XLForm.git
View
@@ -13,7 +13,7 @@ before_install:
- git submodule update --init --recursive
install:
- - cp ChatSecure/Classes/Utilities/OTRSecrets-Template.m ChatSecure/Classes/Utilities/OTRSecrets.m
+ - cp OTRResources/Secrets-template.plist OTRResources/Secrets.plist
- cp configurations/OTR_Codesigning.xcconfig.sample configurations/OTR_Codesigning.xcconfig
- export ARCHS="i386" # Only build CPAProxy dependencies for i386 to speed things up
- bash ./Submodules/CPAProxy/scripts/build-all.sh
Oops, something went wrong.
@@ -11,13 +11,14 @@
"B775552D1BBEEADC6A0BBB2FD048B6AA26CB309D" : 0,
"DAAB2C887EFA8AB12BAB622BBAFD20531F9A3784" : 0,
"E2E339EC05FF99AF5ECAE62EDBC78398DA1111C6" : 0,
+ "8D256B418BF7466F1E7306EA36B44A4A04C31B48" : 0,
"6629762BA356A4C56436558F8BA2A9102478B1C6" : 0,
"425D736B25093B4D45BF64638604863B9D31F2C1" : 0,
- "8D256B418BF7466F1E7306EA36B44A4A04C31B48" : 0,
"A9EA2EFC6B3324DC133DBB5B2F093519479E5635" : 0,
"65A79C2919A5538250064F3C245A290D7BFC656E" : 0,
"285D543319EEB38B059014F34D43A79D66C1ECDC" : 0,
- "2D31E58E12E928BB18019A2FA755DD659EB4E709" : 0
+ "2D31E58E12E928BB18019A2FA755DD659EB4E709" : 0,
+ "AF7423C487C4B1B7082E587F3AB70804F6530E81" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "658CDF4C-0E3B-4627-BD95-2A49A05F1B30",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
@@ -28,13 +29,14 @@
"B775552D1BBEEADC6A0BBB2FD048B6AA26CB309D" : "chatsecure-iosSubmodules\/XMPPFramework",
"DAAB2C887EFA8AB12BAB622BBAFD20531F9A3784" : "chatsecure-ios\/Submodules\/YapDatabase",
"E2E339EC05FF99AF5ECAE62EDBC78398DA1111C6" : "chatsecure-iosPods\/SIAlertView",
+ "8D256B418BF7466F1E7306EA36B44A4A04C31B48" : "chatsecure-iosPods\/AFOAuth2Client",
"6629762BA356A4C56436558F8BA2A9102478B1C6" : "ChatSecure-iOS\/Submodules\/xmpp-server-list\/",
"425D736B25093B4D45BF64638604863B9D31F2C1" : "chatsecure-iosSubmodules\/OTRKit",
- "8D256B418BF7466F1E7306EA36B44A4A04C31B48" : "chatsecure-iosPods\/AFOAuth2Client",
"A9EA2EFC6B3324DC133DBB5B2F093519479E5635" : "ChatSecure-iOS\/Submodules\/ParkedTextField\/",
"65A79C2919A5538250064F3C245A290D7BFC656E" : "chatsecure-ios",
"285D543319EEB38B059014F34D43A79D66C1ECDC" : "chatsecure-iosPods\/uservoice-iphone-sdk",
- "2D31E58E12E928BB18019A2FA755DD659EB4E709" : "chatsecure-iosSubmodules\/ProxyKit"
+ "2D31E58E12E928BB18019A2FA755DD659EB4E709" : "chatsecure-iosSubmodules\/ProxyKit",
+ "AF7423C487C4B1B7082E587F3AB70804F6530E81" : "ChatSecure-iOS\/Submodules\/XLForm\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "ChatSecure",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
@@ -96,6 +98,11 @@
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "A9EA2EFC6B3324DC133DBB5B2F093519479E5635"
},
{
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:chrisballinger\/XLForm.git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "AF7423C487C4B1B7082E587F3AB70804F6530E81"
+ },
+ {
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ChatSecure\/XMPPFramework.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "B775552D1BBEEADC6A0BBB2FD048B6AA26CB309D"
@@ -9,43 +9,40 @@
#import "NSURL+ChatSecure.h"
#import "OTRConstants.h"
#import "XMPPJID.h"
+@import OTRAssets;
@implementation NSURL (ChatSecure)
+ (NSURL*) otr_githubURL {
- NSURL *githubURL = [NSURL URLWithString:@"https://github.com/chrisballinger/ChatSecure-iOS/"];
- return githubURL;
+ return [OTRBranding githubURL];
}
+ (NSURL*) otr_facebookAppURL {
- NSURL *facebookURL = [NSURL URLWithString:@"fb://profile/151354555075008"];
- return facebookURL;
+ return [OTRBranding facebookAppURL];
}
+ (NSURL*) otr_facebookWebURL {
- NSURL *facebookURL = [NSURL URLWithString:@"https://www.facebook.com/chatsecure"];
- return facebookURL;
+ return [OTRBranding facebookWebURL];
}
+ (NSURL*) otr_twitterAppURL {
- NSURL *twitterURL = [NSURL URLWithString:@"twitter://user?screen_name=ChatSecure"];
- return twitterURL;
+ return [OTRBranding twitterAppURL];
}
+
+ (NSURL*) otr_twitterWebURL {
- NSURL *twitterURL = [NSURL URLWithString:@"https://twitter.com/ChatSecure"];
- return twitterURL;
+ return [OTRBranding twitterWebURL];
}
+ (NSURL*) otr_transifexURL {
- return [NSURL URLWithString:@"https://www.transifex.com/projects/p/chatsecure"];
+ return [OTRBranding transifexURL];
}
+ (NSURL*) otr_projectURL {
- return [NSURL URLWithString:@"https://chatsecure.org"];
+ return [OTRBranding projectURL];
}
+ (NSURL*) otr_shareBaseURL {
- return [NSURL URLWithString:@"https://chatsecure.org/i/#"];
+ return [OTRBranding shareBaseURL];
}
@@ -35,7 +35,7 @@ +(NSString *)currentLocale
+ (NSArray *)supportedLanguages
{
- NSBundle *bundle = [NSBundle bundleForClass:[OTRAssets class]];
+ NSBundle *bundle = [OTRAssets resourcesBundle];
NSParameterAssert(bundle != nil);
NSMutableArray *supportedLanguages = [[bundle localizations] mutableCopy];
//Strange Xcode 6 base localization
@@ -54,7 +54,7 @@ + (void)setLocale:(NSString *)locale
+(NSString *)translatedString:(NSString *)englishString
{
NSString * currentLocale = [OTRLanguageManager currentLocale];
- NSBundle *bundle = [NSBundle bundleForClass:[OTRAssets class]];
+ NSBundle *bundle = [OTRAssets resourcesBundle];
NSParameterAssert(bundle != nil);
NSString *bundlePath = [bundle pathForResource:@"Localizable" ofType:@"strings" inDirectory:nil forLocalization:currentLocale];
if (!bundlePath && [currentLocale length] > 2) {
@@ -381,7 +381,7 @@ - (void)refreshStreamJID:(NSString *)myJID withPassword:(NSString *)myPassword
{
int r = arc4random() % 99999;
- NSString * resource = [NSString stringWithFormat:@"%@%d",kOTRXMPPResource,r];
+ NSString * resource = [NSString stringWithFormat:@"%@%d",[OTRBranding xmppResource],r];
self.JID = [XMPPJID jidWithString:myJID resource:resource];
@@ -34,7 +34,7 @@ -(NSString *)activityType
-(UIImage *)activityImage
{
- return [UIImage otr_imageWithImage:[UIImage imageNamed:@"chatsecure_qrcode.png" inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil] scaledToSize:[UIActivity otr_defaultImageSize]];
+ return [UIImage otr_imageWithImage:[UIImage imageNamed:@"chatsecure_qrcode.png" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil] scaledToSize:[UIActivity otr_defaultImageSize]];
}
-(BOOL)canPerformWithActivityItems:(NSArray *)activityItems
@@ -32,7 +32,7 @@ - (id)init
- (UIImage *)accountImage
{
- return [UIImage imageNamed:OTRGoogleTalkImageName inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil];
+ return [UIImage imageNamed:OTRGoogleTalkImageName inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil];
}
- (NSString *)accountDisplayName
{
@@ -82,9 +82,9 @@ -(GTMOAuth2Authentication *)authToken
auth = [[GTMOAuth2Authentication alloc] init];
[auth setParameters:[tokenDictionary mutableCopy]];
}
- auth.clientID = GOOGLE_APP_ID;
- auth.clientSecret = kOTRGoogleAppSecret;
- auth.scope = GOOGLE_APP_SCOPE;
+ auth.clientID = [OTRBranding googleAppId];
+ auth.clientSecret = [OTRSecrets googleAppSecret];
+ auth.scope = [OTRBranding googleAppScope];
auth.tokenURL = [GTMOAuth2SignIn googleTokenURL];
return auth;
}
@@ -40,7 +40,7 @@ - (NSString *)protocolTypeString
- (UIImage *)accountImage
{
- return [UIImage imageNamed:OTRXMPPImageName inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil];
+ return [UIImage imageNamed:OTRXMPPImageName inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil];
}
- (NSString *)accountDisplayName
{
@@ -76,7 +76,7 @@ + (instancetype)accountForStream:(XMPPStream *)stream transaction:(YapDatabaseRe
+ (NSString * )newResource
{
int r = arc4random() % 99999;
- return [NSString stringWithFormat:@"%@%d",kOTRXMPPResource,r];
+ return [NSString stringWithFormat:@"%@%d",[OTRBranding xmppResource],r];
}
@@ -18,7 +18,7 @@ @implementation OTRXMPPTorAccount
- (UIImage *)accountImage
{
- return [UIImage imageNamed:OTRXMPPTorImageName inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil];
+ return [UIImage imageNamed:OTRXMPPTorImageName inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil];
}
- (NSString *)accountDisplayName
@@ -58,6 +58,7 @@
#import "XMPPURI.h"
#import "OTRProtocolManager.h"
#import "OTRInviteViewController.h"
+@import OTRAssets;
#if CHATSECURE_DEMO
#import "OTRChatDemo.h"
@@ -78,8 +79,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
{
[DDLog addLogger:[DDTTYLogger sharedInstance]];
- [[BITHockeyManager sharedHockeyManager] configureWithBetaIdentifier:kOTRHockeyBetaIdentifier
- liveIdentifier:kOTRHockeyLiveIdentifier
+ [[BITHockeyManager sharedHockeyManager] configureWithBetaIdentifier:[OTRSecrets hockeyBetaIdentifier]
+ liveIdentifier:[OTRSecrets hockeyLiveIdentifier]
delegate:self];
[[BITHockeyManager sharedHockeyManager] startManager];
@@ -44,7 +44,7 @@ + (void)loadDemoChatInDatabase
if (!buddy) {
buddy = [[OTRXMPPBuddy alloc] init];
NSString *imageName = avatarImageNames[idx];
- buddy.avatarData = UIImagePNGRepresentation([UIImage imageNamed:imageName inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil]);
+ buddy.avatarData = UIImagePNGRepresentation([UIImage imageNamed:imageName inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil]);
buddy.displayName = name;
buddy.username = name;
buddy.accountUniqueId = account.uniqueId;
@@ -93,7 +93,7 @@ + (UIView *)typingBubbleView
{
UIImageView * bubbleImageView = nil;
UIImage * bubbleImage = nil;
- bubbleImage = [UIImage imageNamed:@"bubble-min-tailless" inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil];
+ bubbleImage = [UIImage imageNamed:@"bubble-min-tailless" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil];
bubbleImage = [self image:bubbleImage maskWithColor:[OTRColors bubbleLightGrayColor]];
bubbleImage = [self mirrorImage:bubbleImage];
@@ -505,7 +505,7 @@ + (UIImage *)xmppServerImageWithName:(NSString *)name
return [self duckduckgoImage];
}
else {
- return [UIImage imageNamed:name inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil];
+ return [UIImage imageNamed:name inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil];
}
}
@@ -1,13 +0,0 @@
-//
-// OTRSecrets.m
-// Off the Record
-//
-// Created by Chris Ballinger on 12/9/11.
-// Copyright (c) 2012 Chris Ballinger. All rights reserved.
-//
-
-#import "OTRSecrets.h"
-
-NSString *const kOTRGoogleAppSecret = @"";
-NSString *const kOTRHockeyLiveIdentifier = @"";
-NSString *const kOTRHockeyBetaIdentifier = @"";
@@ -8,6 +8,10 @@
@import Foundation;
-extern NSString *const kOTRGoogleAppSecret;
-extern NSString *const kOTRHockeyLiveIdentifier;
-extern NSString *const kOTRHockeyBetaIdentifier;
+@interface OTRSecrets : NSObject
+
++ (NSString*) googleAppSecret;
++ (NSString*) hockeyLiveIdentifier;
++ (NSString*) hockeyBetaIdentifier;
+
+@end
@@ -0,0 +1,40 @@
+//
+// OTRSecrets.m
+// Off the Record
+//
+// Created by Chris Ballinger on 12/9/11.
+// Copyright (c) 2012 Chris Ballinger. All rights reserved.
+//
+
+#import "OTRSecrets.h"
+@import Foundation;
+#import "OTRAssets.h"
+
+static NSString *const kOTRGoogleAppSecret = @"kOTRGoogleAppSecret";
+static NSString *const kOTRHockeyLiveIdentifier = @"kOTRHockeyLiveIdentifier";
+static NSString *const kOTRHockeyBetaIdentifier = @"kOTRHockeyBetaIdentifier";
+
+@implementation OTRSecrets
+
++ (NSString*) googleAppSecret {
+ return [[self defaultPlist] objectForKey:kOTRGoogleAppSecret];
+}
+
++ (NSString*) hockeyLiveIdentifier {
+ return [[self defaultPlist] objectForKey:kOTRHockeyLiveIdentifier];
+}
+
++ (NSString*) hockeyBetaIdentifier {
+ return [[self defaultPlist] objectForKey:kOTRHockeyBetaIdentifier];
+}
+
++ (NSDictionary*) defaultPlist {
+ NSBundle *bundle = [OTRAssets resourcesBundle];
+ NSString *path = [bundle pathForResource:@"Secrets" ofType:@"plist"];
+ NSParameterAssert(path != nil);
+ NSDictionary *plist = [[NSDictionary alloc] initWithContentsOfFile:path];
+ NSParameterAssert(plist != nil);
+ return plist;
+}
+
+@end
@@ -35,7 +35,7 @@ @implementation OTRBaseLoginViewController
- (void)viewDidLoad {
[super viewDidLoad];
- UIImage *checkImage = [UIImage imageNamed:@"ic-check" inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil];
+ UIImage *checkImage = [UIImage imageNamed:@"ic-check" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil];
UIBarButtonItem *checkButton = [[UIBarButtonItem alloc] initWithImage:checkImage style:UIBarButtonItemStylePlain target:self action:@selector(loginButtonPressed:)];
self.navigationItem.rightBarButtonItem = checkButton;
@@ -288,7 +288,7 @@ - (void)showCertWarningForCertificateData:(NSData *)certData withHostname:(NSStr
// For some reason we must show the alert view first,
// THEN change the button style, otherwise the button doesn't appear.
- UIImage * normalImage = [UIImage imageNamed:@"button-green" inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil];
+ UIImage * normalImage = [UIImage imageNamed:@"button-green" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil];
CGFloat hInset = floorf(normalImage.size.width / 2);
CGFloat vInset = floorf(normalImage.size.height / 2);
UIEdgeInsets insets = UIEdgeInsetsMake(vInset, hInset, vInset, hInset);
@@ -98,16 +98,16 @@ - (NSArray *)defaultAccountArray
{
NSMutableArray *accountArray = [NSMutableArray array];
- [accountArray addObject:[OTRWelcomeAccountInfo accountInfoWithText:@"XMPP" image:[UIImage imageNamed:@"xmpp" inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil] didSelectBlock:^{
+ [accountArray addObject:[OTRWelcomeAccountInfo accountInfoWithText:@"XMPP" image:[UIImage imageNamed:@"xmpp" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil] didSelectBlock:^{
OTRXMPPAccount *xmppAccount = [[OTRXMPPAccount alloc] initWithAccountType:OTRAccountTypeJabber];
OTRBaseLoginViewController *loginViewController = [OTRBaseLoginViewController loginViewControllerForAccount:xmppAccount];
loginViewController.completionBlock = self.completionBlock;
loginViewController.account = xmppAccount;
[self.navigationController pushViewController:loginViewController animated:YES];
}]];
- [accountArray addObject:[OTRWelcomeAccountInfo accountInfoWithText:@"Google" image:[UIImage imageNamed:@"gtalk" inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil] didSelectBlock:^{
+ [accountArray addObject:[OTRWelcomeAccountInfo accountInfoWithText:@"Google" image:[UIImage imageNamed:@"gtalk" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil] didSelectBlock:^{
//Authenicate and go through google oauth
- GTMOAuth2ViewControllerTouch * oauthViewController = [GTMOAuth2ViewControllerTouch controllerWithScope:GOOGLE_APP_SCOPE clientID:GOOGLE_APP_ID clientSecret:kOTRGoogleAppSecret keychainItemName:nil completionHandler:^(GTMOAuth2ViewControllerTouch *viewController, GTMOAuth2Authentication *auth, NSError *error) {
+ GTMOAuth2ViewControllerTouch * oauthViewController = [GTMOAuth2ViewControllerTouch controllerWithScope:[OTRBranding googleAppScope] clientID:[OTRBranding googleAppId] clientSecret:[OTRSecrets googleAppSecret] keychainItemName:nil completionHandler:^(GTMOAuth2ViewControllerTouch *viewController, GTMOAuth2Authentication *auth, NSError *error) {
if (!error) {
OTRGoogleOAuthXMPPAccount *googleAccount = [[OTRGoogleOAuthXMPPAccount alloc] initWithAccountType:OTRAccountTypeGoogleTalk];
googleAccount.username = auth.userEmail;
@@ -82,7 +82,7 @@ - (void) setupVersionLabel {
}
- (void) setupImageView {
- self.imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"chatsecure_logo_transparent" inBundle:[NSBundle bundleForClass:[OTRAssets class]] compatibleWithTraitCollection:nil]];
+ self.imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"chatsecure_logo_transparent" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil]];
self.imageView.translatesAutoresizingMaskIntoConstraints = NO;
self.imageView.contentMode = UIViewContentModeScaleAspectFit;
self.imageView.userInteractionEnabled = YES;
Oops, something went wrong.

0 comments on commit 95c83f0

Please sign in to comment.