Skip to content

Commit

Permalink
chore: update engine and psiphon fix (#572)
Browse files Browse the repository at this point in the history
  • Loading branch information
aanorbel authored Nov 29, 2024
1 parent faefbd8 commit 728e29b
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inhibit_all_warnings!


def ooni_pods
ooni_version = "v3.23.0"
ooni_version = "v3.24.0"
ooni_pods_location = "https://github.com/ooni/probe-cli/releases/download/#{ooni_version}"

pod "libcrypto", :podspec => "#{ooni_pods_location}/libcrypto.podspec"
Expand Down
52 changes: 26 additions & 26 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ PODS:
- DateTools (2.0.0)
- DZNEmptyDataSet (1.8.1)
- Harpy (4.1.14)
- libcrypto (2024.08.08-093202)
- libevent (2024.08.08-093202)
- libssl (2024.08.08-093202)
- libtor (2024.08.08-093202)
- libz (2024.08.08-093202)
- libcrypto (2024.11.26-053946)
- libevent (2024.11.26-053946)
- libssl (2024.11.26-053946)
- libtor (2024.11.26-053946)
- libz (2024.11.26-053946)
- lottie-ios (2.5.3)
- MBProgressHUD (1.2.0)
- MKDropdownMenu (1.4)
- OCMapper (2.0)
- oonimkall (2024.08.08-093202)
- oonimkall (2024.11.26-053946)
- RHMarkdownLabel (0.0.1):
- TTTAttributedLabel
- XNGMarkdownParser
Expand All @@ -31,16 +31,16 @@ DEPENDENCIES:
- DateTools
- DZNEmptyDataSet
- Harpy
- libcrypto (from `https://github.com/ooni/probe-cli/releases/download/v3.23.0/libcrypto.podspec`)
- libevent (from `https://github.com/ooni/probe-cli/releases/download/v3.23.0/libevent.podspec`)
- libssl (from `https://github.com/ooni/probe-cli/releases/download/v3.23.0/libssl.podspec`)
- libtor (from `https://github.com/ooni/probe-cli/releases/download/v3.23.0/libtor.podspec`)
- libz (from `https://github.com/ooni/probe-cli/releases/download/v3.23.0/libz.podspec`)
- libcrypto (from `https://github.com/ooni/probe-cli/releases/download/v3.24.0/libcrypto.podspec`)
- libevent (from `https://github.com/ooni/probe-cli/releases/download/v3.24.0/libevent.podspec`)
- libssl (from `https://github.com/ooni/probe-cli/releases/download/v3.24.0/libssl.podspec`)
- libtor (from `https://github.com/ooni/probe-cli/releases/download/v3.24.0/libtor.podspec`)
- libz (from `https://github.com/ooni/probe-cli/releases/download/v3.24.0/libz.podspec`)
- lottie-ios (= 2.5.3)
- MBProgressHUD
- MKDropdownMenu
- OCMapper (= 2.0)
- oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.23.0/oonimkall.podspec`)
- oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.24.0/oonimkall.podspec`)
- RHMarkdownLabel
- Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `8.35.0`)
- SharkORM (from `https://github.com/sharksync/sharkorm`, tag `v2.3.67`)
Expand All @@ -63,17 +63,17 @@ SPEC REPOS:

EXTERNAL SOURCES:
libcrypto:
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.23.0/libcrypto.podspec
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.24.0/libcrypto.podspec
libevent:
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.23.0/libevent.podspec
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.24.0/libevent.podspec
libssl:
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.23.0/libssl.podspec
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.24.0/libssl.podspec
libtor:
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.23.0/libtor.podspec
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.24.0/libtor.podspec
libz:
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.23.0/libz.podspec
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.24.0/libz.podspec
oonimkall:
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.23.0/oonimkall.podspec
:podspec: https://github.com/ooni/probe-cli/releases/download/v3.24.0/oonimkall.podspec
Sentry:
:git: https://github.com/getsentry/sentry-cocoa.git
:tag: 8.35.0
Expand All @@ -94,23 +94,23 @@ SPEC CHECKSUMS:
DateTools: 933ac9c490f21f92127cf690ccd8c397e0126caf
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
Harpy: b2fbe6819f6a8932df32d7cd2fb20f442df86bbc
libcrypto: 9a12055e236b3283cffbfeaab6a85e4d62480133
libevent: 63707e24494c04bdc4a6213b0c7bba0690552c71
libssl: 6b9a2fb25fea3d01adf741468d44081f71f6fbe3
libtor: 2c1f46debcb56ec48ee943bd4b4ba8f921aa71b4
libz: 0b2d1bdbdc746becbc984654dbe6f09db92177ee
libcrypto: 7fb50209305641e986f6b1a1e4680ec4d71602e3
libevent: b9f2a7f3b682f7a072f4d21edf360052d3a591dc
libssl: 115acb9ff8f7d20f437ff8e112f1d21f210dad94
libtor: efd4a639943c12a239094c2927891578cb4c7fcc
libz: 8e83c9433082438bce962f836f845d835f26b850
lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae
OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0
oonimkall: e1ac8071f47a30241440d1fc7389900af5e71972
oonimkall: 935a4263650a75bef0d8b487f7d349094b4c2b73
RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd
Sentry: 451743df9c904fa394eaa8ddb25abbedbdea2289
SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2

PODFILE CHECKSUM: 39906063e904c044fa228aa7f6e3ffcfabfd17fd
PODFILE CHECKSUM: c69e6cc553248bf808392f48527ce85add63d143

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
2 changes: 2 additions & 0 deletions ooniprobe/Engine/OONISession.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
*/
- (OONICheckInResults*) checkIn:(OONIContext*) ctx config:(OONICheckInConfig*) config error:(NSError **)error;

- (void)close:(NSError **)error;

@end
3 changes: 3 additions & 0 deletions ooniprobe/Engine/PESession.m
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@ - (OONICheckInResults*) checkIn:(OONIContext*) ctx config:(OONICheckInConfig*) c
return (r != nil) ? ([[OONICheckInResults alloc] initWithResults:r]) : nil;
}

- (void)close:(NSError **)error {
[self.session close:error];
}
@end
3 changes: 3 additions & 0 deletions ooniprobe/Utility/OONIApi.m
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ + (void)checkIn:(NSString*)runType onSuccess: (void (^)(NSArray*))successcb onEr
}]);
return;
}

[session close:nil];

successcb(urls);
}

Expand Down

0 comments on commit 728e29b

Please # to comment.