From 7be1f092f90ce8be4069ccc6625d5aa457a35be5 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Wed, 26 Jul 2023 22:09:24 +0930
Subject: [PATCH] More Huawei stuff

---
 app/agconnect-services.json                   | 92 +++++++++++++++++++
 app/src/huawei/AndroidManifest.xml            |  4 +-
 .../HuaweiPushNotificationService.kt          |  3 +-
 3 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 app/agconnect-services.json

diff --git a/app/agconnect-services.json b/app/agconnect-services.json
new file mode 100644
index 0000000000..99e95057e4
--- /dev/null
+++ b/app/agconnect-services.json
@@ -0,0 +1,92 @@
+{
+  "agcgw":{
+    "backurl":"connect-dre.hispace.hicloud.com",
+    "url":"connect-dre.dbankcloud.cn",
+    "websocketbackurl":"connect-ws-dre.hispace.dbankcloud.com",
+    "websocketurl":"connect-ws-dre.hispace.dbankcloud.cn"
+  },
+  "agcgw_all":{
+    "CN":"connect-drcn.dbankcloud.cn",
+    "CN_back":"connect-drcn.hispace.hicloud.com",
+    "DE":"connect-dre.dbankcloud.cn",
+    "DE_back":"connect-dre.hispace.hicloud.com",
+    "RU":"connect-drru.hispace.dbankcloud.ru",
+    "RU_back":"connect-drru.hispace.dbankcloud.cn",
+    "SG":"connect-dra.dbankcloud.cn",
+    "SG_back":"connect-dra.hispace.hicloud.com"
+  },
+  "websocketgw_all":{
+    "CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+    "CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+    "DE":"connect-ws-dre.hispace.dbankcloud.cn",
+    "DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+    "RU":"connect-ws-drru.hispace.dbankcloud.ru",
+    "RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+    "SG":"connect-ws-dra.hispace.dbankcloud.cn",
+    "SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+  },
+  "client":{
+    "cp_id":"30061000024605000",
+    "product_id":"99536292102650699",
+    "client_id":"993355872258247936",
+    "client_secret":"0A83DC166FBF0696B884D38830E0B90AE8BBFF2D9CA8C26C9D9DA26816C2A9E3",
+    "project_id":"99536292102650699",
+    "app_id":"107146885",
+    "api_key":"DAEDAPld5VAZXpjfD+g0PwlXfya5ykPMYTMRYkySUjGfJg055ijAFNZBUtcykDPWZiaUcc4Mo9oJqmooL6HT8n4toO5COlWZjkqGXA==",
+    "package_name":"network.loki.messenger"
+  },
+  "oauth_client":{
+    "client_id":"107146885",
+    "client_type":1
+  },
+  "app_info":{
+    "app_id":"107146885",
+    "package_name":"network.loki.messenger"
+  },
+  "service":{
+    "analytics":{
+      "collector_url":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+      "collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+      "collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+      "collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+      "collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+      "resource_id":"p1",
+      "channel_id":""
+    },
+    "search":{
+      "url":"https://search-dre.cloud.huawei.com"
+    },
+    "cloudstorage":{
+      "storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+      "storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+      "storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+      "storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+      "storage_url_de":"https://ops-dre.agcstorage.link",
+      "storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+      "storage_url_sg":"https://ops-dra.agcstorage.link",
+      "storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+      "storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+    },
+    "ml":{
+      "mlservice_url":"ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
+    }
+  },
+  "region":"DE",
+  "configuration_version":"3.0",
+  "appInfos":[
+    {
+      "package_name":"network.loki.messenger",
+      "client":{
+        "app_id":"107146885"
+      },
+      "app_info":{
+        "package_name":"network.loki.messenger",
+        "app_id":"107146885"
+      },
+      "oauth_client":{
+        "client_type":1,
+        "client_id":"107146885"
+      }
+    }
+  ]
+}
diff --git a/app/src/huawei/AndroidManifest.xml b/app/src/huawei/AndroidManifest.xml
index 4745c454b2..57279978c1 100644
--- a/app/src/huawei/AndroidManifest.xml
+++ b/app/src/huawei/AndroidManifest.xml
@@ -8,9 +8,9 @@
             android:enabled="true"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+                <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
             </intent-filter>
         </service>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/huawei/kotlin/org/thoughtcrime/securesms/notifications/HuaweiPushNotificationService.kt b/app/src/huawei/kotlin/org/thoughtcrime/securesms/notifications/HuaweiPushNotificationService.kt
index 507787123c..640caf3cf4 100644
--- a/app/src/huawei/kotlin/org/thoughtcrime/securesms/notifications/HuaweiPushNotificationService.kt
+++ b/app/src/huawei/kotlin/org/thoughtcrime/securesms/notifications/HuaweiPushNotificationService.kt
@@ -17,7 +17,8 @@ class HuaweiPushNotificationService: HmsMessageService() {
         pushManager.refresh(true)
     }
     override fun onMessageReceived(message: RemoteMessage?) {
-        pushHandler.onPush(message?.dataOfMap)
+        TODO("Huawei works!")
+//        pushHandler.onPush(message?.dataOfMap)
     }
     override fun onDeletedMessages() {
         pushManager.refresh(true)