diff --git a/vector/build.gradle b/vector/build.gradle
index 7095189d48d..7061d855c56 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
// Note: 2 digits max for each value
ext.versionMajor = 1
ext.versionMinor = 1
-ext.versionPatch = 16
+ext.versionPatch = 19
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
@@ -36,7 +36,7 @@ def generateVersionCodeFromVersionName() {
def getVersionCode() {
if (gitBranchName() == "develop") {
- return generateVersionCodeFromTimestamp()
+ return generateVersionCodeFromTimestamp() + 1
} else {
return generateVersionCodeFromVersionName()
}
@@ -109,7 +109,7 @@ android {
ndkVersion "21.3.6528147"
defaultConfig {
- applicationId "im.vector.app"
+ applicationId "matrix.chagai.website"
// Set to API 21: see #405
minSdkVersion 21
targetSdkVersion 30
@@ -216,7 +216,7 @@ android {
buildTypes {
debug {
applicationIdSuffix ".debug"
- resValue "string", "app_name", "Element dbg"
+ resValue "string", "app_name", "Matrix Chat dbg"
resValue "bool", "debug_mode", "true"
buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
@@ -227,7 +227,7 @@ android {
}
release {
- resValue "string", "app_name", "Element"
+ resValue "string", "app_name", "Matrix Chat"
resValue "bool", "debug_mode", "false"
buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
@@ -517,3 +517,4 @@ dependencies {
exclude group: 'org.jetbrains.kotlin'
}
}
+
\ No newline at end of file
diff --git a/vector/src/gplay/release/google-services.json b/vector/src/gplay/release/google-services.json
index fb8f769f456..e8d75f79a1e 100644
--- a/vector/src/gplay/release/google-services.json
+++ b/vector/src/gplay/release/google-services.json
@@ -1,34 +1,33 @@
{
"project_info": {
- "project_number": "912726360885",
- "firebase_url": "https://vector-alpha.firebaseio.com",
- "project_id": "vector-alpha",
- "storage_bucket": "vector-alpha.appspot.com"
+ "project_number": "569936784765",
+ "project_id": "matrix-eabb0",
+ "storage_bucket": "matrix-eabb0.appspot.com"
},
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:912726360885:android:4ef8f3a0021e774d",
+ "mobilesdk_app_id": "1:569936784765:android:c4df3b7a3ac37e937bb014",
"android_client_info": {
- "package_name": "im.vector.app"
+ "package_name": "matrix.chagai.website"
}
},
"oauth_client": [
{
- "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
+ "client_id": "569936784765-tesebt4thd3skolg672kc74hhq92rj4i.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
- "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
+ "current_key": "AIzaSyBXGtAh6UBwzx9Ehrs_KrLQ5URBIc3gjl8"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
- "client_id": "912726360885-rsae0i66rgqt6ivnudu1pv4tksg9i8b2.apps.googleusercontent.com",
+ "client_id": "569936784765-tesebt4thd3skolg672kc74hhq92rj4i.apps.googleusercontent.com",
"client_type": 3
}
]
diff --git a/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
deleted file mode 100644
index a02583ec025..00000000000
--- a/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
diff --git a/vector/src/main/res/drawable/ic_launcher_background.xml b/vector/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index f58c9aeb531..00000000000
--- a/vector/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cfe52e..7353dbd1fd8 100644
--- a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cfe52e..7353dbd1fd8 100644
--- a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher.png b/vector/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 61989aa1881..00000000000
Binary files a/vector/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 1e70007a5a9..00000000000
Binary files a/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher.png b/vector/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index a8cb1278e2f..00000000000
Binary files a/vector/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index a84a5c7f0f8..00000000000
Binary files a/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 8a58336ca45..00000000000
Binary files a/vector/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index a16d061d321..00000000000
Binary files a/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index ef4922fc1d9..00000000000
Binary files a/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 75e42278dcd..00000000000
Binary files a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index fd6271c31dd..00000000000
Binary files a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 14c5fe404a8..00000000000
Binary files a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml
index 30ca8d7f562..09426530a16 100755
--- a/vector/src/main/res/values/config.xml
+++ b/vector/src/main/res/values/config.xml
@@ -4,7 +4,7 @@
- https://matrix.org
+ https://matrix.chagai.website
https://piwik.riot.im
https://riot.im/bugreports/submit
@@ -14,16 +14,15 @@
-->
- https://matrix.org/_matrix/push/v1/notify
+ https://sygnal.chagai.website/_matrix/push/v1/notify
- im.vector.app.android
+ matrix.chagai.website
- jitsi.riot.im
+ meet.chagai.website
- - matrix.org
- - gitter.im
+ - chagai.website