From f802865a1ad427a637f901e86a637ab67d7f23d1 Mon Sep 17 00:00:00 2001 From: Lorenzo Primiterra Date: Tue, 14 Feb 2017 11:21:03 +0100 Subject: [PATCH 01/41] #86 issue --- .../include_cc@2x.png | Bin .../include_cc@3x.png | Bin .../include_asn@2x.png | Bin .../include_asn@3x.png | Bin 4 files changed, 0 insertions(+), 0 deletions(-) rename ooniprobe/Images.xcassets/{include_cc.imageset => include_asn.imageset}/include_cc@2x.png (100%) rename ooniprobe/Images.xcassets/{include_cc.imageset => include_asn.imageset}/include_cc@3x.png (100%) rename ooniprobe/Images.xcassets/{include_asn.imageset => include_cc.imageset}/include_asn@2x.png (100%) rename ooniprobe/Images.xcassets/{include_asn.imageset => include_cc.imageset}/include_asn@3x.png (100%) diff --git a/ooniprobe/Images.xcassets/include_cc.imageset/include_cc@2x.png b/ooniprobe/Images.xcassets/include_asn.imageset/include_cc@2x.png similarity index 100% rename from ooniprobe/Images.xcassets/include_cc.imageset/include_cc@2x.png rename to ooniprobe/Images.xcassets/include_asn.imageset/include_cc@2x.png diff --git a/ooniprobe/Images.xcassets/include_cc.imageset/include_cc@3x.png b/ooniprobe/Images.xcassets/include_asn.imageset/include_cc@3x.png similarity index 100% rename from ooniprobe/Images.xcassets/include_cc.imageset/include_cc@3x.png rename to ooniprobe/Images.xcassets/include_asn.imageset/include_cc@3x.png diff --git a/ooniprobe/Images.xcassets/include_asn.imageset/include_asn@2x.png b/ooniprobe/Images.xcassets/include_cc.imageset/include_asn@2x.png similarity index 100% rename from ooniprobe/Images.xcassets/include_asn.imageset/include_asn@2x.png rename to ooniprobe/Images.xcassets/include_cc.imageset/include_asn@2x.png diff --git a/ooniprobe/Images.xcassets/include_asn.imageset/include_asn@3x.png b/ooniprobe/Images.xcassets/include_cc.imageset/include_asn@3x.png similarity index 100% rename from ooniprobe/Images.xcassets/include_asn.imageset/include_asn@3x.png rename to ooniprobe/Images.xcassets/include_cc.imageset/include_asn@3x.png From 563d259b3163fb1e408d2c208526024821636723 Mon Sep 17 00:00:00 2001 From: Lorenzo Primiterra Date: Tue, 14 Feb 2017 11:21:23 +0100 Subject: [PATCH 02/41] #86 --- ooniprobe/Images.xcassets/include_asn.imageset/Contents.json | 4 ++-- ooniprobe/Images.xcassets/include_cc.imageset/Contents.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ooniprobe/Images.xcassets/include_asn.imageset/Contents.json b/ooniprobe/Images.xcassets/include_asn.imageset/Contents.json index 9443ede9a..b0edcbe35 100644 --- a/ooniprobe/Images.xcassets/include_asn.imageset/Contents.json +++ b/ooniprobe/Images.xcassets/include_asn.imageset/Contents.json @@ -6,12 +6,12 @@ }, { "idiom" : "universal", - "filename" : "include_asn@2x.png", + "filename" : "include_cc@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "include_asn@3x.png", + "filename" : "include_cc@3x.png", "scale" : "3x" } ], diff --git a/ooniprobe/Images.xcassets/include_cc.imageset/Contents.json b/ooniprobe/Images.xcassets/include_cc.imageset/Contents.json index b0edcbe35..9443ede9a 100644 --- a/ooniprobe/Images.xcassets/include_cc.imageset/Contents.json +++ b/ooniprobe/Images.xcassets/include_cc.imageset/Contents.json @@ -6,12 +6,12 @@ }, { "idiom" : "universal", - "filename" : "include_cc@2x.png", + "filename" : "include_asn@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "include_cc@3x.png", + "filename" : "include_asn@3x.png", "scale" : "3x" } ], From 8e4ea39921045d1b9e7ec1568edb9c3c2d2d0434 Mon Sep 17 00:00:00 2001 From: Lorenzo Primiterra Date: Tue, 14 Feb 2017 11:22:04 +0100 Subject: [PATCH 03/41] Issue #50 android --- ooniprobe/Base.lproj/Localizable.strings | 1 + ooniprobe/Info.plist | 4 ++-- ooniprobe/View/SettingsTableViewController.h | 1 + ooniprobe/View/SettingsTableViewController.mm | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ooniprobe/Base.lproj/Localizable.strings b/ooniprobe/Base.lproj/Localizable.strings index 53390b0c5..beaef38bb 100644 --- a/ooniprobe/Base.lproj/Localizable.strings +++ b/ooniprobe/Base.lproj/Localizable.strings @@ -105,3 +105,4 @@ "view_data_policy" = "Click here to view our data policy"; "test_name_finished" = "%@ finished, go to Past Tests to see the results"; "open_url_alert" = "Do you want to open the following URL?"; +"max_runtime_low" = "max_runtime_low"; diff --git a/ooniprobe/Info.plist b/ooniprobe/Info.plist index 801035c51..eb10562b2 100644 --- a/ooniprobe/Info.plist +++ b/ooniprobe/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.2 + 1.1.3-dev CFBundleSignature ???? CFBundleVersion - 3 + 4 Fabric APIKey diff --git a/ooniprobe/View/SettingsTableViewController.h b/ooniprobe/View/SettingsTableViewController.h index 6464dad26..40229332f 100644 --- a/ooniprobe/View/SettingsTableViewController.h +++ b/ooniprobe/View/SettingsTableViewController.h @@ -4,6 +4,7 @@ #import #import "PBRevealViewController.h" +#import "UIView+Toast.h" @interface SettingsTableViewController : UITableViewController { NSArray *privacyItems; diff --git a/ooniprobe/View/SettingsTableViewController.mm b/ooniprobe/View/SettingsTableViewController.mm index dbc066ab2..72d72eba6 100644 --- a/ooniprobe/View/SettingsTableViewController.mm +++ b/ooniprobe/View/SettingsTableViewController.mm @@ -136,6 +136,20 @@ - (BOOL)textFieldShouldBeginEditing:(UITextField *)textField{ return YES; } +- (void)textFieldDidEndEditing:(UITextField *)textField{ + UITableViewCell *cell = (UITableViewCell *)textField.superview; + NSIndexPath *indexPath = [self.tableView indexPathForCell:cell]; + if (indexPath.section == 2 && indexPath.row == 0){ + if ([textField.text integerValue] < 10){ + NSNumberFormatter *f = [[NSNumberFormatter alloc] init]; + f.numberStyle = NSNumberFormatterDecimalStyle; + [[NSUserDefaults standardUserDefaults] setObject:[f numberFromString:@"10"] forKey:@"max_runtime"]; + [self.tableView reloadData]; + [self.view makeToast:NSLocalizedString(@"max_runtime_low", nil)]; + } + } +} + -(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { NSString * str = [textField.text stringByReplacingCharactersInRange:range withString:string]; From 527e1020cabd2a9542c29f6eb40e0c15810e46c4 Mon Sep 17 00:00:00 2001 From: Lorenzo Primiterra Date: Tue, 14 Feb 2017 17:18:17 +0100 Subject: [PATCH 04/41] Fixing #85 (purge tests) --- ooniprobe/Base.lproj/Localizable.strings | 4 +++- ooniprobe/Base.lproj/Main.storyboard | 29 +++++++++++++---------- ooniprobe/Utility/TestStorage.mm | 1 - ooniprobe/View/PastTestsViewController.h | 2 +- ooniprobe/View/PastTestsViewController.mm | 17 ++++++++++++- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/ooniprobe/Base.lproj/Localizable.strings b/ooniprobe/Base.lproj/Localizable.strings index beaef38bb..6ce8a843f 100644 --- a/ooniprobe/Base.lproj/Localizable.strings +++ b/ooniprobe/Base.lproj/Localizable.strings @@ -105,4 +105,6 @@ "view_data_policy" = "Click here to view our data policy"; "test_name_finished" = "%@ finished, go to Past Tests to see the results"; "open_url_alert" = "Do you want to open the following URL?"; -"max_runtime_low" = "max_runtime_low"; +"max_runtime_low" = "The max runtime you have entered is too low, setting to default."; +"clear_all_tests" = "Clear all tests"; +"clear_all_tests_alert" = "Do you want to remove all tests?"; diff --git a/ooniprobe/Base.lproj/Main.storyboard b/ooniprobe/Base.lproj/Main.storyboard index 25ec51985..30f9767ae 100644 --- a/ooniprobe/Base.lproj/Main.storyboard +++ b/ooniprobe/Base.lproj/Main.storyboard @@ -137,7 +137,7 @@ - +