From 37587e960f82872a715a85c9b4c30ea739891475 Mon Sep 17 00:00:00 2001 From: Matthew N Bogner Date: Thu, 16 Feb 2023 10:09:57 -0800 Subject: [PATCH 1/6] updated parameters --- app/src/main/cpp/secrets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/cpp/secrets.cpp b/app/src/main/cpp/secrets.cpp index 7c4e9cda53a..11d294edc30 100644 --- 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); } From 8fd6e5095211fdd0877aa03b79abc3088b10d846 Mon Sep 17 00:00:00 2001 From: Matthew N Bogner Date: Fri, 17 Feb 2023 17:15:12 -0800 Subject: [PATCH 2/6] added sorting task to gradle file to support reproducible builds --- app/build.gradle | 29 +++++++++++++++++++ .../java/org/wikipedia/settings/Prefs.kt | 10 +++++++ 2 files changed, 39 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 859b2be9bd5..d7e95f84ab8 100644 --- 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' @@ -358,6 +362,31 @@ dependencies { implementation 'org.greatfire:IEnvoyProxy:1.2.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 private setSigningConfigKey(config, Properties props) { if(props != null) { diff --git a/app/src/fdroid/java/org/wikipedia/settings/Prefs.kt b/app/src/fdroid/java/org/wikipedia/settings/Prefs.kt index 4ef439e681d..d109b9a0e39 100644 --- 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>(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>(PrefsIoUtil.getString(R.string.preference_key_invalid_services, null)) + ?: emptyList() + set(list) = PrefsIoUtil.setString(R.string.preference_key_invalid_services, JsonUtil.encodeToString(list)) } From e245784e4ad2bc50ba25359c0b663e07a6f1450d Mon Sep 17 00:00:00 2001 From: Matthew N Bogner Date: Mon, 20 Feb 2023 16:47:00 -0800 Subject: [PATCH 3/6] removed shadowsocks support --- app/src/main/AndroidManifest.xml | 6 ------ app/src/main/java/org/wikipedia/main/MainActivity.kt | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a0370d22f4c..dddf423ab69 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -407,12 +407,6 @@ - - (), MainFragment.Callba private val validServices = mutableListOf() private val invalidServices = mutableListOf() - // 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) { From 6d57f6d90567e95d295e17ce2376b44ffc169950 Mon Sep 17 00:00:00 2001 From: Matthew N Bogner Date: Wed, 22 Feb 2023 15:57:44 -0800 Subject: [PATCH 4/6] update dependencies --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d7e95f84ab8..3efe8e4b5a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -357,8 +357,8 @@ 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.envoy:cronet:102.0.5005.195' + implementation 'org.greatfire:envoy:102.0.5005.195' implementation 'org.greatfire:IEnvoyProxy:1.2.1' } From 9205422cd606142f39aa666fa6ee181a3c21f2cb Mon Sep 17 00:00:00 2001 From: Matthew N Bogner Date: Wed, 22 Feb 2023 16:01:45 -0800 Subject: [PATCH 5/6] increment version --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3efe8e4b5a4..229fc79c1e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,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' @@ -181,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 } From ed3d6ee974cb3a3b59fe9f20bdf375abd1b04d17 Mon Sep 17 00:00:00 2001 From: Matthew N Bogner Date: Thu, 23 Feb 2023 17:36:57 -0800 Subject: [PATCH 6/6] update ienvoyproxy dependency --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 229fc79c1e2..b5b13a93e61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -359,7 +359,7 @@ dependencies { // use maven dependencies to support automation implementation 'org.greatfire.envoy:cronet:102.0.5005.195' implementation 'org.greatfire:envoy:102.0.5005.195' - implementation 'org.greatfire:IEnvoyProxy:1.2.1' + implementation 'org.greatfire:IEnvoyProxy:1.3.1' } project.afterEvaluate {