From fb19bf4f1ad8a1cf072af43397e79ab4592c4c0f Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Tue, 28 Jan 2020 15:01:42 +0800
Subject: [PATCH] Build changes

---
 TMessagesProj/appcenter-pre-build.sh          |   2 +
 TMessagesProj/build.gradle                    |  30 +++++++----
 TMessagesProj/config/release.keystore         | Bin 2623 -> 2076 bytes
 TMessagesProj/google-services.json            |  49 +++++++++++++++---
 .../org/telegram/messenger/BuildVars.java     |   2 +-
 .../nekogram/NekoSettingsActivity.java        |   5 ++
 6 files changed, 68 insertions(+), 20 deletions(-)
 create mode 100644 TMessagesProj/appcenter-pre-build.sh

diff --git a/TMessagesProj/appcenter-pre-build.sh b/TMessagesProj/appcenter-pre-build.sh
new file mode 100644
index 000000000..5b2721dc9
--- /dev/null
+++ b/TMessagesProj/appcenter-pre-build.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+$ANDROID_HOME/tools/bin/sdkmanager "ndk;20.0.5594570"
\ No newline at end of file
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 5bd79987e..25fdc153d 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -65,19 +65,27 @@ android {
     }
 
     signingConfigs {
-        Properties properties = new Properties()
-        properties.load(project.rootProject.file('local.properties').newDataInputStream())
+        def keystorePwd = null
+        def alias = null
+        def pwd = null
+        if (project.rootProject.file('local.properties').exists()) {
+            Properties properties = new Properties()
+            properties.load(project.rootProject.file('local.properties').newDataInputStream())
+            keystorePwd = properties.getProperty("RELEASE_STORE_PASSWORD")
+            alias = properties.getProperty("RELEASE_KEY_ALIAS")
+            pwd = properties.getProperty("RELEASE_KEY_PASSWORD")
+        }
         release {
             storeFile file("config/release.keystore")
-            storePassword properties.getProperty("RELEASE_STORE_PASSWORD")
-            keyAlias properties.getProperty("RELEASE_KEY_ALIAS")
-            keyPassword properties.getProperty("RELEASE_KEY_PASSWORD")
+            storePassword keystorePwd != null ? keystorePwd : System.getenv("KEYSTORE_PASS")
+            keyAlias alias != null ? alias : System.getenv("ALIAS_NAME")
+            keyPassword pwd != null ? pwd : System.getenv("ALIAS_PASS")
         }
         debug {
             storeFile file("config/release.keystore")
-            storePassword properties.getProperty("RELEASE_STORE_PASSWORD")
-            keyAlias properties.getProperty("RELEASE_KEY_ALIAS")
-            keyPassword properties.getProperty("RELEASE_KEY_PASSWORD")
+            storePassword keystorePwd != null ? keystorePwd : System.getenv("KEYSTORE_PASS")
+            keyAlias alias != null ? alias : System.getenv("ALIAS_NAME")
+            keyPassword pwd != null ? pwd : System.getenv("ALIAS_PASS")
         }
     }
 
@@ -87,7 +95,7 @@ android {
             debuggable true
             jniDebuggable true
             signingConfig signingConfigs.debug
-            //applicationIdSuffix ".beta"
+            applicationIdSuffix ".beta"
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -134,7 +142,7 @@ android {
             debuggable false
             jniDebuggable false
             signingConfig signingConfigs.debug
-            //applicationIdSuffix ".beta"
+            applicationIdSuffix ".beta"
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -290,7 +298,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 10 * 1851
+    defaultConfig.versionCode = 10 * 1852
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
diff --git a/TMessagesProj/config/release.keystore b/TMessagesProj/config/release.keystore
index 4c32fd31eca1db3836f220b60b96c8bd2fcc3dba..0e19e4b7580e050f0d87171833a902528817fdaf 100644
GIT binary patch
literal 2076
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
BwD14`

literal 2623
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
Q*ZADrHu?%ACqozg1?gqT+W-In

diff --git a/TMessagesProj/google-services.json b/TMessagesProj/google-services.json
index 32d883aba..d7c090b1c 100755
--- a/TMessagesProj/google-services.json
+++ b/TMessagesProj/google-services.json
@@ -21,19 +21,52 @@
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyAC4QRIDv2Tjp79zR2aqFgzYd_s1d_nsHI"
+          "current_key": "AIzaSyCGMAA5lSWvRAgaVtF1-Bh3Di07zePnUbA"
+        },
+        {
+          "current_key": "AIzaSyB1FZcptgvQQZcUrPV7cJmjG5zkbCWxiK0"
         }
       ],
       "services": {
-        "analytics_service": {
-          "status": 1
-        },
         "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
+          "other_platform_oauth_client": [
+            {
+              "client_id": "551995224478-u59bvc0oqd8ma9499rvo9s5vvgofrd0f.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:551995224478:android:99f9755a158003cb3a268f",
+        "android_client_info": {
+          "package_name": "tw.nekomimi.nekogram.beta"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "551995224478-u59bvc0oqd8ma9499rvo9s5vvgofrd0f.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCGMAA5lSWvRAgaVtF1-Bh3Di07zePnUbA"
         },
-        "ads_service": {
-          "status": 2
+        {
+          "current_key": "AIzaSyB1FZcptgvQQZcUrPV7cJmjG5zkbCWxiK0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "551995224478-u59bvc0oqd8ma9499rvo9s5vvgofrd0f.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
         }
       }
     }
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
index 9019e0ca6..703ca9b9b 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
@@ -19,7 +19,7 @@ public class BuildVars {
     public static boolean USE_CLOUD_STRINGS = true;
     public static boolean CHECK_UPDATES = true;
     public static boolean TON_WALLET_STANDALONE = false;
-    public static int BUILD_VERSION = 1851;
+    public static int BUILD_VERSION = 1852;
     public static String BUILD_VERSION_STRING = "5.14.0";
     public static int APP_ID = 336779; //obtain your own APP_ID at https://core.telegram.org/api/obtaining_api_id
     public static String APP_HASH = "b91eefacc86747c068c8d8a16b41500d"; //obtain your own APP_HASH at https://core.telegram.org/api/obtaining_api_id
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoSettingsActivity.java
index ea3b75cce..4bbd15806 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoSettingsActivity.java
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoSettingsActivity.java
@@ -679,6 +679,11 @@ public class NekoSettingsActivity extends BaseFragment {
         public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
             switch (holder.getItemViewType()) {
                 case 1: {
+                    if (position == experiment2Row) {
+                        holder.itemView.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
+                    } else {
+                        holder.itemView.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider, Theme.key_windowBackgroundGrayShadow));
+                    }
                     break;
                 }
                 case 2: {