Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ dependencies {

implementation 'com.google.android.material:material:1.14.0'

api 'com.google.code.gson:gson:2.14.0'
api 'com.google.code.gson:gson:2.15.0'

implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation 'io.reactivex.rxjava3:rxjava:3.1.12'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
*/
package com.nextcloud.android.sso.api;

import static com.nextcloud.android.sso.aidl.ParcelFileDescriptorUtil.pipeFrom;
import static com.nextcloud.android.sso.exceptions.SSOException.parseNextcloudCustomException;

import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
Expand All @@ -23,12 +20,7 @@
import android.os.RemoteException;
import android.util.Log;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;

import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.nextcloud.android.sso.FilesAppTypeRegistry;
import com.nextcloud.android.sso.aidl.IInputStreamService;
import com.nextcloud.android.sso.aidl.NextcloudRequest;
Expand All @@ -43,8 +35,16 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.concurrent.atomic.AtomicBoolean;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;

import static com.nextcloud.android.sso.aidl.ParcelFileDescriptorUtil.pipeFrom;
import static com.nextcloud.android.sso.exceptions.SSOException.parseNextcloudCustomException;

public class AidlNetworkRequest extends NetworkRequest {
private static final String TAG = AidlNetworkRequest.class.getCanonicalName();

Expand Down Expand Up @@ -264,8 +264,8 @@ static ExceptionResponse deserializeObjectV2(InputStream is) throws IOException,
final ArrayList<?> list = new Gson().fromJson(headers, ArrayList.class);

for (Object o : list) {
final LinkedTreeMap<?, ?> treeMap = (LinkedTreeMap<?, ?>) o;
headerList.add(new PlainHeader((String) treeMap.get("name"), (String) treeMap.get("value")));
final LinkedHashMap<?, ?> hashMap = (LinkedHashMap<?, ?>) o;
headerList.add(new PlainHeader((String) hashMap.get("name"), (String) hashMap.get("value")));
}
}

Expand Down
Loading