diff --git a/CHANGES.rst b/CHANGES.rst
index dc3c6c7cb0..ea8018c9b3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,10 @@
-Changes in Riot 0.9.13 (2020-XX-XX)
+Changes in Riot 0.9.13 (2020-08-25)
===================================================
+Riot-Android is now deprecated, and not maintained by the core team anymore.
+The version 0.9.13 contains code to inform F-Droid users that the application is deprecated and they have to install Element Android instead (#3507).
+This branch will never be merged on develop.
+
MatrixSdk 🚀:
- Upgrade MatrixSdk to version 0.X.Y.
- Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.X.Y
diff --git a/build.gradle b/build.gradle
index 4c1a58015c..fab7585a22 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
// global properties used in sub modules
ext {
versionCodeProp = 90913
- versionNameProp = "0.9.13-dev"
+ versionNameProp = "0.9.13"
versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
buildNumberProp = "${versionBuild}"
}
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 0724bb8886..f244fbf1eb 100755
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -43,6 +43,9 @@
+
+
+
/* DO NOT COMMIT activity.finish() */ }
+ setNeutralButton(R.string.element_disclaimer_uninstall_button) { _, _ -> uninstall(activity) }
+ }
+ }
+ .setPositiveButton(R.string.element_disclaimer_positive_button) { _, _ ->
+ openPlayStore(activity, "im.vector.app")
+ }
+ .show()
+}
+
+private fun uninstall(activity: Activity) {
+ @Suppress("DEPRECATION")
+ val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE)
+ intent.data = Uri.parse("package:" + BuildConfig.APPLICATION_ID)
+ try {
+ activity.startActivity(intent)
+ } catch (anfe: ActivityNotFoundException) {
+ activity.toast(R.string.error_no_external_application_found)
+ }
+}
diff --git a/vector/src/main/res/drawable-hdpi/riot_to_element.png b/vector/src/main/res/drawable-hdpi/riot_to_element.png
new file mode 100644
index 0000000000..59b3e89f9f
Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/riot_to_element.png differ
diff --git a/vector/src/main/res/drawable-mdpi/riot_to_element.png b/vector/src/main/res/drawable-mdpi/riot_to_element.png
new file mode 100644
index 0000000000..5c06afa1a9
Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/riot_to_element.png differ
diff --git a/vector/src/main/res/drawable-xhdpi/riot_to_element.png b/vector/src/main/res/drawable-xhdpi/riot_to_element.png
new file mode 100644
index 0000000000..6d41a437d1
Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/riot_to_element.png differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_to_element.png b/vector/src/main/res/drawable-xxhdpi/riot_to_element.png
new file mode 100644
index 0000000000..ffff42fab6
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/riot_to_element.png differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/riot_to_element.png b/vector/src/main/res/drawable-xxxhdpi/riot_to_element.png
new file mode 100644
index 0000000000..19c3b765ef
Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/riot_to_element.png differ
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
new file mode 100644
index 0000000000..c3e81af0de
--- /dev/null
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index d7871121ab..b11affc183 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1568,4 +1568,10 @@ Why choose Riot.im?
You are currently sharing email addresses or phone numbers on the identity server %1$s. You will need to reconnect to %2$s to stop sharing them.
Agree to the identity server (%s) Terms of Service to allow yourself to be discoverable by email address or phone number.
+ Riot is now Element!
+ We’re excited to announce we’ve changed name!\n\nYou have to install the new Element Android application and sign in again.
+ Later
+ Get Element
+ Uninstall
+