Merge pull request #33 from greatfire/4.0-updates

4.0 updates
greatfire · Feb 27, 2023 · b552566 · b552566
2 parents 26201c5 + ed3d6ee
commit b552566
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,3 +1,7 @@
+import com.android.tools.profgen.ArtProfileKt
+import com.android.tools.profgen.ArtProfileSerializer
+import com.android.tools.profgen.DexFile
+
 plugins {
     id 'com.android.application'
     id 'com.google.gms.google-services'
@@ -50,9 +54,9 @@ android {
         targetSdkVersion 33
         // current: targetSdkVersion 31
         // TODO: update versionName with each release
-        versionName "3.9"
+        versionName "4.0"
         // TODO: update versionCode with each PR
-        versionCode 100390
+        versionCode 100400
         testApplicationId 'org.greatfire.wikiunblocked.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -177,7 +181,7 @@ android {
         fdroid {
             applicationId 'org.greatfire.wikiunblocked.fdroid'
             // static string for fdroid repo
-            versionName '3.9-fdroid'
+            versionName '4.0-fdroid'
             // TODO: see above re: signing code
             // signingConfig signingConfigs.prod
         }
@@ -353,9 +357,34 @@ dependencies {
     // implementation files('libs/envoy-debug.aar')
     // implementation files('libs/IEnvoyProxy.aar')
     // use maven dependencies to support automation
-    implementation 'org.greatfire.envoy:cronet:102.0.5005.41'
-    implementation 'org.greatfire:envoy:102.0.5005.41.7'
-    implementation 'org.greatfire:IEnvoyProxy:1.2.1'
+    implementation 'org.greatfire.envoy:cronet:102.0.5005.195'
+    implementation 'org.greatfire:envoy:102.0.5005.195'
+    implementation 'org.greatfire:IEnvoyProxy:1.3.1'
+}
+
+project.afterEvaluate {
+    tasks.each { task ->
+        if (task.name.startsWith("compile") && task.name.endsWith("ReleaseArtProfile")) {
+            task.doLast {
+                outputs.files.each { file ->
+                    if (file.name.endsWith(".profm")) {
+                        println("Sorting ${file} ...")
+                        def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
+                        def profile = ArtProfileKt.ArtProfile(file)
+                        def keys = new ArrayList(profile.profileData.keySet())
+                        def sortedData = new LinkedHashMap()
+                        Collections.sort keys, new DexFile.Companion()
+                        keys.each { key -> sortedData[key] = profile.profileData[key] }
+                        new FileOutputStream(file).with {
+                            write(version.magicBytes$profgen)
+                            write(version.versionBytes$profgen)
+                            version.write$profgen(it, sortedData, "")
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 /* TODO: see above re: signing code

diff --git a/app/src/fdroid/java/org/wikipedia/settings/Prefs.kt b/app/src/fdroid/java/org/wikipedia/settings/Prefs.kt
@@ -676,4 +676,14 @@ object Prefs {
     var readingListRecentReceivedId
         get() = PrefsIoUtil.getLong(R.string.preference_key_reading_lists_recent_receive_id, -1)
         set(value) = PrefsIoUtil.setLong(R.string.preference_key_reading_lists_recent_receive_id, value)
+
+    var validServices
+        get() = JsonUtil.decodeFromString<List<String>>(PrefsIoUtil.getString(R.string.preference_key_valid_services, null))
+            ?: emptyList()
+        set(list) = PrefsIoUtil.setString(R.string.preference_key_valid_services, JsonUtil.encodeToString(list))
+
+    var invalidServices
+        get() = JsonUtil.decodeFromString<List<String>>(PrefsIoUtil.getString(R.string.preference_key_invalid_services, null))
+            ?: emptyList()
+        set(list) = PrefsIoUtil.setString(R.string.preference_key_invalid_services, JsonUtil.encodeToString(list))
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -407,12 +407,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-
-        <service
-            android:name="org.greatfire.envoy.ShadowsocksService"
-            android:stopWithTask="false"
-            android:exported="false"
-            android:isolatedProcess="false" />
 
         <service
             android:name="org.greatfire.envoy.NetworkIntentService"

diff --git a/app/src/main/cpp/secrets.cpp b/app/src/main/cpp/secrets.cpp
@@ -128,6 +128,6 @@ Java_org_greatfire_wikiunblocked_Secrets_getdefProxy(
         JNIEnv* pEnv,
         jobject pThis,
         jstring packageName) {
-     char obfuscatedSecret[] = { 0x5e, 0x15, 0x47, 0x49, 0x10, 0xd, 0x16, 0x49, 0x1a, 0x17, 0x5d, 0x45, 0x5d, 0x0, 0x5a, 0x4, 0x7, 0x55, 0x11, 0x18, 0x56, 0x57, 0xf, 0x4a, 0x14, 0xd, 0x58, 0x5e, 0x47, 0x51, 0x5c, 0x5a, 0x58, 0x1a, 0x1b, 0xc, 0x40, 0x40, 0x45, 0x44, 0x5e, 0x18, 0x1d, 0x1d, 0x18, 0x4, 0x45, 0x5e, 0x52, 0xb, 0x53, 0x52, 0x5b, 0x40, 0x4d, 0x5b, 0xa, 0x5d, 0x1a, 0x16, 0x59, 0x5f, 0x5c, 0x41, 0x53, 0x5, 0x5a, 0x58, 0x4c, 0x1b, 0x51, 0x12, 0x16, 0x49, 0x4b, 0xf, 0x1d, 0x4c, 0x48, 0x48, 0x7, 0x49, 0xa, 0x55, 0x5d, 0x5a, 0x7, 0x9, 0x17, 0x4a, 0x50, 0x58, 0x5a, 0x1b, 0x4f, 0x5a, 0x52, 0x5c, 0x47, 0x1, 0x50, 0x5d, 0x54, 0x18, 0x48, 0x5f, 0x46, 0x10, 0x46, 0x12, 0xf, 0x1e, 0x1e, 0x1b, 0x1f, 0x4f, 0x42, 0x4e, 0xb, 0x4d, 0x4, 0x5e, 0x52, 0x2, 0x45, 0x5a, 0x1b, 0x52, 0x59, 0xc, 0x1c, 0x4e, 0xa, 0x5c, 0x50, 0x16, 0x7, 0x5d, 0x51, 0x54, 0x1d, 0x4f, 0x5a, 0x12, 0x16, 0x49, 0x16, 0xc, 0x1a, 0x17, 0x1b, 0x4b, 0x1b, 0x11, 0x49, 0x5f, 0x42, 0x55, 0x56, 0x54, 0x5a, 0x40, 0x59, 0x4a, 0x57, 0x5b, 0x58, 0x18, 0x13, 0x5e, 0x59, 0xd, 0x46, 0x4, 0x51, 0x58, 0x50, 0x4c, 0x1d, 0x5f, 0x43, 0x40, 0x13, 0x4b, 0x5f, 0x1f, 0x1a, 0x1b, 0x1e, 0x4c, 0x40, 0x4b, 0x5e, 0x14, 0x52, 0x57, 0x4, 0x54, 0x4c, 0x8, 0x4c, 0x5a, 0x57, 0x58, 0x1d, 0x14, 0x5b, 0xd, 0xb, 0x49, 0x0, 0x52, 0x5c, 0x59, 0x4d, 0x49, 0xb, 0x10, 0x47, 0x47, 0x44, 0xe, 0x17, 0x1c, 0x58, 0x57, 0x54, 0x4a, 0x6, 0xc, 0x7, 0x6, 0x55, 0x19, 0x51, 0x7, 0x19, 0x16, 0x5c, 0x5a, 0x58, 0x13, 0x54, 0x53, 0x5e, 0x55, 0x4c, 0x14, 0xd, 0x44, 0x41, 0x11, 0x43, 0xe, 0x1a, 0x1e, 0x57, 0x3, 0x50, 0x17, 0xb, 0x4f, 0x4c, 0x8, 0x4c, 0x56, 0x4a, 0x52, 0x1d, 0x14, 0x5b, 0xd, 0xb, 0x49, 0x0, 0x52, 0x5c, 0x59, 0x4d, 0x49, 0xb, 0x10, 0x47, 0x47, 0x44, 0xe, 0x17, 0x1c, 0x58, 0x57, 0x54, 0x4a, 0x55, 0x52, 0x47, 0x43, 0x4a, 0x58, 0x40, 0x3, 0x19, 0x16, 0x5c, 0x5a, 0x58, 0x13, 0x54, 0x53, 0x5e, 0x55, 0x4c, 0x14, 0xd, 0x44, 0x41, 0x11, 0x43, 0xe, 0x1a, 0x1e, 0x57, 0x3, 0x50, 0x17, 0x19, 0x5f, 0x58, 0x8, 0x5, 0x51, 0x57, 0x5b, 0x55, 0x4, 0x47, 0x7, 0xc, 0x5e, 0x4b, 0x55, 0x5a, 0x55, 0x4d, 0x12, 0xa, 0xf, 0x5a, 0x47, 0x52, 0x50, 0x51, 0x52, 0x16, 0x19, 0x5f, 0x10, 0x40, 0x44, 0x46, 0xd, 0x4b, 0x18, 0x53, 0x6, 0x55, 0x4f, 0x4f, 0x59, 0x50, 0xc, 0x5d, 0x5e, 0x5a, 0x5d, 0xd, 0x16, 0x6, 0x5f, 0x58, 0x4e, 0x47, 0x5d, 0x5e, 0x58, 0x46, 0x4, 0x57, 0x50, 0x2, 0x18, 0x15, 0xe, 0x16, 0x4d, 0x48, 0x46, 0x8, 0x4c, 0x1d, 0x7, 0x0, 0x5a, 0x4b, 0x4f, 0x40, 0x59, 0xc, 0xf, 0xa, 0x5, 0x4b, 0x5e, 0x56, 0x5b, 0x16, 0x50, 0x56, 0x58, 0x18, 0x13, 0x5d, 0x5f, 0x5c, 0x47, 0x1, 0x53, 0x5b, 0x5, 0x19, 0x4d, 0x5d, 0x45, 0x45, 0x13, 0x42, 0xd, 0x18, 0x1b, 0x2, 0x5a, 0x6, 0x1e, 0x4d, 0x8, 0x5e, 0x5c, 0x40, 0x57, 0x43, 0x4f, 0x50, 0x56, 0xe, 0x18, 0x4e, 0xf, 0x9, 0x50, 0x48, 0x50, 0x56, 0xa, 0x53, 0x49, 0x4e, 0x51, 0x11, 0x42, 0x45, 0x4b, 0x58, 0x4a, 0x4c, 0x5, 0x51, 0x54, 0x19, 0x40, 0x51, 0x52, 0x57, 0x5f, 0x5e, 0x5, 0x5a, 0x50, 0x54, 0x19, 0x7, 0x58, 0x5f, 0x4b, 0x41, 0x8, 0x5e, 0x58, 0x41, 0x6, 0x55, 0x5e, 0x56, 0x1b, 0x4f, 0x50, 0x11, 0x44, 0x45, 0x12, 0xa, 0x1b, 0x1a, 0x50, 0x54, 0x2, 0x1d, 0x40, 0xc, 0x42, 0x40, 0x13, 0x3, 0x57, 0x52, 0x5c, 0x53, 0x11, 0x57, 0x8, 0x4c, 0x5a, 0xa, 0x5b, 0x1a, 0x4f, 0xb, 0xe, 0xa, 0x14, 0x56, 0x53, 0x5e, 0x55, 0x17, 0x1f, 0x51, 0x41, 0x43, 0x14, 0x47, 0xe, 0x1a, 0x18, 0x5, 0x55, 0x51, 0x4a, 0x55, 0x9, 0x40, 0x5e, 0x5a, 0x6, 0x5f, 0x50, 0x19, 0x57, 0xc, 0x55, 0x4a, 0x47, 0x5c, 0xa, 0x59, 0x44, 0x50, 0x55, 0x5f, 0x0, 0x1c, 0x15, 0xb, 0x43, 0x4d, 0x16, 0x11, 0x3, 0x17, 0x1a, 0x53, 0x1, 0x51, 0x48, 0x6, 0x4c, 0x1c, 0x57, 0x5a, 0x4f, 0x3, 0xb, 0x4, 0x4a, 0x50, 0x58, 0x5a, 0x1b, 0x4f, 0x5a, 0x52, 0x5c, 0x47, 0x1, 0x50, 0x5d, 0x54, 0x18, 0x48, 0x5f, 0x46, 0x10, 0x46, 0x12, 0xf, 0x1e, 0x1e, 0x2, 0x53, 0x54, 0x19, 0x5c, 0x16, 0x41, 0x10, 0x58, 0x40, 0x0, 0x5e, 0x43, 0x50, 0x58, 0x18, 0x2, 0x5c, 0x54, 0x4c, 0x40, 0x50, 0xd, 0xb, 0x49, 0x5d, 0x51, 0x5b, 0x2, 0x1d, 0x4a, 0xa, 0x40, 0x16, 0x42, 0x50, 0x4a, 0xb, 0x4, 0x59, 0x4b, 0x1c, 0x6, 0x4, 0xd, 0x16, 0x2, 0xf, 0x7, 0x19, 0x52, 0x7, 0x1a, 0x7, 0x7, 0x5c, 0xd, 0x1, 0x56, 0x5, 0x53, 0x6, 0xe, 0x5e, 0x1, 0x57, 0x44, 0xa, 0x41, 0x33, 0x59, 0x54, 0x57, 0x54, 0x13, 0x4, 0x73, 0x40, 0x52, 0x53, 0x54, 0x5c, 0x56, 0x17, 0x52, 0x40, 0xf, 0x17, 0x4d, 0x50, 0x5c, 0x57, 0x54, 0x41, 0x9, 0x13, 0x4c, 0x50, 0x7b, 0x40, 0x14, 0x14, 0x57, 0x10, 0x16, 0x47, 0x47, 0xd, 0x1b, 0x17, 0x2, 0xa, 0xc, 0x19, 0x55, 0x2, 0x6, 0x1b, 0x3, 0x56, 0x19, 0x0, 0x55, 0x7, 0x5b, 0x4, 0x1, 0x1, 0x53, 0x3, 0x8, 0x5e, 0x50, 0x5e, 0x5a, 0x1, 0x5, 0x57, 0x54, 0x9, 0x50, 0x6, 0x1c, 0x57, 0x52, 0x6, 0x5a, 0x4e, 0x3, 0x8, 0x51, 0x4, 0x14, 0x0, 0x53, 0x0, 0x53, 0x1f, 0x56, 0x5a, 0xe, 0x53, 0x53, 0x1, 0x5a, 0x57, 0x4, 0x5a, 0x5, 0x52, 0x1b, 0x41, 0x6, 0x4f, 0x56, 0x5a, 0x5d, 0x56, 0x10, 0xe, 0x1b, 0x1a, 0x6, 0x57, 0xe, 0x1c, 0x55, 0x0, 0x53, 0x1b, 0x7, 0x2, 0x4d, 0x3, 0x6, 0x7, 0xe, 0x52, 0xe, 0x57, 0x8, 0x0, 0x5e, 0x59, 0x50, 0x8, 0x53, 0x52, 0x54, 0x51, 0xc, 0x5a, 0x53, 0xa, 0x4b, 0x3, 0xa, 0xd, 0x56, 0x1f, 0x57, 0x3, 0x51, 0x4, 0x14, 0x5d, 0x50, 0x7, 0x8, 0x4f, 0x55, 0x5b, 0x53, 0x5, 0x52, 0x3, 0x56, 0xd, 0x52, 0x0, 0x54, 0x56 };
+     char obfuscatedSecret[] = { 0x5e, 0x15, 0x47, 0x49, 0x10, 0xd, 0x16, 0x49, 0x1a, 0x17, 0x5d, 0x45, 0x5d, 0x0, 0x5a, 0x4, 0x7, 0x55, 0x11, 0x18, 0x56, 0x57, 0xf, 0x4a, 0x14, 0xd, 0x58, 0x5e, 0x47, 0x51, 0x5c, 0x5a, 0x58, 0x1a, 0x1b, 0xc, 0x40, 0x40, 0x45, 0x44, 0x5e, 0x18, 0x1d, 0x1d, 0x18, 0x4, 0x45, 0x5e, 0x52, 0xb, 0x53, 0x52, 0x5b, 0x40, 0x4d, 0x5b, 0xa, 0x5d, 0x1a, 0x16, 0x59, 0x5f, 0x5c, 0x41, 0x53, 0x5, 0x5a, 0x58, 0x4c, 0x1b, 0x51, 0x12, 0x16, 0x49, 0x4b, 0xf, 0x1d, 0x4c, 0x48, 0x48, 0x7, 0x49, 0xa, 0x55, 0x5d, 0x5a, 0x7, 0x9, 0x17, 0x4a, 0x50, 0x58, 0x5a, 0x1b, 0x4f, 0x5a, 0x52, 0x5c, 0x47, 0x1, 0x50, 0x5d, 0x54, 0x18, 0x48, 0x5f, 0x46, 0x10, 0x46, 0x12, 0xf, 0x1e, 0x1e, 0x1b, 0x1f, 0x4f, 0x42, 0x4e, 0xb, 0x4d, 0x4, 0x5e, 0x52, 0x2, 0x45, 0x5a, 0x1b, 0x52, 0x59, 0xc, 0x1c, 0x4e, 0xa, 0x5c, 0x50, 0x16, 0x7, 0x5d, 0x51, 0x54, 0x1d, 0x4f, 0x5a, 0x12, 0x16, 0x49, 0x16, 0xc, 0x1a, 0x17, 0x1b, 0x4b, 0x1b, 0x11, 0x49, 0x5f, 0x42, 0x55, 0x56, 0x54, 0x5a, 0x40, 0x59, 0x4a, 0x57, 0x5b, 0x58, 0x18, 0x13, 0x5e, 0x59, 0xd, 0x46, 0x4, 0x51, 0x58, 0x50, 0x4c, 0x1d, 0x5f, 0x43, 0x40, 0x13, 0x4b, 0x5f, 0x1f, 0x1a, 0x1b, 0x1e, 0x4c, 0x40, 0x4b, 0x5e, 0x14, 0x52, 0x57, 0x4, 0x54, 0x4c, 0x8, 0x4c, 0x5a, 0x57, 0x58, 0x1d, 0x14, 0x5b, 0xd, 0xb, 0x49, 0x0, 0x52, 0x5c, 0x59, 0x4d, 0x49, 0xb, 0x10, 0x47, 0x47, 0x44, 0xe, 0x17, 0x1c, 0x55, 0x54, 0x43, 0x1, 0x47, 0x40, 0x1b, 0x4e, 0xd, 0x44, 0x5a, 0x5, 0x54, 0x4, 0x5c, 0x5d, 0x50, 0x4d, 0x52, 0x58, 0x5a, 0x1b, 0x14, 0x51, 0xe, 0x59, 0x45, 0x4, 0x54, 0x5d, 0x54, 0x1e, 0x1a, 0x9, 0x47, 0x4d, 0x13, 0x44, 0x3, 0x49, 0x4d, 0x5a, 0x57, 0x5b, 0x46, 0x6, 0x41, 0x12, 0x4c, 0x4e, 0x10, 0x45, 0x5d, 0x59, 0xc, 0x2, 0x14, 0x11, 0x1d, 0x54, 0x58, 0x59, 0x17, 0x44, 0x50, 0x5e, 0x5e, 0x14, 0x51, 0x50, 0x5c, 0x56, 0x4b, 0x1b, 0x5a, 0x10, 0x42, 0x11, 0x46, 0xb, 0x1e, 0x4c, 0x45, 0x52, 0x44, 0x40, 0xa, 0x5e, 0x1c, 0x1e, 0x4f, 0x9, 0x5f, 0x5a, 0x52, 0x48, 0x43, 0x0, 0x5d, 0x4a, 0xb, 0x52, 0x57, 0x1, 0x4c, 0x5a, 0x57, 0x58, 0x1d, 0x14, 0x5b, 0xd, 0xb, 0x49, 0x0, 0x52, 0x5c, 0x59, 0x4d, 0x49, 0xb, 0x10, 0x47, 0x47, 0x44, 0xe, 0x17, 0x1c, 0x58, 0x57, 0x54, 0x4a, 0x6, 0xc, 0x7, 0x6, 0x55, 0x19, 0x51, 0x7, 0x19, 0x16, 0x5c, 0x5a, 0x58, 0x13, 0x54, 0x53, 0x5e, 0x55, 0x4c, 0x14, 0xd, 0x44, 0x41, 0x11, 0x43, 0xe, 0x1a, 0x1e, 0x57, 0x3, 0x50, 0x17, 0xb, 0x4f, 0x4c, 0x8, 0x4c, 0x56, 0x4a, 0x52, 0x1d, 0x14, 0x5b, 0xd, 0xb, 0x49, 0x0, 0x52, 0x5c, 0x59, 0x4d, 0x49, 0xb, 0x10, 0x47, 0x47, 0x44, 0xe, 0x17, 0x1c, 0x58, 0x57, 0x54, 0x4a, 0x55, 0x52, 0x47, 0x43, 0x4a, 0x58, 0x40, 0x3, 0x19, 0x16, 0x5c, 0x5a, 0x58, 0x13, 0x54, 0x53, 0x5e, 0x55, 0x4c, 0x14, 0xd, 0x44, 0x41, 0x11, 0x43, 0xe, 0x1a, 0x1e, 0x57, 0x3, 0x50, 0x17, 0x19, 0x5f, 0x58, 0x8, 0x5, 0x51, 0x57, 0x5b, 0x55, 0x4, 0x47, 0x7, 0xc, 0x5e, 0x4b, 0x55, 0x5a, 0x55, 0x4d, 0x12, 0xa, 0xf, 0x5a, 0x47, 0x52, 0x50, 0x51, 0x52, 0x16, 0x19, 0x5f, 0x10, 0x40, 0x44, 0x46, 0xd, 0x4b, 0x18, 0x53, 0x6, 0x55, 0x4f, 0x4f, 0x59, 0x50, 0xc, 0x5d, 0x5e, 0x5a, 0x5d, 0xd, 0x16, 0x6, 0x5f, 0x58, 0x4e, 0x47, 0x5d, 0x5e, 0x58, 0x46, 0x4, 0x57, 0x50, 0x2, 0x18, 0x15, 0xe, 0x16, 0x4d, 0x48, 0x46, 0x8, 0x4c, 0x1d, 0x7, 0x0, 0x5a, 0x4b, 0x4f, 0x40, 0x59, 0xc, 0xf, 0xa, 0x5, 0x4b, 0x5e, 0x56, 0x5b, 0x16, 0x50, 0x56, 0x58, 0x18, 0x13, 0x5d, 0x5f, 0x5c, 0x47, 0x1, 0x53, 0x5b, 0x5, 0x19, 0x4d, 0x5d, 0x45, 0x45, 0x13, 0x42, 0xd, 0x18, 0x1b, 0x2, 0x5a, 0x6, 0x1e, 0x4d, 0x8, 0x5e, 0x5c, 0x40, 0x57, 0x43, 0x4f, 0x50, 0x56, 0xe, 0x18, 0x4e, 0xf, 0x9, 0x50, 0x48, 0x50, 0x56, 0xa, 0x53, 0x49, 0x4e, 0x51, 0x11, 0x42, 0x45, 0x4b, 0x58, 0x4a, 0x4c, 0x5, 0x51, 0x54, 0x19, 0x40, 0x51, 0x52, 0x57, 0x5f, 0x5e, 0x5, 0x5a, 0x50, 0x54, 0x19, 0x7, 0x58, 0x5f, 0x4b, 0x41, 0x8, 0x5e, 0x58, 0x41, 0x6, 0x55, 0x5e, 0x56, 0x1b, 0x4f, 0x50, 0x11, 0x44, 0x45, 0x12, 0xa, 0x1b, 0x1a, 0x50, 0x54, 0x2, 0x1d, 0x40, 0xc, 0x42, 0x40, 0x13, 0x3, 0x57, 0x52, 0x5c, 0x53, 0x11, 0x57, 0x8, 0x4c, 0x5a, 0xa, 0x5b, 0x1a, 0x4f, 0xb, 0xe, 0xa, 0x14, 0x56, 0x53, 0x5e, 0x55, 0x17, 0x1f, 0x51, 0x41, 0x43, 0x14, 0x47, 0xe, 0x1a, 0x18, 0x5, 0x55, 0x51, 0x4a, 0x55, 0x9, 0x40, 0x5e, 0x5a, 0x6, 0x5f, 0x50, 0x19, 0x57, 0xc, 0x55, 0x4a, 0x47, 0x5c, 0xa, 0x59, 0x44, 0x50, 0x55, 0x5f, 0x0, 0x1c, 0x15, 0xb, 0x43, 0x4d, 0x16, 0x11, 0x3, 0x17, 0x1a, 0x53, 0x1, 0x51, 0x48, 0x6, 0x4c, 0x1c, 0x57, 0x5a, 0x4f, 0x3, 0xb, 0x4, 0x4a, 0x50, 0x58, 0x5a, 0x1b, 0x4f, 0x5a, 0x52, 0x5c, 0x47, 0x1, 0x50, 0x5d, 0x54, 0x18, 0x48, 0x5f, 0x46, 0x10, 0x46, 0x12, 0xf, 0x1e, 0x1e, 0x2, 0x53, 0x54, 0x19, 0x5c, 0x16, 0x41, 0x10, 0x58, 0x40, 0x0, 0x5e, 0x43, 0x50, 0x58, 0x18, 0x2, 0x5c, 0x54, 0x4c, 0x40, 0x50, 0xd, 0xb, 0x49, 0x5d, 0x51, 0x5b, 0x2, 0x1d, 0x4a, 0xa, 0x40, 0x16, 0x42, 0x50, 0x4a, 0xb, 0x4, 0x59, 0x4b, 0x1c, 0x6, 0x4, 0xd, 0x16, 0x2, 0xf, 0x7, 0x19, 0x52, 0x7, 0x1a, 0x7, 0x7, 0x5c, 0xd, 0x1, 0x56, 0x5, 0x53, 0x6, 0xe, 0x5e, 0x1, 0x57, 0x44, 0xa, 0x41, 0x33, 0x59, 0x54, 0x57, 0x54, 0x13, 0x4, 0x73, 0x40, 0x52, 0x53, 0x54, 0x5c, 0x56, 0x17, 0x52, 0x40, 0xf, 0x17, 0x4d, 0x50, 0x5c, 0x57, 0x54, 0x41, 0x9, 0x13, 0x4c, 0x50, 0x7b, 0x40, 0x14, 0x14, 0x57, 0x10, 0x16, 0x47, 0x47, 0xd, 0x1b, 0x17, 0x2, 0xa, 0xc, 0x19, 0x55, 0x2, 0x6, 0x1b, 0x3, 0x56, 0x19, 0x0, 0x55, 0x7, 0x5b, 0x4, 0x1, 0x1, 0x53, 0x3, 0x8, 0x5e, 0x50, 0x5e, 0x5a, 0x1, 0x5, 0x57, 0x54, 0x9, 0x50, 0x6, 0x1c, 0x57, 0x52, 0x6, 0x5a, 0x4e, 0x3, 0x8, 0x51, 0x4, 0x14, 0x0, 0x53, 0x0, 0x53, 0x1f, 0x56, 0x5a, 0xe, 0x53, 0x53, 0x1, 0x5a, 0x57, 0x4, 0x5a, 0x5, 0x52, 0x1b, 0x41, 0x6, 0x4f, 0x56, 0x5a, 0x5d, 0x56, 0x10, 0xe, 0x1b, 0x1a, 0x6, 0x57, 0xe, 0x1c, 0x55, 0x0, 0x53, 0x1b, 0x7, 0x2, 0x4d, 0x3, 0x6, 0x7, 0xe, 0x52, 0xe, 0x57, 0x8, 0x0, 0x5e, 0x59, 0x50, 0x8, 0x53, 0x52, 0x54, 0x51, 0xc, 0x5a, 0x53, 0xa, 0x4b, 0x3, 0xa, 0xd, 0x56, 0x1f, 0x57, 0x3, 0x51, 0x4, 0x14, 0x5d, 0x50, 0x7, 0x8, 0x4f, 0x55, 0x5b, 0x53, 0x5, 0x52, 0x3, 0x56, 0xd, 0x52, 0x0, 0x54, 0x56 };
      return getOriginalKey(obfuscatedSecret, sizeof(obfuscatedSecret), packageName, pEnv);
 }
diff --git a/app/src/main/java/org/wikipedia/main/MainActivity.kt b/app/src/main/java/org/wikipedia/main/MainActivity.kt
@@ -71,9 +71,8 @@ class MainActivity : SingleFragmentActivity<MainFragment>(), MainFragment.Callba
     private val validServices = mutableListOf<String>()
     private val invalidServices = mutableListOf<String>()
 
-    // this receiver should be triggered by a success or failure broadcast from either the
-    // NetworkIntentService (indicating whether submitted urls were valid or invalid) or the
-    // ShadowsocksService (indicating whether the service was successfully started or not
+    // this receiver should be triggered by a success or failure broadcast from the
+    // NetworkIntentService (indicating whether submitted urls were valid or invalid)
     private val mBroadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
             if (intent != null && context != null) {