Merge branch 'master' into issues/2587

ooni · May 31, 2024 · c06a594 · c06a594
2 parents a0a1d89 + 8a66e01
commit c06a594
Show file tree

Hide file tree

Showing 16 changed files with 235 additions and 168 deletions.
diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -0,0 +1,34 @@
+name: Validate
+on:
+  pull_request:
+  push:
+  schedule:
+    - cron: "0 2 * * */2"
+
+jobs:
+  build:
+    name: Ensure the code builds
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: bundle install
+      - run: pod repo update
+      - run: pod install
+      - run: |
+          set -o pipefail
+          xcodebuild -workspace ooniprobe.xcworkspace -scheme ooniprobe \
+            -destination='name=Any iOS Device' -sdk iphoneos archive CODE_SIGNING_ALLOWED="NO" | xcpretty
+
+  test:
+    name: Run tests
+    needs: [ build ]
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: bundle install
+      - run: pod repo update
+      - run: pod install
+      - run: |
+          set -o pipefail
+          xcodebuild clean build test -workspace ooniprobe.xcworkspace -sdk iphonesimulator \
+            -scheme ooniprobe -destination 'name=iPhone 14' | xcpretty
diff --git a/Podfile b/Podfile
@@ -5,7 +5,7 @@ inhibit_all_warnings!
 
 
 def ooni_pods
-    ooni_version = "v3.20.0"
+    ooni_version = "v3.22.0"
     ooni_pods_location = "https://github.com/ooni/probe-cli/releases/download/#{ooni_version}"
 
     pod "libcrypto", :podspec => "#{ooni_pods_location}/libcrypto.podspec"

diff --git a/Podfile.lock b/Podfile.lock
@@ -5,16 +5,16 @@ PODS:
   - DateTools (2.0.0)
   - DZNEmptyDataSet (1.8.1)
   - Harpy (4.1.14)
-  - libcrypto (2023.12.13-202054)
-  - libevent (2023.12.13-202054)
-  - libssl (2023.12.13-202054)
-  - libtor (2023.12.13-202054)
-  - libz (2023.12.13-202054)
+  - libcrypto (2024.05.22-093305)
+  - libevent (2024.05.22-093305)
+  - libssl (2024.05.22-093305)
+  - libtor (2024.05.22-093305)
+  - libz (2024.05.22-093305)
   - lottie-ios (2.5.3)
   - MBProgressHUD (1.2.0)
   - MKDropdownMenu (1.4)
   - OCMapper (2.0)
-  - oonimkall (2023.12.13-202054)
+  - oonimkall (2024.05.22-093305)
   - RHMarkdownLabel (0.0.1):
     - TTTAttributedLabel
     - XNGMarkdownParser
@@ -31,16 +31,16 @@ DEPENDENCIES:
   - DateTools
   - DZNEmptyDataSet
   - Harpy
-  - libcrypto (from `https://github.com/ooni/probe-cli/releases/download/v3.20.0/libcrypto.podspec`)
-  - libevent (from `https://github.com/ooni/probe-cli/releases/download/v3.20.0/libevent.podspec`)
-  - libssl (from `https://github.com/ooni/probe-cli/releases/download/v3.20.0/libssl.podspec`)
-  - libtor (from `https://github.com/ooni/probe-cli/releases/download/v3.20.0/libtor.podspec`)
-  - libz (from `https://github.com/ooni/probe-cli/releases/download/v3.20.0/libz.podspec`)
+  - libcrypto (from `https://github.com/ooni/probe-cli/releases/download/v3.22.0/libcrypto.podspec`)
+  - libevent (from `https://github.com/ooni/probe-cli/releases/download/v3.22.0/libevent.podspec`)
+  - libssl (from `https://github.com/ooni/probe-cli/releases/download/v3.22.0/libssl.podspec`)
+  - libtor (from `https://github.com/ooni/probe-cli/releases/download/v3.22.0/libtor.podspec`)
+  - libz (from `https://github.com/ooni/probe-cli/releases/download/v3.22.0/libz.podspec`)
   - lottie-ios (= 2.5.3)
   - MBProgressHUD
   - MKDropdownMenu
   - OCMapper (= 2.0)
-  - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.20.0/oonimkall.podspec`)
+  - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.22.0/oonimkall.podspec`)
   - RHMarkdownLabel
   - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `6.1.4`)
   - SharkORM (from `https://github.com/sharksync/sharkorm`, tag `v2.3.67`)
@@ -63,17 +63,17 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   libcrypto:
-    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.20.0/libcrypto.podspec
+    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.22.0/libcrypto.podspec
   libevent:
-    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.20.0/libevent.podspec
+    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.22.0/libevent.podspec
   libssl:
-    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.20.0/libssl.podspec
+    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.22.0/libssl.podspec
   libtor:
-    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.20.0/libtor.podspec
+    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.22.0/libtor.podspec
   libz:
-    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.20.0/libz.podspec
+    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.22.0/libz.podspec
   oonimkall:
-    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.20.0/oonimkall.podspec
+    :podspec: https://github.com/ooni/probe-cli/releases/download/v3.22.0/oonimkall.podspec
   Sentry:
     :git: https://github.com/getsentry/sentry-cocoa.git
     :tag: 6.1.4
@@ -94,23 +94,24 @@ SPEC CHECKSUMS:
   DateTools: 933ac9c490f21f92127cf690ccd8c397e0126caf
   DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
   Harpy: b2fbe6819f6a8932df32d7cd2fb20f442df86bbc
-  libcrypto: 322086e5d3b16ccf1f55025a55a289995a0cc030
-  libevent: 1753dc8400b0e79fd5f904898591504fa39908e8
-  libssl: daa255515da4b7300ec673027249323d2f1a83a0
-  libtor: 9725121f65813b199cab0573920cab7f97bb990e
-  libz: 5ab697747be11c4a6eb40920f0fa0a714187be53
+  libcrypto: 1bb58600c586e28688f5578f4675f5ffa46c8eaf
+  libevent: 5c8502ca5cc38be31bb510ddade0f238bcc5f0dc
+  libssl: 170bebcaf567a0285e91a8850b9686137d07c3e1
+  libtor: c72b23da6a5d2e16173149784f11cf66156c35be
+  libz: 83658eb2a0db785623ffdf9ce13407e6b8b5c8f9
   lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
   MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae
   OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0
-  oonimkall: 39f0504bd549c55cbdd805321b36cd68ba78e223
+  oonimkall: 9768ce9dad18265d45d2ea972c84fb0bd5237cc3
   RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd
   Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc
   SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
   XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2
 
-PODFILE CHECKSUM: 8682b6dd76f73766490d3743ab706136560c1d68
+PODFILE CHECKSUM: 3df4eef5a3f5aeba6a6df642bb5d669cff0662b0
 
-COCOAPODS: 1.15.0
+
+COCOAPODS: 1.15.2
diff --git a/ooniprobe.xcodeproj/project.pbxproj b/ooniprobe.xcodeproj/project.pbxproj
@@ -2016,7 +2016,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 133;
 				DEVELOPMENT_TEAM = MADPSAYN6T;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -2039,7 +2039,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 3.8.6;
+				MARKETING_VERSION = 3.8.7;
 				PRODUCT_BUNDLE_IDENTIFIER = org.openobservatory.ooniprobe;
 				PRODUCT_NAME = ooniprobe;
 				PROVISIONING_PROFILE = "";
@@ -2065,7 +2065,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 133;
 				DEVELOPMENT_TEAM = MADPSAYN6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -2089,7 +2089,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 3.8.6;
+				MARKETING_VERSION = 3.8.7;
 				PRODUCT_BUNDLE_IDENTIFIER = org.openobservatory.ooniprobe;
 				PRODUCT_NAME = ooniprobe;
 				PROVISIONING_PROFILE = "";

diff --git a/ooniprobe/Storyboards/Dashboard.storyboard b/ooniprobe/Storyboards/Dashboard.storyboard
@@ -123,18 +123,18 @@
                                 </connections>
                             </button>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="5YP-9k-ipZ">
-                                <rect key="frame" x="145" y="97" width="124.5" height="104"/>
+                                <rect key="frame" x="145" y="97" width="124.5" height="24"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="circumvention" translatesAutoresizingMaskIntoConstraints="NO" id="win-th-HSk">
-                                        <rect key="frame" x="6" y="2" width="20" height="100"/>
+                                        <rect key="frame" x="6" y="2" width="20" height="20"/>
                                         <color key="tintColor" name="color_gray7"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="20" id="FvS-0H-Oa0"/>
                                             <constraint firstAttribute="height" constant="20" id="Lei-f5-3qf"/>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Proxy in use" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cLT-ZP-d1K">
-                                        <rect key="frame" x="31" y="2" width="87.5" height="100"/>
+                                        <rect key="frame" x="31" y="2" width="87.5" height="20"/>
                                         <fontDescription key="fontDescription" name="FiraSans-Regular" family="Fira Sans" pointSize="16"/>
                                         <color key="textColor" name="color_gray7"/>
                                         <color key="highlightedColor" name="color_gray7"/>
@@ -465,13 +465,13 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="6kJ-rx-tav">
                                                 <rect key="frame" x="0.0" y="0.0" width="72" height="32"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" tag="4" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Estimated:" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="efw-lh-Qks">
+                                                    <label opaque="NO" userInteractionEnabled="NO" tag="4" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Estimated:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="efw-lh-Qks">
                                                         <rect key="frame" x="0.0" y="0.0" width="72" height="16"/>
                                                         <fontDescription key="fontDescription" name="FiraSans-Regular" family="Fira Sans" pointSize="13"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" tag="4" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last Test:" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ovb-mc-yTr">
+                                                    <label opaque="NO" userInteractionEnabled="NO" tag="4" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last Test:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ovb-mc-yTr">
                                                         <rect key="frame" x="0.0" y="16" width="72" height="16"/>
                                                         <fontDescription key="fontDescription" name="FiraSans-Regular" family="Fira Sans" pointSize="13"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>