Add Unit test for fetching Capabilities (af99117c) · Commits · e / os / Notes

app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -27,8 +27,8 @@ import it.niedermann.owncloud.notes.branding.BrandingUtil;
		import it.niedermann.owncloud.notes.databinding.ActivityImportAccountBinding;
		import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment;
		import it.niedermann.owncloud.notes.exception.ExceptionHandler;
		import it.niedermann.owncloud.notes.persistence.CapabilitiesClient;
		import it.niedermann.owncloud.notes.persistence.ApiProvider;
		import it.niedermann.owncloud.notes.persistence.CapabilitiesClient;
		import it.niedermann.owncloud.notes.persistence.SyncWorker;
		import it.niedermann.owncloud.notes.persistence.entity.Account;
		import it.niedermann.owncloud.notes.shared.model.Capabilities;
		@@ -90,8 +90,8 @@ public class ImportAccountActivity extends AppCompatActivity {
		Log.i(TAG, "Added account: " + "name:" + ssoAccount.name + ", " + ssoAccount.url + ", userId" + ssoAccount.userId);
		try {
		Log.i(TAG, "Loading capabilities for " + ssoAccount.name);
		final Capabilities capabilities = CapabilitiesClient.getCapabilities(getApplicationContext(), ssoAccount, null);
		final String displayName = CapabilitiesClient.getDisplayName(getApplicationContext(), ssoAccount);
		final Capabilities capabilities = CapabilitiesClient.getCapabilities(getApplicationContext(), ssoAccount, null, ApiProvider.getInstance());
		final String displayName = CapabilitiesClient.getDisplayName(getApplicationContext(), ssoAccount, ApiProvider.getInstance());
		importAccountViewModel.addAccount(ssoAccount.url, ssoAccount.userId, ssoAccount.name, capabilities, displayName, new IResponseCallback<Account>() {

		/**

app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -656,8 +656,8 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A
		Log.i(TAG, "Added account: " + "name:" + ssoAccount.name + ", " + ssoAccount.url + ", userId" + ssoAccount.userId);
		try {
		Log.i(TAG, "Refreshing capabilities for " + ssoAccount.name);
		final Capabilities capabilities = CapabilitiesClient.getCapabilities(getApplicationContext(), ssoAccount, null);
		final String displayName = CapabilitiesClient.getDisplayName(getApplicationContext(), ssoAccount);
		final Capabilities capabilities = CapabilitiesClient.getCapabilities(getApplicationContext(), ssoAccount, null, ApiProvider.getInstance());
		final String displayName = CapabilitiesClient.getDisplayName(getApplicationContext(), ssoAccount, ApiProvider.getInstance());
		mainViewModel.addAccount(ssoAccount.url, ssoAccount.userId, ssoAccount.name, capabilities, displayName, new IResponseCallback<Account>() {
		@Override
		public void onSuccess(Account result) {

app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import it.niedermann.owncloud.notes.branding.BrandingUtil;
		import it.niedermann.owncloud.notes.exception.IntendedOfflineException;
		import it.niedermann.owncloud.notes.main.navigation.NavigationAdapter;
		import it.niedermann.owncloud.notes.main.navigation.NavigationItem;
		import it.niedermann.owncloud.notes.persistence.ApiProvider;
		import it.niedermann.owncloud.notes.persistence.CapabilitiesClient;
		import it.niedermann.owncloud.notes.persistence.NotesRepository;
		import it.niedermann.owncloud.notes.persistence.entity.Account;
		@@ -397,7 +398,7 @@ public class MainViewModel extends AndroidViewModel {
		try {
		final SingleSignOnAccount ssoAccount = AccountImporter.getSingleSignOnAccount(getApplication(), localAccount.getAccountName());
		try {
		final Capabilities capabilities = CapabilitiesClient.getCapabilities(getApplication(), ssoAccount, localAccount.getCapabilitiesETag());
		final Capabilities capabilities = CapabilitiesClient.getCapabilities(getApplication(), ssoAccount, localAccount.getCapabilitiesETag(), ApiProvider.getInstance());
		repo.updateCapabilitiesETag(localAccount.getId(), capabilities.getETag());
		repo.updateBrand(localAccount.getId(), capabilities.getColor(), capabilities.getTextColor());
		localAccount.setColor(capabilities.getColor());

app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ public class CapabilitiesClient {
		private static final String HEADER_KEY_ETAG = "ETag";

		@WorkerThread
		public static Capabilities getCapabilities(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount, @Nullable String lastETag) throws Throwable {
		final OcsAPI ocsAPI = ApiProvider.getInstance().getOcsAPI(context, ssoAccount);
		public static Capabilities getCapabilities(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount, @Nullable String lastETag, @NonNull ApiProvider apiProvider) throws Throwable {
		final OcsAPI ocsAPI = apiProvider.getOcsAPI(context, ssoAccount);
		try {
		final ParsedResponse<OcsResponse<Capabilities>> response = ocsAPI.getCapabilities(lastETag).blockingSingle();
		final Capabilities capabilities = response.getResponse().ocs.data;
		@@ -50,8 +50,8 @@ public class CapabilitiesClient {

		@WorkerThread
		@Nullable
		public static String getDisplayName(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount) {
		final OcsAPI ocsAPI = ApiProvider.getInstance().getOcsAPI(context, ssoAccount);
		public static String getDisplayName(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount, @NonNull ApiProvider apiProvider) {
		final OcsAPI ocsAPI = apiProvider.getOcsAPI(context, ssoAccount);
		try {
		final Response<OcsResponse<OcsUser>> userResponse = ocsAPI.getUser(ssoAccount.userId).execute();
		if (userResponse.isSuccessful()) {

app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -47,12 +47,12 @@ public class CapabilitiesWorker extends Worker {
		try {
		final SingleSignOnAccount ssoAccount = AccountImporter.getSingleSignOnAccount(getApplicationContext(), account.getAccountName());
		Log.i(TAG, "Refreshing capabilities for " + ssoAccount.name);
		final Capabilities capabilities = CapabilitiesClient.getCapabilities(getApplicationContext(), ssoAccount, account.getCapabilitiesETag());
		final Capabilities capabilities = CapabilitiesClient.getCapabilities(getApplicationContext(), ssoAccount, account.getCapabilitiesETag(), ApiProvider.getInstance());
		repo.updateCapabilitiesETag(account.getId(), capabilities.getETag());
		repo.updateBrand(account.getId(), capabilities.getColor(), capabilities.getTextColor());
		repo.updateApiVersion(account.getId(), capabilities.getApiVersion());
		Log.i(TAG, capabilities.toString());
		repo.updateDisplayName(account.getId(), CapabilitiesClient.getDisplayName(getApplicationContext(), ssoAccount));
		repo.updateDisplayName(account.getId(), CapabilitiesClient.getDisplayName(getApplicationContext(), ssoAccount, ApiProvider.getInstance()));
		} catch (Throwable e) {
		if (e instanceof NextcloudHttpRequestFailedException) {
		if (((NextcloudHttpRequestFailedException) e).getStatusCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {