refactoring / add custom exception if api does not come online (0fc646ba) · Commits · e / os / Android SingleSignOn

src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java

+15 −11

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.nextcloud.android.sso.aidl.IInputStreamService;
		import com.nextcloud.android.sso.aidl.IThreadListener;
		import com.nextcloud.android.sso.aidl.NextcloudRequest;
		import com.nextcloud.android.sso.aidl.ParcelFileDescriptorUtil;
		import com.nextcloud.android.sso.exceptions.NextcloudApiNotRespondingException;
		import com.nextcloud.android.sso.helper.ExponentialBackoff;
		import com.nextcloud.android.sso.model.SingleSignOnAccount;

		@@ -77,7 +78,7 @@ public class NextcloudAPI {

		private Gson gson;
		private IInputStreamService mService = null;
		private AtomicBoolean mBound = new AtomicBoolean(false); // Flag indicating whether we have called bind on the service
		private final AtomicBoolean mBound = new AtomicBoolean(false); // Flag indicating whether we have called bind on the service
		private boolean mDestroyed = false; // Flag indicating if API is destroyed
		private SingleSignOnAccount mAccount;
		private ApiConnectedListener mCallback;
		@@ -154,11 +155,6 @@ public class NextcloudAPI {

		mService = IInputStreamService.Stub.asInterface(service);
		mBound.set(true);
		try {
		Thread.sleep(15000);
		} catch (InterruptedException e) {
		e.printStackTrace();
		}
		synchronized (mBound) {
		mBound.notifyAll();
		}
		@@ -178,13 +174,21 @@ public class NextcloudAPI {
		}
		};

		private void waitForApi() throws InterruptedException{
		Log.v(TAG, "[waitForApi] - called from Thread: [" + Thread.currentThread().getName() + "]");
		private void waitForApi() throws NextcloudApiNotRespondingException {
		synchronized (mBound) {
		// If service is not bound yet.. wait
		if(!mBound.get()) {
		Log.v(TAG, "[waitForApi] - api not ready yet.. waiting");
		Log.v(TAG, "[waitForApi] - api not ready yet.. waiting [" + Thread.currentThread().getName() + "]");
		try {
		mBound.wait(10000); // wait up to 10 seconds

		// If api is still not bound after 10 seconds.. throw an exception
		if(!mBound.get()) {
		throw new NextcloudApiNotRespondingException();
		}
		} catch (InterruptedException ex) {
		Log.e(TAG, "WaitForAPI failed", ex);
		}
		}
		}
		}
		@@ -268,7 +272,7 @@ public class NextcloudAPI {
		* @throws IOException
		*/
		private ParcelFileDescriptor performAidlNetworkRequest(NextcloudRequest request)
		throws IOException, RemoteException, InterruptedException {
		throws IOException, RemoteException, NextcloudApiNotRespondingException {
		waitForApi();

		// Log.d(TAG, request.url);

src/main/java/com/nextcloud/android/sso/exceptions/NextcloudApiNotRespondingException.java

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		package com.nextcloud.android.sso.exceptions;

		import android.content.Context;

		import com.nextcloud.android.sso.R;
		import com.nextcloud.android.sso.model.ExceptionMessage;

		public class NextcloudApiNotRespondingException extends SSOException {

		@Override
		public void loadExceptionMessage(Context context) {
		this.em = new ExceptionMessage(
		context.getString(R.string.nextcloud_files_api_not_responsing_title),
		context.getString(R.string.nextcloud_files_api_not_responsing_message)
		);
		}

		}

src/main/res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,10 @@
		<string name="nextcloud_files_app_not_supported_title">Error</string>
		<string name="nextcloud_files_app_not_supported_message" formatted="true">Your nextcloud files app currently does not support the single sign on feature. Please update it: %1$s</string>


		<string name="nextcloud_files_api_not_responsing_title">Error</string>
		<string name="nextcloud_files_api_not_responsing_message">Nextcloud files app api is not responding. Please report this issue.</string>

		<string name="select_account_unknown_error_toast">Something went wrong.. please try again</string>

		</resources>