Disable backups

This commit is contained in:
Mario Danic 2019-12-19 13:22:50 +01:00
parent a177cb6c5f
commit 352147332b
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
4 changed files with 8 additions and 4 deletions

View File

@ -24,12 +24,14 @@
<application <application
android:name=".application.NextcloudTalkApplication" android:name=".application.NextcloudTalkApplication"
android:allowBackup="true" android:allowBackup="false"
android:fullBackupContent="@xml/backup_config" android:fullBackupContent="@xml/backup_config"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/nc_app_name" android:label="@string/nc_app_name"
android:networkSecurityConfig="@xml/network_security_config" android:networkSecurityConfig="@xml/network_security_config"
android:supportsRtl="true" android:supportsRtl="true"
android:allowClearUserData="false"
android:allowClearUserDataOnFailedRestore="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
tools:replace="label, icon, theme, name, allowBackup" tools:replace="label, icon, theme, name, allowBackup"
tools:ignore="UnusedAttribute, ExportedService"> tools:ignore="UnusedAttribute, ExportedService">

View File

@ -62,8 +62,10 @@
<application <application
android:name=".application.NextcloudTalkApplication" android:name=".application.NextcloudTalkApplication"
android:allowBackup="true" android:allowBackup="false"
android:fullBackupContent="@xml/backup_config" android:fullBackupContent="@xml/backup_config"
android:allowClearUserData="false"
android:allowClearUserDataOnFailedRestore="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/nc_app_name" android:label="@string/nc_app_name"
android:largeHeap="true" android:largeHeap="true"

View File

@ -697,6 +697,7 @@ class SettingsController : BaseController() {
avatarId, R.dimen.avatar_size_big avatarId, R.dimen.avatar_size_big
) )
) { ) {
addHeader("Authorization", currentUser!!.getCredentials())
transformations(CircleCropTransformation()) transformations(CircleCropTransformation())
} }
} }

View File

@ -31,8 +31,7 @@ import java.net.Proxy.NO_PROXY
import java.net.Proxy.Type import java.net.Proxy.Type
import java.net.Proxy.Type.SOCKS import java.net.Proxy.Type.SOCKS
class NetworkUtils { class NetworkUtils { class HeadersInterceptor : Interceptor {
class HeadersInterceptor : Interceptor {
@Throws(IOException::class) @Throws(IOException::class)
override fun intercept(chain: Interceptor.Chain): Response { override fun intercept(chain: Interceptor.Chain): Response {