From fde09b4a94dcacada99ae05b73f552ea7eb6a3ca Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 28 Mar 2019 17:51:54 +0100
Subject: [PATCH] Forbid backup

---
 app/src/main/AndroidManifest.xml              | 10 +++++++---
 .../src/main/res/values/strings.xml           | 19 -------------------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 matrix-sdk-android-rx/src/main/res/values/strings.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 319575c102..9155aa00d2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="im.vector.riotredesign">
 
 
@@ -7,12 +8,13 @@
 
     <application
         android:name=".Riot"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Light">
+        android:theme="@style/AppTheme.Light"
+        tools:replace="android:allowBackup">
 
         <activity
             android:name=".features.MainActivity"
@@ -27,7 +29,9 @@
         <activity android:name=".features.home.HomeActivity" />
         <activity android:name=".features.login.LoginActivity" />
         <activity android:name=".features.media.MediaViewerActivity" />
-        <activity android:name=".features.rageshake.BugReportActivity" />
+        <activity
+            android:name=".features.rageshake.BugReportActivity"
+            android:label="@string/title_activity_bug_report" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/matrix-sdk-android-rx/src/main/res/values/strings.xml b/matrix-sdk-android-rx/src/main/res/values/strings.xml
deleted file mode 100644
index 8060edafad..0000000000
--- a/matrix-sdk-android-rx/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  ~ Copyright 2019 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <string name="app_name">matrix-sdk-android-rx</string>
-</resources>