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

Commit 040170c9 authored by Mario Đanić's avatar Mario Đanić Committed by GitHub
Browse files

Merge pull request #47 from nextcloud/fix-quota-stuff 

Fix quota stuff
parents 4b014094 6f1d117c

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.owncloud.android.lib"

    android:versionCode="1"

    android:versionName="1.0" >

    android:versionName="1.0.13" >



    <uses-sdk

        android:minSdkVersion="11"

src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java

+16 −14
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ public class GetRemoteUserInfoOperation extends RemoteOperation { 
                    userInfo.setEmail(respData.getString(NODE_EMAIL));

                }



                if (respData.has(NODE_QUOTA) && !respData.isNull(NODE_QUOTA)) {

                    JSONObject quota = respData.getJSONObject(NODE_QUOTA);

                    final Long quotaFree = quota.getLong(NODE_QUOTA_FREE);

                    final Long quotaUsed = quota.getLong(NODE_QUOTA_USED);
@@ -164,6 +165,7 @@ public class GetRemoteUserInfoOperation extends RemoteOperation { 
                    }



                    userInfo.setQuota(new Quota(quotaFree, quotaUsed, quotaTotal, quotaRelative, quotaValue));

                }



                if (respData.has(NODE_PHONE) && !respData.isNull(NODE_PHONE) &&

                        !TextUtils.isEmpty(respData.getString(NODE_PHONE))) {