remove duplicated files after merge

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

@@ -183,7 +183,6 @@ public class InputStreamBinder extends IInputStreamService.Stub {
     private boolean isValid(NextcloudRequest request) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         String storedToken = sharedPreferences.getString(request.packageName, "");
-
         return validPackages.contains(request.packageName) && request.token.equals(storedToken);
     }
 }

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

@@ -1,11 +0,0 @@
-package de.luhmer.owncloud.accountimporter.helper;
-
-/**
- * Created by david on 29.06.17.
- */
-
-public interface IThreadListener {
-
-    void onThreadFinished(final Thread thread);
-
-}

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

@@ -1,186 +0,0 @@
-package de.luhmer.owncloud.accountimporter.helper;
-
-import android.accounts.Account;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.ParcelFileDescriptor;
-import android.util.Log;
-
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.db.PreferenceManager;
-import com.owncloud.android.lib.common.OwnCloudAccount;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map;
-
-/**
- * Created by david on 29.06.17.
- *
- * More information here: https://github.com/abeluck/android-streams-ipc
- */
-
-public class InputStreamBinder extends IInputStreamService.Stub {
-    private final static String TAG = "InputStreamBinder";
-
-    private ArrayList<String> validPackages = new ArrayList<>(Arrays.asList("de.luhmer.owncloudnewsreader"));
-    
-    private Context context;
-    public InputStreamBinder(Context ctxt) {
-        this.context = ctxt;
-    }
-
-
-    private NameValuePair[] convertMapToNVP(Map<String, String> map) {
-        NameValuePair[] nvp = new NameValuePair[map.size()];
-        int i = 0;
-        for (String key : map.keySet()) {
-            nvp[i] = new NameValuePair(key, map.get(key));
-            i++;
-        }
-        return nvp;
-    }
-
-
-    public ParcelFileDescriptor performNextcloudRequest(ParcelFileDescriptor input) {
-        // read the input
-        final InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(input);
-
-        Exception exception = null;
-        InputStream httpStream = new InputStream() {
-            @Override
-            public int read() throws IOException {
-                return 0;
-            }
-        };
-        try {
-            // Start request and catch exceptions
-            NextcloudRequest request = deserializeObjectAndCloseStream(is);
-            httpStream = processRequest(request);
-        } catch (Exception e) {
-            e.printStackTrace();
-            exception = e;
-        }
-
-        try {
-            // Write exception to the stream followed by the actual network stream
-            InputStream exceptionStream = serializeObjectToInputStream(exception);
-            InputStream resultStream = new java.io.SequenceInputStream(exceptionStream, httpStream);
-            return ParcelFileDescriptorUtil.pipeFrom(resultStream, new IThreadListener() {
-                @Override
-                public void onThreadFinished(Thread thread) {
-                    Log.d(TAG, "Done sending result");
-                }
-            });
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private <T extends Serializable> ByteArrayInputStream serializeObjectToInputStream(T obj) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(baos);
-        oos.writeObject(obj);
-        oos.flush();
-        oos.close();
-        return new ByteArrayInputStream(baos.toByteArray());
-    }
-
-    private <T extends Serializable> T deserializeObjectAndCloseStream(InputStream is) throws IOException, ClassNotFoundException {
-        ObjectInputStream ois = new ObjectInputStream(is);
-        T result = (T) ois.readObject();
-        is.close();
-        ois.close();
-        return result;
-    }
-
-    private InputStream processRequest(final NextcloudRequest request) throws Exception {
-        Account account = AccountUtils.getOwnCloudAccountByName(context, request.accountName); // TODO handle case that account is 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!");
-        }
-
-        // Validate URL
-        if(!request.url.startsWith("/")) {
-            throw new IllegalStateException("URL need to start with a /");
-        }
-
-        request.url = client.getBaseUri() + request.url;
-        HttpMethodBase method;
-
-        switch (request.method) {
-            case "GET":
-                method = new GetMethod(request.url);
-                break;
-
-            case "POST":
-                method = new PostMethod(request.url);
-                if (request.requestBody != null) {
-                    StringRequestEntity requestEntity = new StringRequestEntity(
-                            request.requestBody,
-                            "application/json",
-                            "UTF-8");
-                    ((PostMethod) method).setRequestEntity(requestEntity);
-                }
-                break;
-
-            case "PUT":
-                method = new PutMethod(request.url);
-                if (request.requestBody != null) {
-                    StringRequestEntity requestEntity = new StringRequestEntity(
-                            request.requestBody,
-                            "application/json",
-                            "UTF-8");
-                    ((PutMethod) method).setRequestEntity(requestEntity);
-                }
-                break;
-
-            case "DELETE":
-                method = new DeleteMethod(request.url);
-                break;
-
-            default:
-                throw new Exception("Unexpected type!!");
-
-        }
-
-        method.setQueryString(convertMapToNVP(request.parameter));
-        method.addRequestHeader("OCS-APIREQUEST", "true");
-
-        int status = client.executeMethod(method);
-        if (status == 200) {
-            return method.getResponseBodyAsStream();
-        } else {
-            throw new Exception("Request returned code: " + status);
-        }
-    }
-
-    private boolean isValid(NextcloudRequest request) {
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        String storedToken = sharedPreferences.getString(request.packageName, "");
-
-        return validPackages.contains(request.packageName) && request.token.equals(storedToken);
-    }
-}

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

@@ -1,80 +0,0 @@
-package de.luhmer.owncloud.accountimporter.helper;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by david on 28.06.17.
- */
-
-public class NextcloudRequest implements Serializable {
-
-    private static final long serialVersionUID = 215521212534236L; //assign a long value
-
-    public String method;
-    public Map<String, List<String>> header = new HashMap<>();
-    public Map<String, String> parameter = new HashMap<>();
-    public String requestBody;
-    public String url;
-    public String token;
-    public String packageName;
-    public String accountName;
-
-    private NextcloudRequest() {
-
-    }
-
-    public static class Builder {
-        private NextcloudRequest ncr;
-
-        public Builder() {
-            ncr = new NextcloudRequest();
-        }
-
-        public NextcloudRequest build() {
-            return ncr;
-        }
-
-        public Builder setMethod(String method) {
-            ncr.method = method;
-            return this;
-        }
-
-        public Builder setHeader(Map<String, List<String>> header) {
-            ncr.header = header;
-            return this;
-        }
-
-        public Builder setParameter(HashMap<String, String> parameter) {
-            ncr.parameter = parameter;
-            return this;
-        }
-
-        public Builder setRequestBody(String requestBody) {
-            ncr.requestBody = requestBody;
-            return this;
-        }
-
-        public Builder setUrl(String url) {
-            ncr.url = url;
-            return this;
-        }
-
-        public Builder setToken(String token) {
-            ncr.token = token;
-            return this;
-        }
-
-        public Builder setPackageName(String packageName) {
-            ncr.packageName = packageName;
-            return this;
-        }
-
-        public Builder setAccountName(String accountName) {
-            ncr.accountName = accountName;
-            return this;
-        }
-    }
-}

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

@@ -1,82 +0,0 @@
-package de.luhmer.owncloud.accountimporter.helper;
-
-import android.os.ParcelFileDescriptor;
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class ParcelFileDescriptorUtil {
-
-    public static ParcelFileDescriptor pipeFrom(InputStream inputStream, IThreadListener listener)
-            throws IOException {
-        ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
-        ParcelFileDescriptor readSide = pipe[0];
-        ParcelFileDescriptor writeSide = pipe[1];
-
-        // start the transfer thread
-        new TransferThread(inputStream, new ParcelFileDescriptor.AutoCloseOutputStream(writeSide),
-                listener)
-                .start();
-
-        return readSide;
-    }
-
-    public static ParcelFileDescriptor pipeTo(OutputStream outputStream, IThreadListener listener)
-            throws IOException {
-        ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
-        ParcelFileDescriptor readSide = pipe[0];
-        ParcelFileDescriptor writeSide = pipe[1];
-
-        // start the transfer thread
-        new TransferThread(new ParcelFileDescriptor.AutoCloseInputStream(readSide), outputStream,
-                listener)
-                .start();
-
-        return writeSide;
-    }
-
-    public static class TransferThread extends Thread {
-        private final InputStream mIn;
-        private final OutputStream mOut;
-        private final IThreadListener mListener;
-
-        TransferThread(InputStream in, OutputStream out, IThreadListener listener) {
-            super("ParcelFileDescriptor Transfer Thread");
-            mIn = in;
-            mOut = out;
-            mListener = listener;
-            setDaemon(true);
-        }
-
-        @Override
-        public void run() {
-            byte[] buf = new byte[1024];
-            int len;
-
-            try {
-                while ((len = mIn.read(buf)) > 0) {
-                    mOut.write(buf, 0, len);
-                }
-                mOut.flush(); // just to be safe
-            } catch (IOException e) {
-                Log.e("TransferThread", "writing failed");
-                e.printStackTrace();
-            } finally {
-                try {
-                    mIn.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                try {
-                    mOut.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (mListener != null)
-                mListener.onThreadFinished(this);
-        }
-    }
-}