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

Commit ad055cc6 authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #77 from nextcloud/NPEinVersion 

if no version info is available use oldest supported
parents 18389934 6ca2fac7

src/com/owncloud/android/lib/common/accounts/AccountUtils.java

+9 −1
Original line number Diff line number Diff line
@@ -207,7 +207,15 @@ public class AccountUtils { 
        		AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;



        String username = AccountUtils.getUsernameForAccount(account);

		OwnCloudVersion version = new OwnCloudVersion(am.getUserData(account, Constants.KEY_OC_VERSION));

		String ocVersion = am.getUserData(account, Constants.KEY_OC_VERSION);



		OwnCloudVersion version;

		if (ocVersion == null) {

			// set to oldest supported version

			version = OwnCloudVersion.nextcloud_10;

		} else {

			version = new OwnCloudVersion(ocVersion);

		}



        if (isOauth2) {    

            String accessToken = am.blockingGetAuthToken(

src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java

+14 −12
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> { 
            0x04050000);

    public static final OwnCloudVersion nextcloud_9 = new OwnCloudVersion(0x09000000); // 9.0



    public static final OwnCloudVersion nextcloud_10 = new OwnCloudVersion(0x0A000000); // 10.0



    public static final OwnCloudVersion nextcloud_12 = new OwnCloudVersion(0x0C000000); // 12.0



    public static final int MINIMUN_VERSION_FOR_CHUNKED_UPLOADS = 0x04050000; // 4.5
@@ -84,12 +86,12 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> { 
        int countDots = version.length() - version.replace(".", "").length();



        // Complete the version. Version must have 3 dots

        StringBuilder versionWithDots = new StringBuilder(version);

        for (int i = countDots; i < MAX_DOTS; i++) {

        	 version = version + ".0";

            versionWithDots.append(".0");

        }



         parseVersion(version);



        parseVersion(versionWithDots.toString());

    }

    

    public String toString() {