mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-01 03:43:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

changes due to CR

Browse source 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiaskaminsky 2018-03-19 13:28:14 +01:00 committed by tobiasKaminsky
parent 530b545d2e
commit 45b9f9f7c7
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -76,7 +76,6 @@ import com.owncloud.android.lib.resources.files.ToggleEncryptionOperation;
import com.owncloud.android.lib.resources.files.ToggleFavoriteOperation;
import com.owncloud.android.lib.resources.shares.GetRemoteSharesOperation;
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.activity.FolderPickerActivity;

2
src/main/res/values/strings.xml
View file

@ -763,7 +763,7 @@
<string name="end_to_end_encryption_title">Set up encryption</string>
<string name="end_to_end_encryption_passphrase_title">Make note of your 12 word encryption password</string>
<string name="end_to_end_encryption_not_supported">Encryption only works on KitKat(4.4) and beyond.</string>
<string name="end_to_end_encryption_not_enabled">End to end encryption not enabled on server.</string>
<string name="end_to_end_encryption_not_enabled">End to end encryption disabled on server.</string>
<string name="end_to_end_encryption_confirm_button">Set up encryption</string>
<string name="end_to_end_encryption_password">Password&#8230;</string>
<string name="end_to_end_encryption_unsuccessful">Could not save keys, please try again.</string>