Skip to content

Convert ignoreStaleLocations from int to double #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ckrey merged 5 commits into from
Mar 13, 2020
Merged

Convert ignoreStaleLocations from int to double #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f2a976c
Convvert ignoreStaleLocations from int to double
mrose17 Mar 11, 2020
eba2856
Include actual files
mrose17 Mar 11, 2020
11019ec
Revert "Include actual files"
mrose17 Mar 11, 2020
463bad3
Revert "Convvert ignoreStaleLocations from int to double"
mrose17 Mar 11, 2020
5f42b78
Get all the files in one place, at one time...
mrose17 Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OwnTracks/OwnTracks/FriendsTVC.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ - (NSFetchedResultsController *)fetchedResultsController {
fetchRequest.entity = entity;
fetchRequest.fetchBatchSize = 20;

int ignoreStaleLocations = [Settings intForKey:@"ignorestalelocations_preference"
inMOC:CoreData.sharedInstance.mainMOC];
double ignoreStaleLocations = [Settings doubleForKey:@"ignorestalelocations_preference"
inMOC:CoreData.sharedInstance.mainMOC];
if (ignoreStaleLocations) {
NSTimeInterval stale = -ignoreStaleLocations * 24.0 * 3600.0;
fetchRequest.predicate = [NSPredicate predicateWithFormat:@"lastLocation > %@",
Expand Down
2 changes: 1 addition & 1 deletion OwnTracks/OwnTracks/Settings.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ + (NSDictionary *)toDictionaryInMOC:(NSManagedObjectContext *)context {
dict[@"locatorDisplacement"] = @([Settings intForKey:@"mindist_preference" inMOC:context]);
dict[@"locatorInterval"] = @([Settings intForKey:@"mintime_preference" inMOC:context]);
dict[@"extendedData"] = @([Settings boolForKey:@"extendeddata_preference" inMOC:context]);
dict[@"ignoreStaleLocations"] = @([Settings intForKey:@"ignorestalelocations_preference" inMOC:context]);
dict[@"ignoreStaleLocations"] = @([Settings doubleForKey:@"ignorestalelocations_preference" inMOC:context]);
dict[@"ignoreInaccurateLocations"] = @([Settings intForKey:@"ignoreinaccuratelocations_preference" inMOC:context]);

for (Setting *setting in [Setting allSettingsInMOC:context]) {
Expand Down
4 changes: 2 additions & 2 deletions OwnTracks/OwnTracks/ViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,8 +494,8 @@ - (NSFetchedResultsController *)frcFriends {
if (!_frcFriends) {
NSFetchRequest *request = [NSFetchRequest fetchRequestWithEntityName:@"Friend"];

int ignoreStaleLocations = [Settings intForKey:@"ignorestalelocations_preference"
inMOC:CoreData.sharedInstance.mainMOC];
double ignoreStaleLocations = [Settings doubleForKey:@"ignorestalelocations_preference"
inMOC:CoreData.sharedInstance.mainMOC];
if (ignoreStaleLocations) {
NSTimeInterval stale = -ignoreStaleLocations * 24.0 * 3600.0;
request.predicate = [NSPredicate predicateWithFormat:@"lastLocation > %@",
Expand Down
2 changes: 1 addition & 1 deletion OwnTracks/OwnTracks/coredata/Friend+CoreDataClass.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ + (NSArray *)allFriendsInManagedObjectContext:(NSManagedObjectContext *)context
+ (NSArray *)allNonStaleFriendsInManagedObjectContext:(NSManagedObjectContext *)context {
NSFetchRequest *request = [NSFetchRequest fetchRequestWithEntityName:@"Friend"];
request.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"topic" ascending:YES]];
int ignoreStaleLocations = [Settings intForKey:@"ignorestalelocations_preference" inMOC:context];
double ignoreStaleLocations = [Settings doubleForKey:@"ignorestalelocations_preference" inMOC:context];
if (ignoreStaleLocations) {
NSTimeInterval stale = -ignoreStaleLocations * 24.0 * 3600.0;
request.predicate = [NSPredicate predicateWithFormat:@"lastLocation > %@",
Expand Down