Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 0e8a2693 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

changes due to rebase

parent b6ee7346

src/main/java/de/luhmer/owncloud/accountimporter/helper/BufferedSourceSSO.java→src/main/java/com/nextcloud/android/sso/helper/BufferedSourceSSO.java

+1 −1
Original line number Diff line number Diff line 
package de.luhmer.owncloud.accountimporter.helper;

package com.nextcloud.android.sso.helper;



import android.support.annotation.Nullable;

src/main/java/de/luhmer/owncloud/accountimporter/helper/FilesAppNotInstalledHelper.java→src/main/java/com/nextcloud/android/sso/helper/FilesAppNotInstalledHelper.java

+1 −1
Original line number Diff line number Diff line 
package de.luhmer.owncloud.accountimporter.helper;

package com.nextcloud.android.sso.helper;



import android.content.Context;

import android.content.Intent;

src/main/java/de/luhmer/owncloud/accountimporter/helper/Okhttp3Helper.java→src/main/java/com/nextcloud/android/sso/helper/Okhttp3Helper.java

+4 −3
Original line number Diff line number Diff line 
package de.luhmer.owncloud.accountimporter.helper;

package com.nextcloud.android.sso.helper;



import com.nextcloud.android.sso.aidl.NextcloudRequest;

import com.nextcloud.android.sso.api.NextcloudAPI;



import java.io.InputStream;



import de.luhmer.owncloud.accountimporter.aidl.NextcloudRequest;

import de.luhmer.owncloud.accountimporter.api.NextcloudAPI;

import okhttp3.ResponseBody;



/**

src/main/java/de/luhmer/owncloud/accountimporter/helper/ReactivexHelper.java→src/main/java/com/nextcloud/android/sso/helper/ReactivexHelper.java

+4 −3
Original line number Diff line number Diff line 
package de.luhmer.owncloud.accountimporter.helper;

package com.nextcloud.android.sso.helper;



import com.nextcloud.android.sso.aidl.NextcloudRequest;

import com.nextcloud.android.sso.api.NextcloudAPI;



import de.luhmer.owncloud.accountimporter.aidl.NextcloudRequest;

import de.luhmer.owncloud.accountimporter.api.NextcloudAPI;

import io.reactivex.Completable;

import io.reactivex.functions.Action;

src/main/java/de/luhmer/owncloud/accountimporter/helper/Retrofit2Helper.java→src/main/java/com/nextcloud/android/sso/helper/Retrofit2Helper.java

+6 −4
Original line number Diff line number Diff line 
package de.luhmer.owncloud.accountimporter.helper;

package com.nextcloud.android.sso.helper;



import com.nextcloud.android.sso.aidl.NextcloudRequest;

import com.nextcloud.android.sso.api.NextcloudAPI;



import java.lang.reflect.Type;



import de.luhmer.owncloud.accountimporter.aidl.NextcloudRequest;

import de.luhmer.owncloud.accountimporter.api.NextcloudAPI;

import okhttp3.Request;

import okhttp3.ResponseBody;

import retrofit2.Call;
@@ -31,7 +32,8 @@ import retrofit2.Response; 


public class Retrofit2Helper {



    public static <T> Call<T> WrapInCall(final NextcloudAPI nextcloudAPI, final NextcloudRequest nextcloudRequest, final Type resType) {

    public static <T> Call<T> WrapInCall(final NextcloudAPI nextcloudAPI, final NextcloudRequest nextcloudRequest, 

                                         final Type resType) {

        return new Call<T>() {

            @Override

            public Response<T> execute() {