Skip to content

Commit

Permalink
Added option to show more informations about contacts and loaded sett…
Browse files Browse the repository at this point in the history
…ings.
SergioOpenPeer committed Nov 7, 2014
1 parent 8da577a commit 2d21ccf
Showing 13 changed files with 274 additions and 40 deletions.
16 changes: 13 additions & 3 deletions Samples/OpenPeerSampleApp/OpenPeerSampleApp/APNSManager.m
Original file line number Diff line number Diff line change
@@ -240,6 +240,7 @@ - (void) pushData:(NSString*) filePath sendingRich:(BOOL) sendingRich messageID:

- (void) registerDeviceToken:(NSData*) devToken
{
OPLog(HOPLoggerSeverityInformational, HOPLoggerLevelDebug, @"Registering device token, %@, with Urban Airship",devToken);
[[UAPush shared] appRegisteredForRemoteNotificationsWithDeviceToken:devToken];
}

@@ -638,7 +639,8 @@ - (void) requestDeviceTokenForPeerURI:(NSString*) peerURI
json = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
}

HTTPDownloader* request = [[HTTPDownloader alloc] initDownloadFromURL:@"http://push-hack.hcs-stack-v2-i7957106-7.hcs.io/device-associate-get" data:json post:YES];
//HTTPDownloader* request = [[HTTPDownloader alloc] initDownloadFromURL:@"http://push-hack.hcs-stack-v2-i7957106-7.hcs.io/device-associate-get" data:json post:YES];
HTTPDownloader* request = [[HTTPDownloader alloc] initDownloadFromURL:[[Settings sharedSettings] getDeviceTokenDownloadURL] data:json post:YES];

request.delegate = self;
[self.dictionaryOfHTTPRequests setObject:request forKey:peerURI];
@@ -658,6 +660,8 @@ - (void) registerDeviceToken

if ([self.deviceToken length] > 0 && [peerURI length] > 0 && ![[self.dictionaryOfHTTPRequests allKeys] containsObject:peerURI])
{
OPLog(HOPLoggerSeverityInformational, HOPLoggerLevelDebug, @"Registering device token, %@, with Open Peer system",self.deviceToken);

NSMutableDictionary* dictRoot = [[NSMutableDictionary alloc] init];
NSMutableDictionary* dictData = [[NSMutableDictionary alloc] init];

@@ -686,15 +690,20 @@ - (void) registerDeviceToken
json = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
}

HTTPDownloader* request = [[HTTPDownloader alloc] initDownloadFromURL:@"http://push-hack.hcs-stack-v2-i7957106-7.hcs.io/device-associate-set" data:json post:YES];
//HTTPDownloader* request = [[HTTPDownloader alloc] initDownloadFromURL:@"http://push-hack.hcs-stack-v2-i7957106-7.hcs.io/device-associate-set" data:json post:YES];
HTTPDownloader* request = [[HTTPDownloader alloc] initDownloadFromURL:[[Settings sharedSettings] getDeviceTokenUploadURL] data:json post:YES];

request.delegate = self;
[self.dictionaryOfHTTPRequests setObject:request forKey:peerURI];

if (![request startDownload])
{
[self.dictionaryOfHTTPRequests removeObjectForKey:peerURI];
OPLog(HOPLoggerSeverityError, HOPLoggerLevelDebug, @"Device token registration request is not sent.");
OPLog(HOPLoggerSeverityError, HOPLoggerLevelDebug, @"Device token, %@, registration request is not sent via %@.",self.deviceToken,@"http://push-hack.hcs-stack-v2-i7957106-7.hcs.io/device-associate-set");
}
else
{
OPLog(HOPLoggerSeverityInformational, HOPLoggerLevelDebug, @"Registering device token, %@, JSON: /n is sent via %@.",self.deviceToken,json,@"http://push-hack.hcs-stack-v2-i7957106-7.hcs.io/device-associate-set");
}
}
}
@@ -735,6 +744,7 @@ - (void) httpDownloader:(HTTPDownloader*) downloader downloaded:(NSString*) down
NSString* deviceToken = [result objectForKey:@"deviceToken"];
if ([deviceToken length] > 0)
{
OPLog(HOPLoggerSeverityInformational, HOPLoggerLevelDebug, @"Received deviceToken, %@, for peer URI %@.",deviceToken,peerURI);
[[HOPModelManager sharedModelManager] setAPNSData:deviceToken type:type PeerURI:peerURI];
HOPMessage* msg = [self.dictionaryOfPushNotificationsToSend objectForKey:peerURI];
if (msg)
2 changes: 2 additions & 0 deletions Samples/OpenPeerSampleApp/OpenPeerSampleApp/AppConsts.h
Original file line number Diff line number Diff line change
@@ -60,6 +60,8 @@ extern NSString * const settingsKeySettingsVersion;
extern NSString * const settingsKeyBackgroundingPhaseRichPush;
extern NSString * const settingsKeyDefaultLogLevel;
extern NSString * const settingsKeyRedirectAfterLoginCompleteURL;
extern NSString * const settingsDeviceTokenDownloadURL;
extern NSString * const settingsDeviceTokenUploadURL;

extern NSString * const archiveEnabled;
extern NSString * const archiveServer;
2 changes: 2 additions & 0 deletions Samples/OpenPeerSampleApp/OpenPeerSampleApp/AppConsts.m
Original file line number Diff line number Diff line change
@@ -78,6 +78,8 @@
NSString * const settingsKeyBackgroundingPhaseRichPush = @"applicationSettingsBackgroundingPhaseRichPush";
NSString * const settingsKeyDefaultLogLevel = @"logLevelForServicesHttp";
NSString * const settingsKeyRedirectAfterLoginCompleteURL = @"redirectAfterLoginCompleteURL";
NSString * const settingsDeviceTokenDownloadURL = @"deviceTokenDownloadURL";
NSString * const settingsDeviceTokenUploadURL = @"deviceTokenUploadURL";

NSString * const archiveEnabled = @"enabled";
NSString * const archiveServer = @"Server";
2 changes: 1 addition & 1 deletion Samples/OpenPeerSampleApp/OpenPeerSampleApp/AppDelegate.m
Original file line number Diff line number Diff line change
@@ -156,7 +156,7 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio

if ([hexString length] > 0)
{
OPLog(HOPLoggerSeverityInformational, HOPLoggerLevelDebug, @"Push notification deviceToken:%@",hexString);
OPLog(HOPLoggerSeverityInformational, HOPLoggerLevelDebug, @"Registered push notification deviceToken:%@",hexString);

[[APNSManager sharedAPNSManager] setDeviceToken:hexString];
[[APNSManager sharedAPNSManager] registerDeviceToken:deviceToken];
111 changes: 104 additions & 7 deletions Samples/OpenPeerSampleApp/OpenPeerSampleApp/AppInfoViewController.m
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@

#import "AppInfoViewController.h"
#import "AppConsts.h"
#import "Settings.h"

const CGFloat cellDefaultHeight = 50.0;
const CGFloat headerDefaultHeight = 40.0;
@@ -40,10 +41,17 @@

APP_VERSION,
APP_BUILD_VERSION,
APP_SETTINGS_DOWNLOAD_URL,
APP_SETTINGS_VERSION,
APP_SETTINGS_DOWNLOAD_URL,
APP_SETTINGS_OUTER_FRAME_URL,
APP_SETTINGS_IDENTITY_PROVIDER_DOMAIN,
APP_SETTINGS_IDENTITY_FEDERATE_BASE_URI,
APP_SETTINGS_NAMESPACE_GRANT_SERVICE_URL,
APP_SETTINGS_LOCKBOX_SERVICE_DOMAIN,
APP_SETTINGS_DEVICE_TOKEN_DOWNLOAD_URL,
APP_SETTINGS_DEVICE_TOKEN_UPLOAD_URL,

APP_INFO_SECTIONS = 4
APP_INFO_SECTIONS
} AppInfoOptions;

@interface AppInfoViewController ()
@@ -111,14 +119,44 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
cell.textLabel.text = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
break;

case APP_SETTINGS_VERSION:
cell.textLabel.text = [[NSUserDefaults standardUserDefaults] stringForKey:settingsKeySettingsVersion];
break;

case APP_SETTINGS_DOWNLOAD_URL:
cell.textLabel.text = [[[NSUserDefaults standardUserDefaults] stringForKey:settingsKeySettingsDownloadURL] length] > 0 ? [[NSUserDefaults standardUserDefaults] stringForKey:settingsKeySettingsDownloadURL] : @"None";
break;

case APP_SETTINGS_VERSION:
cell.textLabel.text = [[NSUserDefaults standardUserDefaults] stringForKey:settingsKeySettingsVersion];

case APP_SETTINGS_OUTER_FRAME_URL:
cell.textLabel.text = [[[Settings sharedSettings] getOuterFrameURL] length] > 0 ? [[Settings sharedSettings] getOuterFrameURL]: @"None";
break;

case APP_SETTINGS_IDENTITY_PROVIDER_DOMAIN:
cell.textLabel.text = [[[Settings sharedSettings] getIdentityProviderDomain] length] > 0 ? [[Settings sharedSettings] getIdentityProviderDomain]: @"None";
break;

case APP_SETTINGS_IDENTITY_FEDERATE_BASE_URI:
cell.textLabel.text = [[[Settings sharedSettings] getIdentityFederateBaseURI] length] > 0 ? [[Settings sharedSettings] getIdentityFederateBaseURI]: @"None";
break;

case APP_SETTINGS_NAMESPACE_GRANT_SERVICE_URL:
cell.textLabel.text = [[[Settings sharedSettings] getNamespaceGrantServiceURL] length] > 0 ? [[Settings sharedSettings] getNamespaceGrantServiceURL]: @"None";
break;

case APP_SETTINGS_LOCKBOX_SERVICE_DOMAIN:
cell.textLabel.text = [[[Settings sharedSettings] getLockBoxServiceDomain] length] > 0 ? [[Settings sharedSettings] getLockBoxServiceDomain]: @"None";
break;

case APP_SETTINGS_DEVICE_TOKEN_DOWNLOAD_URL:
cell.textLabel.lineBreakMode = NSLineBreakByWordWrapping;
cell.textLabel.text = [[[Settings sharedSettings] getDeviceTokenDownloadURL] length] > 0 ? [[Settings sharedSettings] getDeviceTokenDownloadURL]: @"None";
break;

case APP_SETTINGS_DEVICE_TOKEN_UPLOAD_URL:
cell.textLabel.lineBreakMode = NSLineBreakByWordWrapping;
cell.textLabel.text = [[[Settings sharedSettings] getDeviceTokenUploadURL] length] > 0 ? [[Settings sharedSettings] getDeviceTokenUploadURL]: @"None";
break;


default:
break;
@@ -140,20 +178,79 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
case APP_BUILD_VERSION:
ret = @"Application Build Version";
break;

case APP_SETTINGS_VERSION:
ret = @"Settings Version";
break;

case APP_SETTINGS_DOWNLOAD_URL:
ret = @"Settings Download URL";
break;

case APP_SETTINGS_VERSION:
ret = @"Settings Version";
case APP_SETTINGS_OUTER_FRAME_URL:
ret = @"Outer Frame URL";
break;

case APP_SETTINGS_IDENTITY_PROVIDER_DOMAIN:
ret = @"Settings Identity Provider Domain";
break;

case APP_SETTINGS_IDENTITY_FEDERATE_BASE_URI:
ret = @"Identity Federate Base URI";
break;

case APP_SETTINGS_NAMESPACE_GRANT_SERVICE_URL:
ret = @"Namespace Grant Service URL";
break;

case APP_SETTINGS_LOCKBOX_SERVICE_DOMAIN:
ret = @"Settings Lockbox Service Domain";
break;

case APP_SETTINGS_DEVICE_TOKEN_DOWNLOAD_URL:
ret = @"Device Token Download URL";
break;

case APP_SETTINGS_DEVICE_TOKEN_UPLOAD_URL:
ret = @"Device Token Upload URL";
break;

default:
break;
}

return ret;
}

- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
CGFloat ret = 0;
CGSize constraintSize = CGSizeMake(280.0f, MAXFLOAT);

switch (indexPath.section)
{
case APP_SETTINGS_DEVICE_TOKEN_DOWNLOAD_URL:
{
UIFont* cellFont = [UIFont boldSystemFontOfSize:17.0];
CGSize labelSize = [[[Settings sharedSettings] getDeviceTokenDownloadURL] boundingRectWithSize: constraintSize options: NSStringDrawingUsesLineFragmentOrigin attributes: @{ NSFontAttributeName: cellFont } context: nil].size;
ret = (labelSize.height) > cellDefaultHeight ? labelSize.height + 20.0: cellDefaultHeight;
}
break;

case APP_SETTINGS_DEVICE_TOKEN_UPLOAD_URL:
{
UIFont* cellFont = [UIFont boldSystemFontOfSize:17.0];
CGSize labelSize = [[[Settings sharedSettings] getDeviceTokenUploadURL] boundingRectWithSize: constraintSize options: NSStringDrawingUsesLineFragmentOrigin attributes: @{ NSFontAttributeName: cellFont } context: nil].size;
ret = (labelSize.height) > cellDefaultHeight ? labelSize.height + 20.0: cellDefaultHeight;
}
break;

default:
ret = cellDefaultHeight;
break;
}

return ret;
}

@end
Original file line number Diff line number Diff line change
@@ -3,21 +3,25 @@
<plist version="1.0">
<dict>
<key>outerFrameURL</key>
<string>http://identity.opp.me:5005/outer-new.html</string>
<string>http://identity.hcs.io:5005/outer-new.html</string>
<key>identityProviderDomain</key>
<string>com-hookflash-sergejfb.app.opp.me</string>
<string>com-hookflash-sampleapp.app.hcs.io</string>
<key>identityFederateBaseURI</key>
<string>identity://facebook.com/</string>
<key>namespaceGrantServiceURL</key>
<string>http://jsouter-v1-rel-lespaulinst2-i.hcs.io/grant.html</string>
<string>http://identity.hcs.io:5005/outernamespacegrant.html</string>
<key>lockBoxServiceDomain</key>
<string>opp.me</string>
<string>hcs.io</string>
<key>defaultOutgoingTelnetServer</key>
<string>log.opp.me:8115</string>
<string>log.hcs.io:8115</string>
<key>localTelnetLoggerPort</key>
<string>59999</string>
<key>applicationSettingsBackgroundingPhaseRichPush</key>
<integer>4</integer>
<key>deviceTokenDownloadURL</key>
<string>http://push-hack.hcs-stack-v2-i7957106-7.hcs.io/device-associate-get</string>
<key>deviceTokenUploadURL</key>
<string>http://push-hack.hcs-stack-v2-i7957106-7.hcs.io/device-associate-set</string>
<key>openpeer/core/core-thread-priority</key>
<string>normal</string>
<key>openpeer/core/media-thread-priority</key>
Original file line number Diff line number Diff line change
@@ -32,6 +32,10 @@
#import <UIKit/UIKit.h>
#import <CoreData/CoreData.h>

@class HOPOpenPeerContact;

@interface InfoViewController : UITableViewController<NSFetchedResultsControllerDelegate>

- (id) initWithContact:(HOPOpenPeerContact*) inContact style:(UITableViewStyle)style;

@end
Loading

0 comments on commit 2d21ccf

Please sign in to comment.