Merge pull request #34 from Flole998/patch-1 (f60717b3) · Commits · e / os / nextcloud-android-lib

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

+22 −3

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
		private static final String NODE_USER = "user";
		private static final String NODE_FEDERATION = "federation";
		private static final String NODE_FILES = "files";
		private static final String NODE_THEMING = "theming";

		private static final String PROPERTY_STATUS = "status";
		private static final String PROPERTY_STATUSCODE = "statuscode";
		@@ -103,6 +104,12 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
		private static final String PROPERTY_UNDELETE = "undelete";
		private static final String PROPERTY_VERSIONING = "versioning";

		private static final String PROPERTY_SERVERNAME = "name";
		private static final String PROPERTY_SERVERSLOGAN = "slogan";
		private static final String PROPERTY_SERVERCOLOR = "color";
		private static final String PROPERTY_SERVERLOGO = "logo";
		private static final String PROPERTY_SERVERBACKGROUND = "background";


		/**
		* Constructor
		@@ -246,6 +253,18 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
		respFiles.getBoolean(PROPERTY_VERSIONING)));
		Log_OC.d(TAG, "*** Added " + NODE_FILES);
		}

		if (respCapabilities.has(NODE_THEMING)) {
		JSONObject respTheming = respCapabilities.getJSONObject(NODE_THEMING);
		// Add theming
		capability.setServerName(respTheming.getString(PROPERTY_SERVERNAME));
		capability.setServerSlogan(respTheming.getString(PROPERTY_SERVERSLOGAN));
		capability.setServerColor(respTheming.getString(PROPERTY_SERVERCOLOR));
		capability.setServerLogo(respTheming.getString(PROPERTY_SERVERLOGO));
		capability.setServerBackground(respTheming.getString(PROPERTY_SERVERBACKGROUND));
		Log_OC.d(TAG, "*** Added " + NODE_THEMING);
		}

		}
		// Result
		data.add(capability);

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

+51 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,11 @@ public class OCCapability {
		private int mVersionMicro;
		private String mVersionString;
		private String mVersionEdition;
		private String mServerName;
		private String mServerSlogan;
		private String mServerColor;
		private String mServerLogo;
		private String mServerBackground;

		// Core PollInterval
		private int mCorePollinterval;
		@@ -77,6 +82,11 @@ public class OCCapability {
		mVersionMicro = 0;
		mVersionString = "";
		mVersionString = "";
		mServerName = "";
		mServerSlogan = "";
		mServerColor = "";
		mServerLogo = "";
		mServerBackground = "";

		mCorePollinterval = 0;

		@@ -149,6 +159,47 @@ public class OCCapability {
		this.mVersionString = versionString;
		}

		public String getServerName() {
		return mServerName;
		}

		public void setServerName(String serverName) {
		this.mServerName = serverName;
		}


		public String getServerBackground() {
		return mServerBackground;
		}

		public void setServerBackground(String mServerBackground) {
		this.mServerBackground = mServerBackground;
		}

		public String getServerLogo() {
		return mServerLogo;
		}

		public void setServerLogo(String mServerLogo) {
		this.mServerLogo = mServerLogo;
		}

		public String getServerColor() {
		return mServerColor;
		}

		public void setServerColor(String mServerColor) {
		this.mServerColor = mServerColor;
		}

		public String getServerSlogan() {
		return mServerSlogan;
		}

		public void setServerSlogan(String mServerSlogan) {
		this.mServerSlogan = mServerSlogan;
		}

		public String getVersionEdition() {
		return mVersionEdition;
		}