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

Commit a15d2b02 authored by vincent's avatar vincent
Browse files

replace Gson lib by moshi lib. need to handle two or three special case mark... 

replace Gson lib by moshi lib. need to handle two or three special case mark with '@todo' in the code
parent bcc26d3a

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ repositories { 
}



dependencies {

    api 'com.squareup.moshi:moshi:1.8.0'

    api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.6'

    implementation 'org.parceler:parceler-api:1.1.12'

    annotationProcessor 'org.parceler:parceler:1.1.12'

    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'

    implementation "com.android.support:support-annotations:28.0.0"

    

    findbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.8.0'

src/com/owncloud/android/lib/common/Quota.java

+1 −6
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *   @author Mario Danic

 *   Copyright (C) 2017 Mario Danic

 *   Copyright (C) 2017 Nextcloud GmbH

 *   Copyright (C) 2018 Vincent Bourgmayer (/e/ foundation)

 *

 *   Permission is hereby granted, free of charge, to any person obtaining a copy

 *   of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +28,6 @@ 


package com.owncloud.android.lib.common;



import com.google.gson.annotations.SerializedName;



import org.parceler.Parcel;
@@ -37,15 +37,10 @@ import org.parceler.Parcel; 


@Parcel

public class Quota {

    @SerializedName("free")

    public long free;

    @SerializedName("used")

    public long used;

    @SerializedName("total")

    public long total;

    @SerializedName("quota")

    public long quota;

    @SerializedName("relative")

    public double relative;



    public Quota() {

src/com/owncloud/android/lib/common/UserInfo.java

+1 −11
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *   @author Mario Danic

 *   Copyright (C) 2017 Mario Danic

 *   Copyright (C) 2017 Nextcloud GmbH

 *   Copyright (C) 2018 Vincent Bourgmayer (/e/ foundation)

 *

 *   Permission is hereby granted, free of charge, to any person obtaining a copy

 *   of this software and associated documentation files (the "Software"), to deal
@@ -27,8 +28,6 @@ 


package com.owncloud.android.lib.common;



import com.google.gson.annotations.SerializedName;



import org.parceler.Parcel;



/**
@@ -37,23 +36,14 @@ import org.parceler.Parcel; 


@Parcel

public class UserInfo {

    @SerializedName("id")

    public String id;

    @SerializedName("enabled")

    public Boolean enabled;

    @SerializedName(value = "display-name", alternate = {"displayname"})

    public String displayName;

    @SerializedName("email")

    public String email;

    @SerializedName("phone")

    public String phone;

    @SerializedName("address")

    public String address;

    @SerializedName(value = "website", alternate = {"webpage"})

    public String website;

    @SerializedName("twitter")

    public String twitter;

    @SerializedName("quota")

    public Quota quota;



    public UserInfo() {

src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java

+1 −2
Original line number Diff line number Diff line 
/* ownCloud Android Library is available under MIT license

 *   Copyright (C) 2015 ownCloud Inc.

 *   Copyright (C) 2018 Vincent Bourgmayer (/e/ foundation)

 *   

 *   Permission is hereby granted, free of charge, to any person obtaining a copy

 *   of this software and associated documentation files (the "Software"), to deal
@@ -150,8 +151,6 @@ public class AdvancedSslSocketFactory implements SecureProtocolSocketFactory { 
     *

     * @param host       the host name/IP

     * @param port       the port on the host

     * @param clientHost the local host name/IP to bind the socket to

     * @param clientPort the port on the local machine

     * @param params     {@link HttpConnectionParams Http connection parameters}

     * @return Socket a new socket

     * @throws IOException          if an I/O error occurs while creating the socket

src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java

+7 −6
Original line number Diff line number Diff line 
/* ownCloud Android Library is available under MIT license

 *   Copyright (C) 2016 ownCloud GmbH.

 *   Copyright (C) 2018 Vincent Bourgmayer (/e/ foundation)

 *   

 *   Permission is hereby granted, free of charge, to any person obtaining a copy

 *   of this software and associated documentation files (the "Software"), to deal
@@ -33,8 +34,8 @@ import android.system.OsConstants; 
import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;

import com.owncloud.android.lib.common.network.CertificateCombinedException;

import com.owncloud.android.lib.common.utils.Log_OC;

import com.owncloud.android.lib.resources.notifications.models.Notification;

import com.owncloud.android.lib.resources.notifications.models.PushResponse;

/*import com.owncloud.android.lib.resources.notifications.models.Notification;

import com.owncloud.android.lib.resources.notifications.models.PushResponse;*/



import org.apache.commons.httpclient.ConnectTimeoutException;

import org.apache.commons.httpclient.Header;
@@ -149,8 +150,8 @@ public class RemoteOperationResult implements Serializable { 
    private String mLastPermanentLocation = null;



    private ArrayList<Object> mData;

    private List<Notification> mNotificationData;

    private PushResponse mPushResponse;

    /*private List<Notification> mNotificationData;

    private PushResponse mPushResponse;*/



    /**

     * Public constructor from result code.
@@ -443,7 +444,7 @@ public class RemoteOperationResult implements Serializable { 
        return mData.get(0);

    }



    public void setNotificationData(List<Notification> notifications) {

    /*public void setNotificationData(List<Notification> notifications) {

        mNotificationData = notifications;

    }
@@ -456,7 +457,7 @@ public class RemoteOperationResult implements Serializable { 


    public List<Notification> getNotificationData() {

        return mNotificationData;

    }

    }*/





    public boolean isSuccess() {