gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #659

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-10-28 13:06:03 +01:00
parent f5468657d8
commit 7c7cd06ced
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -79,7 +79,7 @@
<activity <activity
android:name=".activities.MainActivity" android:name=".activities.MainActivity"
android:label="@string/nc_app_name" android:label="@string/nc_app_label"
android:windowSoftInputMode="adjustPan"> android:windowSoftInputMode="adjustPan">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

2
app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
View File

@ -43,7 +43,7 @@ public class DatabaseModule {
@Singleton @Singleton
public SqlCipherDatabaseSource provideSqlCipherDatabaseSource(@NonNull final Context context) { public SqlCipherDatabaseSource provideSqlCipherDatabaseSource(@NonNull final Context context) {
return new SqlCipherDatabaseSource(context, Models.DEFAULT, 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", .replace(" ", "_").trim() + ".sqlite",
context.getString(R.string.nc_talk_database_encryption_key), 6); context.getString(R.string.nc_talk_database_encryption_key), 6);
} }

3
app/src/main/res/values/setup.xml
View File

@ -23,8 +23,11 @@
<!-- Set before a release --> <!-- 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_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_talk_login_scheme" translatable="false">nc</string>
<string name="nc_legacy_database_name">Nextcloud Talk</string>
<bool name="nc_is_debug">false</bool> <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_app_name">Nextcloud Talk</string>
<string name="nc_server_product_name">Nextcloud</string> <string name="nc_server_product_name">Nextcloud</string>