merge latest

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 name: Publish releases
 
-on: push
+on:
+  workflow_dispatch:
 
 permissions:
   contents: read

Makefile

@@ -244,15 +244,7 @@ require-sentry:
 	@if [[ -z "$(SENTRY)" ]]; then echo 'Missing "sentry-cli" command. See sentry.io for installation instructions.'; exit 1; fi
 
 release-autoupdate: require-version
-	@TAG_COMMIT=$$(git rev-list --abbrev-commit -1 $(TAG)) && \
-	if [[ -z "$$TAG_COMMIT" ]]; then \
-		echo "Could not find given tag $(TAG)."; \
-	fi && \
-	for URL in s3://lantern/lantern_update_android_arm-$$VERSION.bz2; do \
-		NAME=$$(basename $$URL) && \
-		STRIPPED_NAME=$$(echo "$$NAME" | cut -d - -f 1 | sed s/lantern_//).bz2 && \
-		s3cmd get --force s3://$(S3_BUCKET)/$$NAME $$STRIPPED_NAME; \
-	done && \
+	@curl https://s3.amazonaws.com/lantern/lantern-installer.apk | bzip2 > update_android_arm.bz2 && \
 	$(RUBY) ./create_or_update_release.rb getlantern lantern $$VERSION update_android_arm.bz2
 
 release: require-version require-s3cmd require-wget require-lantern-binaries require-release-track release-prod copy-beta-installers-to-mirrors invalidate-getlantern-dot-org upload-aab-to-play

README.md

@@ -173,7 +173,7 @@ To publish a release on Google Play, go to the Lantern App on the [Google Play C
 
 ### Enabling Auto-Update for a Sideloaded Release
 
-Just because something's been released to prod doesn't mean clients will auto-update, there's an additional step for that.
+Just because something's been released to prod doesn't mean clients will auto-update, there's an additional step for that. The below will release the current production version to autoupdate. Please make sure the VERSION parameter matches the current production version.
 
 ```
 GH_TOKEN=<token> VERSION=7.2.0 make release-autoupdate

android/app/build.gradle

@@ -428,8 +428,6 @@ dependencies {
 
     implementation 'com.stripe:stripe-android:20.17.0'
 
-    implementation 'com.datadoghq:dd-sdk-android:1.19.3'
-
     annotationProcessor "org.androidannotations:androidannotations:$androidAnnotationsVersion"
     implementation("org.androidannotations:androidannotations-api:$androidAnnotationsVersion")
     kapt "org.androidannotations:androidannotations:$androidAnnotationsVersion"
@@ -446,6 +444,7 @@ dependencies {
     androidTestImplementation 'com.squareup.okhttp3:okhttp:4.9.2'
 
     testImplementation 'junit:junit:4.13.2'
+    testImplementation "io.mockk:mockk:1.13.5"
 
     implementation "com.github.YarikSOffice:lingver:1.3.0"
     // from https://github.com/getlantern/opus_android

android/app/src/main/AndroidManifest.xml

@@ -97,6 +97,16 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="org.getlantern.lantern.plausible.PlausibleInitializer"
+                android:value="androidx.startup" />
+        </provider>
+
         <service android:name="org.getlantern.lantern.vpn.LanternVpnService"
             android:exported="false"
             android:permission="android.permission.BIND_VPN_SERVICE"