Delete logs when measurement is uploaded (#497)

ooni · Feb 13, 2023 · b71de5a · b71de5a
1 parent 8514750
commit b71de5a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/ooniprobe/AppDelegate.m b/ooniprobe/AppDelegate.m
@@ -98,8 +98,6 @@ - (void)applicationDidBecomeActive:(UIApplication *)application {
     //Called in case the user disable notifications from iOS panel
     if (![[UIApplication sharedApplication] isRegisteredForRemoteNotifications])
         [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"notifications_enabled"];
-    if ([TestUtility canCallDeleteJson])
-        [TestUtility deleteUploadedJsons];
     [TestUtility deleteOldLogs];
     [[Harpy sharedInstance] checkVersionDaily];
 }

diff --git a/ooniprobe/Test/Test/AbstractTest.m b/ooniprobe/Test/Test/AbstractTest.m
@@ -168,6 +168,9 @@ -(void)runTest{
                 if (measurement != nil){
                     measurement.is_done = true;
                     [measurement save];
+                    if (measurement.is_uploaded) {
+                        [TestUtility removeFile:[measurement getReportFile]];
+                    }
                 }
             }
             else if ([event.key isEqualToString:@"status.end"]) {

diff --git a/ooniprobe/View/TestResults/Footer/UploadFooterViewController.m b/ooniprobe/View/TestResults/Footer/UploadFooterViewController.m
@@ -124,6 +124,8 @@ -(void)uploadMeasurements:(NSArray *)notUploaded{
             });
             if (![self uploadMeasurement:currentMeasurement session:session]){
                 errors++;
+            } else {
+                [TestUtility removeFile:[currentMeasurement getReportFile]];
             }
             progress += measurementValue;
             i++;