Brion VIBBER has submitted this change and it was merged.
Change subject: Remove "devmode". Make Wikipedia Zero a regular fixture.
......................................................................
Remove "devmode". Make Wikipedia Zero a regular fixture.
Change-Id: I8ae820ea4f96b3caac7612ad422e0d05e2cf0a88
---
M Wikipedia-iOS/AppDelegate.m
M Wikipedia-iOS/Settings.bundle/Root.plist
M Wikipedia-iOS/View Controllers/MainMenu/MainMenuTableViewController.m
M Wikipedia-iOS/Web Image Interception/URLCache.m
M Wikipedia-iOS/Zero/ZeroConfigState.h
M Wikipedia-iOS/Zero/ZeroConfigState.m
6 files changed, 41 insertions(+), 89 deletions(-)
Approvals:
Mhurd: Looks good to me, but someone else must approve
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia-iOS/AppDelegate.m b/Wikipedia-iOS/AppDelegate.m
index 9e868ae..1d7582c 100644
--- a/Wikipedia-iOS/AppDelegate.m
+++ b/Wikipedia-iOS/AppDelegate.m
@@ -43,7 +43,6 @@
@"Domain": @"en",
@"DomainName": @"English",
@"Site": @"wikipedia.org",
- @"ZeroDevMode" : @NO,
@"ZeroWarnWhenLeaving" : @YES,
@"ZeroOnDialogShownOnce" : @NO,
@"ZeroOffDialogShownOnce" : @NO
diff --git a/Wikipedia-iOS/Settings.bundle/Root.plist
b/Wikipedia-iOS/Settings.bundle/Root.plist
index 1dbe723..0096e6f 100644
--- a/Wikipedia-iOS/Settings.bundle/Root.plist
+++ b/Wikipedia-iOS/Settings.bundle/Root.plist
@@ -1,47 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
<plist version="1.0">
- <dict>
- <key>PreferenceSpecifiers</key>
- <array>
- <dict>
- <key>Title</key>
- <string>Wikipedia Zero</string>
- <key>Type</key>
- <string>PSGroupSpecifier</string>
- <key>FooterText</key>
- <string>If your mobile operator waives data access charges for
the Wikipedia app through a Wikipedia Zero partnership, leaving this setting On
helps you know when you are leaving the Wikipedia app and could be
charged.</string>
- </dict>
- <dict>
- <key>Type</key>
- <string>PSToggleSwitchSpecifier</string>
- <key>Title</key>
- <string>Warn if leaving Wikipedia Zero</string>
- <key>Key</key>
- <string>ZeroWarnWhenLeaving</string>
- <key>DefaultValue</key>
- <true/>
- </dict>
- <dict>
- <key>Title</key>
- <string>DEVMODE</string>
- <key>Type</key>
- <string>PSGroupSpecifier</string>
- <key>FooterText</key>
- <string>During development this enables code execution of W0
things.</string>
- </dict>
- <dict>
- <key>Key</key>
- <string>ZeroDevMode</string>
- <key>Title</key>
- <string>Zero Devmode</string>
- <key>Type</key>
- <string>PSToggleSwitchSpecifier</string>
- <key>DefaultValue</key>
- <false/>
- </dict>
- </array>
- <key>StringsTable</key>
- <string>Root</string>
- </dict>
+<dict>
+ <key>PreferenceSpecifiers</key>
+ <array>
+ <dict>
+ <key>Title</key>
+ <string>Wikipedia Zero</string>
+ <key>Type</key>
+ <string>PSGroupSpecifier</string>
+ <key>FooterText</key>
+ <string>If your mobile operator waives data access
charges for the Wikipedia app through a Wikipedia Zero partnership, leaving
this setting On helps you know when you are leaving the Wikipedia app and could
be charged.</string>
+ </dict>
+ <dict>
+ <key>Type</key>
+ <string>PSToggleSwitchSpecifier</string>
+ <key>Title</key>
+ <string>Warn if leaving Wikipedia Zero</string>
+ <key>Key</key>
+ <string>ZeroWarnWhenLeaving</string>
+ <key>DefaultValue</key>
+ <true/>
+ </dict>
+ </array>
+ <key>StringsTable</key>
+ <string>Root</string>
+</dict>
</plist>
diff --git a/Wikipedia-iOS/View
Controllers/MainMenu/MainMenuTableViewController.m b/Wikipedia-iOS/View
Controllers/MainMenu/MainMenuTableViewController.m
index 9b4d84f..3677aca 100644
--- a/Wikipedia-iOS/View Controllers/MainMenu/MainMenuTableViewController.m
+++ b/Wikipedia-iOS/View Controllers/MainMenu/MainMenuTableViewController.m
@@ -149,14 +149,6 @@
key: @"zeroWarnWhenLeaving"
section: SECTION_ZERO_OPTIONS
];
-
- [self addToTableDataRowWithTitle: [NSString stringWithFormat:@"%@ %@",
- [SessionSingleton
sharedInstance].zeroConfigState.devMode ?
- @"✔️" : @" ",
-
NSLocalizedString(@"zero-settings-devmode", nil)]
- key: @"zeroDevMode"
- section: SECTION_ZERO_OPTIONS
- ];
}
#pragma mark - Table section and row accessors
@@ -520,11 +512,6 @@
} else if ([selectedRowKey isEqualToString:@"zeroWarnWhenLeaving"]) {
[tableView deselectRowAtIndexPath:indexPath animated:YES];
[[SessionSingleton sharedInstance].zeroConfigState
toggleWarnWhenLeaving];
- [self updateZeroToggles];
- [self.tableView reloadData];
- } else if ([selectedRowKey isEqualToString:@"zeroDevMode"]) {
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
- [[SessionSingleton sharedInstance].zeroConfigState toggleDevMode];
[self updateZeroToggles];
[self.tableView reloadData];
} else if ([selectedRowKey isEqualToString:@"randomTappable"]) {
diff --git a/Wikipedia-iOS/Web Image Interception/URLCache.m
b/Wikipedia-iOS/Web Image Interception/URLCache.m
index 0af43cf..5b3fc69 100644
--- a/Wikipedia-iOS/Web Image Interception/URLCache.m
+++ b/Wikipedia-iOS/Web Image Interception/URLCache.m
@@ -161,24 +161,22 @@
}
-(void) processZeroHeaders:(NSURLResponse*) response {
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"ZeroDevMode"]) {
- NSNotificationCenter *notificationCenter = [NSNotificationCenter
defaultCenter];
- NSHTTPURLResponse *httpUrlResponse = (NSHTTPURLResponse*)response;
- NSDictionary *headers = httpUrlResponse.allHeaderFields;
- NSString *xZeroRatedHeader = [headers objectForKey:@"X-CS"];
- BOOL zeroRatedHeaderPresent = xZeroRatedHeader != nil;
- NSString *xcs = [SessionSingleton
sharedInstance].zeroConfigState.partnerXcs;
- BOOL zeroProviderChanged = zeroRatedHeaderPresent &&
![xZeroRatedHeader isEqualToString:xcs];
- BOOL zeroDisposition = [SessionSingleton
sharedInstance].zeroConfigState.disposition;
- if (zeroRatedHeaderPresent && (!zeroDisposition ||
zeroProviderChanged)) {
- [SessionSingleton sharedInstance].zeroConfigState.disposition =
YES;
- [SessionSingleton sharedInstance].zeroConfigState.partnerXcs =
xZeroRatedHeader;
- [notificationCenter postNotificationName:@"ZeroStateChanged"
object:self userInfo:@{@"state": @YES}];
- } else if (!zeroRatedHeaderPresent && zeroDisposition) {
- [SessionSingleton sharedInstance].zeroConfigState.disposition = NO;
- [SessionSingleton sharedInstance].zeroConfigState.partnerXcs = nil;
- [notificationCenter postNotificationName:@"ZeroStateChanged"
object:self userInfo:@{@"state": @NO}];
- }
+ NSNotificationCenter *notificationCenter = [NSNotificationCenter
defaultCenter];
+ NSHTTPURLResponse *httpUrlResponse = (NSHTTPURLResponse*)response;
+ NSDictionary *headers = httpUrlResponse.allHeaderFields;
+ NSString *xZeroRatedHeader = [headers objectForKey:@"X-CS"];
+ BOOL zeroRatedHeaderPresent = xZeroRatedHeader != nil;
+ NSString *xcs = [SessionSingleton
sharedInstance].zeroConfigState.partnerXcs;
+ BOOL zeroProviderChanged = zeroRatedHeaderPresent && ![xZeroRatedHeader
isEqualToString:xcs];
+ BOOL zeroDisposition = [SessionSingleton
sharedInstance].zeroConfigState.disposition;
+ if (zeroRatedHeaderPresent && (!zeroDisposition || zeroProviderChanged)) {
+ [SessionSingleton sharedInstance].zeroConfigState.disposition = YES;
+ [SessionSingleton sharedInstance].zeroConfigState.partnerXcs =
xZeroRatedHeader;
+ [notificationCenter postNotificationName:@"ZeroStateChanged"
object:self userInfo:@{@"state": @YES}];
+ } else if (!zeroRatedHeaderPresent && zeroDisposition) {
+ [SessionSingleton sharedInstance].zeroConfigState.disposition = NO;
+ [SessionSingleton sharedInstance].zeroConfigState.partnerXcs = nil;
+ [notificationCenter postNotificationName:@"ZeroStateChanged"
object:self userInfo:@{@"state": @NO}];
}
}
diff --git a/Wikipedia-iOS/Zero/ZeroConfigState.h
b/Wikipedia-iOS/Zero/ZeroConfigState.h
index d335880..8bd24fc 100644
--- a/Wikipedia-iOS/Zero/ZeroConfigState.h
+++ b/Wikipedia-iOS/Zero/ZeroConfigState.h
@@ -15,11 +15,9 @@
@property (nonatomic, readonly) BOOL zeroOnDialogShownOnce;
@property (nonatomic, readonly) BOOL zeroOffDialogShownOnce;
@property (nonatomic, readonly) BOOL warnWhenLeaving;
-@property (nonatomic, readonly) BOOL devMode;
-(void)setZeroOnDialogShownOnce;
-(void)setZeroOffDialogShownOnce;
-(void)toggleWarnWhenLeaving;
--(void)toggleDevMode;
@end
diff --git a/Wikipedia-iOS/Zero/ZeroConfigState.m
b/Wikipedia-iOS/Zero/ZeroConfigState.m
index 3bb4f33..819997f 100644
--- a/Wikipedia-iOS/Zero/ZeroConfigState.m
+++ b/Wikipedia-iOS/Zero/ZeroConfigState.m
@@ -40,16 +40,4 @@
return [[NSUserDefaults standardUserDefaults]
boolForKey:@"ZeroWarnWhenLeaving"];
}
--(void)toggleDevMode
-{
- [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:
![self devMode]]
- forKey:@"ZeroDevMode"];
- [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
--(BOOL)devMode
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:@"ZeroDevMode"];
-}
-
@end
--
To view, visit https://gerrit.wikimedia.org/r/120562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ae820ea4f96b3caac7612ad422e0d05e2cf0a88
Gerrit-PatchSet: 2
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>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
