Brion VIBBER has submitted this change and it was merged.
Change subject: Structure User-Agent similarly to Android app reboot.
......................................................................
Structure User-Agent similarly to Android app reboot.
* See I3ac919861270a08abc9cd995ddc4790886ca41a6
Change-Id: I5510dc67cfc2acc7c81e5955e0cd8d2409def95d
---
M wikipedia/Categories/NSURLRequest+DictionaryRequest.m
M wikipedia/Data/Operations/DownloadWikipediaZeroMessageOp.m
M wikipedia/View Controllers/MainMenu/MainMenuViewController.m
M wikipedia/mw-utils/WikipediaAppUtils.h
M wikipedia/mw-utils/WikipediaAppUtils.m
5 files changed, 35 insertions(+), 8 deletions(-)
Approvals:
Mhurd: Looks good to me, but someone else must approve
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Categories/NSURLRequest+DictionaryRequest.m
b/wikipedia/Categories/NSURLRequest+DictionaryRequest.m
index e135b3c..ccde940 100644
--- a/wikipedia/Categories/NSURLRequest+DictionaryRequest.m
+++ b/wikipedia/Categories/NSURLRequest+DictionaryRequest.m
@@ -28,7 +28,8 @@
[request setHTTPMethod:@"POST"];
[request addValue:@"application/x-www-form-urlencoded; charset=UTF-8"
forHTTPHeaderField:@"Content-Type"];
[request addValue:@"" forHTTPHeaderField:@"Accept-Encoding"];
- [request addValue:[WikipediaAppUtils appVersion]
forHTTPHeaderField:@"User-Agent"];
+ [request addValue:[WikipediaAppUtils versionedUserAgent]
forHTTPHeaderField:@"User-Agent"];
+ // NSLog(@"%@", [WikipediaAppUtils versionedUserAgent]);
[request setHTTPBody:[[NSURLRequest constructEncodedURL:parameters]
dataUsingEncoding:NSUTF8StringEncoding]];
return request;
}
@@ -41,7 +42,7 @@
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL
URLWithString:body]];
[request setHTTPMethod:@"GET"];
[request addValue:@"" forHTTPHeaderField:@"Accept-Encoding"];
- [request addValue:[WikipediaAppUtils appVersion]
forHTTPHeaderField:@"User-Agent"];
+ [request addValue:[WikipediaAppUtils versionedUserAgent]
forHTTPHeaderField:@"User-Agent"];
[request addValue:@"application/x-www-form-urlencoded"
forHTTPHeaderField:@"Content-Type"];
return request;
}
diff --git a/wikipedia/Data/Operations/DownloadWikipediaZeroMessageOp.m
b/wikipedia/Data/Operations/DownloadWikipediaZeroMessageOp.m
index c415c55..801938a 100644
--- a/wikipedia/Data/Operations/DownloadWikipediaZeroMessageOp.m
+++ b/wikipedia/Data/Operations/DownloadWikipediaZeroMessageOp.m
@@ -20,7 +20,7 @@
parameters: @{
@"action":
@"zeroconfig",
@"type": @"message",
- @"agent":
[WikipediaAppUtils appVersion]
+ @"agent":
[WikipediaAppUtils versionedUserAgent]
}
];
__weak DownloadWikipediaZeroMessageOp *weakSelf = self;
diff --git a/wikipedia/View Controllers/MainMenu/MainMenuViewController.m
b/wikipedia/View Controllers/MainMenu/MainMenuViewController.m
index 764ff13..a412fbb 100644
--- a/wikipedia/View Controllers/MainMenu/MainMenuViewController.m
+++ b/wikipedia/View Controllers/MainMenu/MainMenuViewController.m
@@ -361,7 +361,7 @@
case ROW_INDEX_SEND_FEEDBACK:
{
NSString *mailtoUri =
- [NSString
stringWithFormat:@"mailto:mobile-ios-wikipe...@wikimedia.org?subject=Feedback:%@";,
[WikipediaAppUtils appVersion]];
+ [NSString
stringWithFormat:@"mailto:mobile-ios-wikipe...@wikimedia.org?subject=Feedback:%@";,
[WikipediaAppUtils versionedUserAgent]];
[[UIApplication sharedApplication] openURL:[NSURL
URLWithString:mailtoUri]];
}
break;
diff --git a/wikipedia/mw-utils/WikipediaAppUtils.h
b/wikipedia/mw-utils/WikipediaAppUtils.h
index 77fead9..91a1f72 100644
--- a/wikipedia/mw-utils/WikipediaAppUtils.h
+++ b/wikipedia/mw-utils/WikipediaAppUtils.h
@@ -8,6 +8,8 @@
@interface WikipediaAppUtils : NSObject
+(NSString*) appVersion;
++(NSString*) formFactor;
++(NSString*) versionedUserAgent;
+(NSString*) localizedStringForKey:(NSString *)key;
@end
diff --git a/wikipedia/mw-utils/WikipediaAppUtils.m
b/wikipedia/mw-utils/WikipediaAppUtils.m
index 3098ef5..3e609d1 100644
--- a/wikipedia/mw-utils/WikipediaAppUtils.m
+++ b/wikipedia/mw-utils/WikipediaAppUtils.m
@@ -8,10 +8,34 @@
+(NSString*) appVersion
{
NSDictionary *appInfo = [[NSBundle mainBundle] infoDictionary];
- return [NSString stringWithFormat: @"iOS-%@-%@-%@",
- [appInfo objectForKey: @"CFBundleDisplayName"],
- [appInfo objectForKey:@"CFBundleShortVersionString"],
- [appInfo objectForKey: @"CFBundleVersion"]
+ return [NSString stringWithFormat: @"%@", [appInfo
objectForKey:@"CFBundleShortVersionString"]];
+}
+
++(NSString*) formFactor
+{
+ UIUserInterfaceIdiom ff = UI_USER_INTERFACE_IDIOM();
+ // We'll break; on each case, just to follow good form.
+ switch (ff) {
+ case UIUserInterfaceIdiomPad:
+ return @"Tablet";
+ break;
+ case UIUserInterfaceIdiomPhone:
+ return @"Phone";
+ break;
+ default:
+ return @"Other";
+ break;
+ }
+}
+
++(NSString*) versionedUserAgent
+{
+ UIDevice *d = [UIDevice currentDevice];
+ return [NSString stringWithFormat:@"WikipediaApp/%@ (%@ %@; %@)",
+ [self appVersion],
+ [d systemName],
+ [d systemVersion],
+ [self formFactor]
];
}
--
To view, visit https://gerrit.wikimedia.org/r/126188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5510dc67cfc2acc7c81e5955e0cd8d2409def95d
Gerrit-PatchSet: 4
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: OliverKeyes <oke...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
