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

Commit 9c663606 authored by vincent's avatar vincent
Browse files

update android-nc-lib submodule

parents 1fa146fc a15d2b02

README.md

+64 −74
Original line number Diff line number Diff line 
# [Nextcloud](https://nextcloud.com) Android Library [![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android-library/status.svg)](https://drone.nextcloud.com/nextcloud/android-library) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d9f94f04e0f447a6b21c0ae08f6f7594)](https://www.codacy.com/app/Nextcloud/android-library?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/android-library&utm_campaign=Badge_Grade)

# [/e/ NC/Dav Android Library](https://e.foundation/)

# ~~[Nextcloud](https://nextcloud.com) Android Library~~ [![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android-library/status.svg)](https://drone.nextcloud.com/nextcloud/android-library) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d9f94f04e0f447a6b21c0ae08f6f7594)](https://www.codacy.com/app/Nextcloud/android-library?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/android-library&utm_campaign=Badge_Grade)



## Introduction

Using Nextcloud Android library it will be the easiest way to communicate with Nextcloud servers.
@@ -10,18 +11,7 @@ thanks to it you will learn how to use the library. 


*There are different ways of adding this library to your code*



### Gradle / Maven dependency

At the moment we do not have a publishing mechanism to a maven repository so the easiest way to add the library to your app is via a JitPack Dependency [![](https://jitpack.io/v/nextcloud/android-library.svg)](https://jitpack.io/#nextcloud/android-library)



```

repositories {

    ...

    maven { url "https://jitpack.io" }

}

dependencies {

    ...

    compile 'com.github.nextcloud:android-library:-SNAPSHOT'

```

### ~~Gradle / Maven dependency~~



### As a git submodule

Basically get this code and compile it having it integrated via a git submodule:

build.gradle

+5 −3
Original line number Diff line number Diff line
@@ -19,11 +19,13 @@ repositories { 
}



dependencies {

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

    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 'com.google.code.gson:gson:2.8.5'

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



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



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

    findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.3'

}

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