mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2030 from nextcloud/untrustedDomain

Browse source 
Show infos on untrusted domain if available
This commit is contained in:
Tobias Kaminsky 2018-01-23 15:54:10 +01:00 committed by GitHub
commit 2c62688440
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -182,7 +182,7 @@ dependencies {
// dependencies for app building
implementation 'com.android.support:multidex:1.0.2'
// implementation project('nextcloud-android-library')
implementation 'com.github.nextcloud:android-library:1.0.35'
implementation 'com.github.nextcloud:android-library:1.0.36'
versionDevImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT' // use always latest master
implementation "com.android.support:support-v4:${supportLibraryVersion}"
implementation "com.android.support:design:${supportLibraryVersion}"

3
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -1569,6 +1569,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
case MAINTENANCE_MODE:
mServerStatusText = getResources().getString(R.string.maintenance_mode);
break;
case UNTRUSTED_DOMAIN:
mServerStatusText = getResources().getString(R.string.untrusted_domain);
break;
default:
mServerStatusText = "";
mServerStatusIcon = 0;

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

@ -760,4 +760,5 @@
<string name="end_to_end_encryption_dialog_close">Close</string>
<string name="end_to_end_encryption_storing_keys">Storing keys</string>
<string name="copy_move_to_encrypted_folder_not_supported">Copy/move into encrypted folder currently not supported.</string>
<string name="untrusted_domain">Access through untrusted domain. Please see documentation for further infos.</string>
</resources>