Refactoring

src/main/aidl/de/luhmer/owncloud/accountimporter/helper/IInputStreamService.aidl → src/main/aidl/de/luhmer/owncloud/accountimporter/aidl/IInputStreamService.aidl

@@ -15,7 +15,7 @@
 	More information here: https://github.com/abeluck/android-streams-ipc
 */
 
-package de.luhmer.owncloud.accountimporter.helper;
+package de.luhmer.owncloud.accountimporter.aidl;
 
 // Declare the interface.
 interface IInputStreamService {

src/main/java/com/owncloud/android/services/AccountManagerService.java

@@ -4,7 +4,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 
-import de.luhmer.owncloud.accountimporter.helper.InputStreamBinder;
+import de.luhmer.owncloud.accountimporter.aidl.InputStreamBinder;
 
 public class AccountManagerService extends Service {
 

src/main/java/de/luhmer/owncloud/accountimporter/helper/IThreadListener.java → src/main/java/de/luhmer/owncloud/accountimporter/aidl/IThreadListener.java

@@ -1,4 +1,4 @@
-package de.luhmer.owncloud.accountimporter.helper;
+package de.luhmer.owncloud.accountimporter.aidl;
 
 /**
  * Created by david on 29.06.17.

src/main/java/de/luhmer/owncloud/accountimporter/helper/InputStreamBinder.java → src/main/java/de/luhmer/owncloud/accountimporter/aidl/InputStreamBinder.java

@@ -1,4 +1,4 @@
-package de.luhmer.owncloud.accountimporter.helper;
+package de.luhmer.owncloud.accountimporter.aidl;
 
 import android.accounts.Account;
 import android.content.Context;
@@ -114,12 +114,15 @@ public class InputStreamBinder extends IInputStreamService.Stub {
 
     private InputStream processRequest(final NextcloudRequest request) throws Exception {
         Account account = AccountUtils.getOwnCloudAccountByName(context, request.accountName); // TODO handle case that account is not found!
+        if(account == null) {
+            throw new IllegalStateException("CE_2"); // Custom Exception 2 (Account not found)
+        }
         OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
         OwnCloudClient client = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, context);
 
         // Validate token & package name
         if (!isValid(request)) {
-            throw new IllegalStateException("Provided authentication token does not match!");
+            throw new IllegalStateException("CE_1"); // Custom Exception 1 (Invalid token or package name)
         }
 
         // Validate URL

src/main/java/de/luhmer/owncloud/accountimporter/helper/NextcloudRequest.java → src/main/java/de/luhmer/owncloud/accountimporter/aidl/NextcloudRequest.java

@@ -1,4 +1,4 @@
-package de.luhmer.owncloud.accountimporter.helper;
+package de.luhmer.owncloud.accountimporter.aidl;
 
 import java.io.Serializable;
 import java.util.HashMap;

src/main/java/de/luhmer/owncloud/accountimporter/helper/ParcelFileDescriptorUtil.java → src/main/java/de/luhmer/owncloud/accountimporter/aidl/ParcelFileDescriptorUtil.java

@@ -1,4 +1,4 @@
-package de.luhmer.owncloud.accountimporter.helper;
+package de.luhmer.owncloud.accountimporter.aidl;
 
 import android.os.ParcelFileDescriptor;
 import android.util.Log;