Skip to content

Commit 673785e

Browse files
kosztikoszti
committed
refactoring to ringring objects
1 parent d729ae6 commit 673785e

File tree

82 files changed

+195
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+195
-279
lines changed

‎Classes/LinphoneAppDelegate.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
159159

160160
- (void)setupRestKit{
161161
// Set base URL
162-
RKObjectManager *objectManager = [RKObjectManager managerWithBaseURL:[NSURL URLWithString:@"https://api.zirgoo.com/"]];
162+
RKObjectManager *objectManager = [RKObjectManager managerWithBaseURL:[NSURL URLWithString:@"https://api.ringring.io/"]];
163163

164164
// Set HTTP parameters
165165
[objectManager.HTTPClient setParameterEncoding:AFJSONParameterEncoding];

‎Classes/LinphoneManager.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ + (BOOL)isNotIphone3G
182182
}
183183

184184
+ (NSString *)getUserAgent {
185-
return [NSString stringWithFormat:@"ZirgooIOS/%@ (Linphone/%s; Apple %@/%@)",
185+
return [NSString stringWithFormat:@"RingringIOS/%@ (Linphone/%s; Apple %@/%@)",
186186
[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey],
187187
linphone_core_get_version(),
188188
[UIDevice currentDevice].systemName,
@@ -875,7 +875,7 @@ - (void)startLibLinphone {
875875
NSString* factoryConfig = [LinphoneManager bundleFile:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory"];
876876
NSString *confiFileName = [LinphoneManager documentFile:@".linphonerc"];
877877
NSString *zrtpSecretsFileName = [LinphoneManager documentFile:@"zrtp_secrets"];
878-
const char* lRootCa = [[LinphoneManager bundleFile:@"rootca.pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
878+
const char* lRootCa = [[LinphoneManager bundleFile:@"ringring_io.pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
879879
connectivity = none;
880880
signal(SIGPIPE, SIG_IGN);
881881
//log management
@@ -907,7 +907,7 @@ - (void)startLibLinphone {
907907
, [confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]
908908
, [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]]
909909
,self);
910-
linphone_core_set_user_agent(theLinphoneCore,"ZirgooIOS",
910+
linphone_core_set_user_agent(theLinphoneCore,"RingringIOS",
911911
[[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]);
912912
//fastAddressBook = [[FastAddressBook alloc] init];
913913

‎Controllers/CallerViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// CallerViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 14/01/2014.
66
//

‎Controllers/CallerViewController.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// CallerViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 14/01/2014.
66
//
@@ -14,7 +14,7 @@
1414
#import "LinphoneManager.h"
1515

1616
#import "LinphoneHelper.h"
17-
#import "ZirgooMessage.h"
17+
#import "RingringMessage.h"
1818
#import "AddressBookMap.h"
1919

2020

@@ -305,8 +305,8 @@ - (void)displayCallError:(LinphoneCall *)call message:(NSString *)message {
305305
}
306306
else {
307307
if (message != nil) {
308-
ZirgooMessage *zirgooMessage = [[ZirgooMessage alloc] initWithZirgooMessageString:message];
309-
lMessage = [NSString stringWithFormat : NSLocalizedString(@"%@\n%@", nil), lMessage, zirgooMessage.zirgooText];
308+
RingringMessage *ringringMessage = [[RingringMessage alloc] initWithRingringMessageString:message];
309+
lMessage = [NSString stringWithFormat : NSLocalizedString(@"%@\n%@", nil), lMessage, ringringMessage.ringringText];
310310
}
311311
}
312312

‎Controllers/ChatViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ChatViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 05/02/2014.
66
//

‎Controllers/ChatViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ChatViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 05/02/2014.
66
//

‎Controllers/ContactsViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ContactListViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 12/01/2014.
66
//

‎Controllers/ContactsViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ContactListViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 12/01/2014.
66
//

‎Controllers/LauncherViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// LauncherViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 18/01/2014.
66
//

‎Controllers/LauncherViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// LauncherViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 18/01/2014.
66
//

‎Controllers/LinphoneHelper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// LinphoneHelper.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 22/01/2014.
66
//

‎Controllers/LinphoneHelper.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// LinphoneHelper.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 22/01/2014.
66
//

‎Controllers/MoreTableViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// SettingsViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 11/02/2014.
66
//

‎Controllers/MoreTableViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// SettingsViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 11/02/2014.
66
//

‎Controllers/RecentsViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// CallHistoryViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 12/01/2014.
66
//

‎Controllers/RecentsViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// CallHistoryViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 12/01/2014.
66
//

‎Controllers/SettingsTableViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// SettingsViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 11/02/2014.
66
//

‎Controllers/SettingsTableViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// SettingsViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 11/02/2014.
66
//

‎Controllers/UITableViewControllerWithLinphoneListener.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// UITableViewControllerWithLinphoneListener.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 15/02/2014.
66
//

‎Controllers/UITableViewControllerWithLinphoneListener.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// UITableViewControllerWithLinphoneListener.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 15/02/2014.
66
//

‎Controllers/UIViewControllerWithStatusBar.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// StatusBarViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 15/01/2014.
66
//

‎Controllers/UIViewControllerWithStatusBar.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// StatusBarViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 15/01/2014.
66
//

‎Controllers/WizardActivateViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// WizardActivateViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 10/01/2014.
66
//

‎Controllers/WizardActivateViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// WizardActivateViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 10/01/2014.
66
//

‎Controllers/WizardEmailViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// WizardEmailViewController.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 10/01/2014.
66
//

‎Controllers/WizardEmailViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// WizardEmailViewController.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 10/01/2014.
66
//

‎Models/AddressBookMap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// FastAddressBook.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 02/02/2014.
66
//

‎Models/AddressBookMap.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// FastAddressBook.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 02/02/2014.
66
//

‎Models/Contact.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ContactPerson.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 13/01/2014.
66
//

‎Models/Contact.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ContactPerson.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 13/01/2014.
66
//

‎Models/Message.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// Message.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 08/02/2014.
66
//

‎Models/Message.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// Message.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 08/02/2014.
66
//

‎Models/RecentContact.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ContactLog.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 01/02/2014.
66
//

‎Models/RecentContact.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// RecentContact.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 01/02/2014.
66
//

‎Models/RestApi/MappingProvider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// MappingProvider.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 23/02/2014.
66
//

‎Models/RestApi/MappingProvider.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// MappingProvider.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 23/02/2014.
66
//

‎Models/RestApi/Status.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// StatusResult.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 26/02/2014.
66
//

‎Models/RestApi/Status.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// StatusResult.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 26/02/2014.
66
//

‎Models/RestApi/User.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// User.h
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 23/02/2014.
66
//

‎Models/RestApi/User.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// User.m
3-
// zirgoo
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 24/02/2014.
66
//

‎Models/ZirgooMessage.h ‎Models/RingringMessage.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
//
2-
// LinphoneMessage.h
3-
// zirgoo
2+
// RingringMessage.h
3+
// ringring.io
44
//
55
// Created by Peter Kosztolanyi on 27/05/2014.
66
//
77
//
88

99
#import <Foundation/Foundation.h>
1010

11-
@interface ZirgooMessage : NSObject
11+
@interface RingringMessage : NSObject
1212

13-
@property (nonatomic, assign) NSString *zirgooMessageString;
13+
@property (nonatomic, assign) NSString *ringringMessageString;
1414

1515
@property (nonatomic, assign) NSString *longText;
1616
@property (nonatomic, assign) NSNumber *cause;
1717
@property (nonatomic, assign) NSString *text;
18-
@property (nonatomic, assign) NSString *zirgooText;
18+
@property (nonatomic, assign) NSString *ringringText;
1919

20-
- (id)initWithZirgooMessageString:(NSString *)aZirgooMessageString;
20+
- (id)initWithRingringMessageString:(NSString *)aRingringMessageString;
2121

2222
- (NSString *)description;
2323

0 commit comments

Comments
 (0)