From 7c7cd06cedbfb76b92455f56596a4ad6077c62fb Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 28 Oct 2019 13:06:03 +0100
Subject: [PATCH] Fix #659

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/src/main/AndroidManifest.xml                               | 2 +-
 .../java/com/nextcloud/talk/dagger/modules/DatabaseModule.java | 2 +-
 app/src/main/res/values/setup.xml                              | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e7caf6361..00c215f25 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -79,7 +79,7 @@
 
         <activity
             android:name=".activities.MainActivity"
-            android:label="@string/nc_app_name"
+            android:label="@string/nc_app_label"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
index 0121bd77b..c46de2fb7 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
@@ -43,7 +43,7 @@ public class DatabaseModule {
   @Singleton
   public SqlCipherDatabaseSource provideSqlCipherDatabaseSource(@NonNull final Context context) {
     return new SqlCipherDatabaseSource(context, Models.DEFAULT,
-        context.getResources().getString(R.string.nc_app_name).toLowerCase()
+        context.getResources().getString(R.string.nc_legacy_database_name).toLowerCase()
             .replace(" ", "_").trim() + ".sqlite",
         context.getString(R.string.nc_talk_database_encryption_key), 6);
   }
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 8bb13c6f3..89d57eda5 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -23,8 +23,11 @@
     <!-- Set before a release -->
     <string name="nc_talk_database_encryption_key" translatable="false">HvAfHtAy/QdFYqAWFFXa1VV_Iv6ZQ1.tf5swMc^45wS_vz=Wm[oyRP5D-</string>
     <string name="nc_talk_login_scheme" translatable="false">nc</string>
+    <string name="nc_legacy_database_name">Nextcloud Talk</string>
     <bool name="nc_is_debug">false</bool>
 
+    <!-- App label shown on the home screen -->
+    <string name="nc_app_label">Talk</string>
     <string name="nc_app_name">Nextcloud Talk</string>
     <string name="nc_server_product_name">Nextcloud</string>