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 4c32fd31e..0e19e4b75 100644 Binary files a/TMessagesProj/config/release.keystore and b/TMessagesProj/config/release.keystore differ 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: {