-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into dev
- Loading branch information
Showing
46 changed files
with
64 additions
and
42 deletions.
There are no files selected for viewing
Binary file modified
BIN
+1.67 KB
(110%)
...creenshots/gplay/debug/com.nextcloud.client.ActivitiesActivityIT_openDrawer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+24 Bytes
(100%)
...nshots/gplay/debug/com.nextcloud.client.ActivitiesActivityIT_showActivities.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-26 Bytes
(100%)
app/screenshots/gplay/debug/com.nextcloud.client.CommunityActivityIT_open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.69 KB
(110%)
...ots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_drawer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+234 Bytes
(100%)
app/screenshots/gplay/debug/com.nextcloud.client.SettingsActivityIT_open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+262 Bytes
(100%)
...hots/gplay/debug/com.nextcloud.client.SettingsActivityIT_showMnemonic_Error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-145 Bytes
(100%)
...y/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.69 KB
(110%)
...ts/gplay/debug/com.nextcloud.client.UploadListActivityActivityIT_openDrawer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+25 Bytes
(100%)
app/screenshots/gplay/debug/com.nextcloud.client.etm.EtmActivityTest_overview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+81 Bytes
(100%)
.../debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepBoth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+70 Bytes
(100%)
...ug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepExisting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+75 Bytes
(100%)
...y/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepNew.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+84 Bytes
(100%)
...owncloud.android.ui.activity.ConflictsResolveActivityIT_screenshotTextFiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-346 Bytes
(98%)
...oud.android.ui.activity.ContactsPreferenceActivityIT_openContactsPreference.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+16 Bytes
(100%)
...ts/gplay/debug/com.owncloud.android.ui.activity.FolderPickerActivityIT_open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-49 Bytes
(100%)
...wncloud.android.ui.activity.FolderPickerActivityIT_testChooseLocationAction.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-45 Bytes
(100%)
...ebug/com.owncloud.android.ui.activity.FolderPickerActivityIT_testMoveOrCopy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+97 Bytes
(100%)
...ug/com.owncloud.android.ui.activity.ManageAccountsActivityIT_userInfoDetail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+38 Bytes
(100%)
.../gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+35 Bytes
(100%)
.../gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+41 Bytes
(100%)
.../com.owncloud.android.ui.activity.NotificationsActivityIT_showNotifications.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+25 Bytes
(100%)
.../debug/com.owncloud.android.ui.activity.ReceiveExternalFilesActivityIT_open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+11 Bytes
(100%)
...wncloud.android.ui.activity.ReceiveExternalFilesActivityIT_openMultiAccount.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+107 Bytes
(100%)
...ebug/com.owncloud.android.ui.activity.UserInfoActivityIT_fullUserInfoDetail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+16 Bytes
(100%)
.../com.owncloud.android.ui.dialog.DialogFragmentIT_testEnforcedPasswordDialog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+22 Bytes
(100%)
.../com.owncloud.android.ui.dialog.DialogFragmentIT_testOptionalPasswordDialog.png
Oops, something went wrong.
Binary file modified
BIN
-3 Bytes
(100%)
.../debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRenameFileDialog.png
Oops, something went wrong.
Binary file modified
BIN
-4 Bytes
(100%)
...com.owncloud.android.ui.dialog.DialogFragmentIT_testStoragePermissionDialog.png
Oops, something went wrong.
Binary file modified
BIN
+58 Bytes
(100%)
...com.owncloud.android.ui.dialog.SetupEncryptionDialogFragmentIT_showMnemonic.png
Oops, something went wrong.
Binary file modified
BIN
-392 Bytes
(98%)
...ncloud.android.ui.fragment.BackupListFragmentIT_showCalendarAndContactsList.png
Oops, something went wrong.
Binary file modified
BIN
-405 Bytes
(97%)
...ebug/com.owncloud.android.ui.fragment.BackupListFragmentIT_showCalendarList.png
Oops, something went wrong.
Binary file modified
BIN
+37 Bytes
(100%)
....android.ui.fragment.FileDetailFragmentStaticServerIT_showDetailsActivities.png
Oops, something went wrong.
Binary file modified
BIN
-425 Bytes
(93%)
....fragment.FileDetailFragmentStaticServerIT_showFileDetailActivitiesFragment.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
....ui.fragment.FileDetailFragmentStaticServerIT_showFileDetailDetailsFragment.png
Oops, something went wrong.
Binary file modified
BIN
+2.14 KB
(120%)
...d.ui.fragment.FileDetailSharingFragmentIT_listSharesFileResharingNotAllowed.png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -248,6 +248,7 @@ public void testAccountChooserDialog() throws AccountUtils.AccountNotFoundExcept | |
accountManager.setUserData(newAccount, AccountUtils.Constants.KEY_USER_ID, "test"); | ||
accountManager.setAuthToken(newAccount, AccountTypeUtils.getAuthTokenTypePass(newAccount.type), "password"); | ||
User newUser = userAccountManager.getUser(newAccount.name).orElseThrow(RuntimeException::new); | ||
userAccountManager.setCurrentOwnCloudAccount(newAccount.name); | ||
|
||
Account newAccount2 = new Account("[email protected]", MainApp.getAccountType(targetContext)); | ||
accountManager.addAccountExplicitly(newAccount2, "password", null); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters