Merge pull request #108 from nextcloud/themingCapabilities (918f2dbf) · Commits · e / os / nextcloud-android-lib

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

+15 −3

Original line number	Diff line number	Diff line
		@@ -111,6 +111,8 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
		private static final String PROPERTY_SERVERELEMENTCOLOR = "color-element";
		private static final String PROPERTY_SERVERLOGO = "logo";
		private static final String PROPERTY_SERVERBACKGROUND = "background";
		private static final String PROPERTY_SERVERBACKGROUND_DEFAULT = "background-default";
		private static final String PROPERTY_SERVERBACKGROUND_PLAIN = "background-plain";

		// v1 notifications
		private static final String NODE_NOTIFICATIONS = "notifications";
		@@ -296,9 +298,19 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
		respTheming.getString(PROPERTY_SERVERTEXTCOLOR) != null) {
		capability.setServerTextColor(respTheming.getString(PROPERTY_SERVERTEXTCOLOR));
		}
		if (respTheming.has(PROPERTY_SERVERELEMENTCOLOR) &&
		respTheming.getString(PROPERTY_SERVERELEMENTCOLOR) != null) {
		capability.setServerElementColor(respTheming.getString(PROPERTY_SERVERELEMENTCOLOR));
		if (respTheming.has(PROPERTY_SERVERBACKGROUND_DEFAULT)) {
		if (respTheming.getBoolean(PROPERTY_SERVERBACKGROUND_DEFAULT)) {
		capability.setServerBackgroundDefault(CapabilityBooleanType.TRUE);
		} else {
		capability.setServerBackgroundDefault(CapabilityBooleanType.FALSE);
		}
		}
		if (respTheming.has(PROPERTY_SERVERBACKGROUND_PLAIN)) {
		if (respTheming.getBoolean(PROPERTY_SERVERBACKGROUND_PLAIN)) {
		capability.setServerBackgroundPlain(CapabilityBooleanType.TRUE);
		} else {
		capability.setServerBackgroundPlain(CapabilityBooleanType.FALSE);
		}
		}
		Log_OC.d(TAG, "*** Added " + NODE_THEMING);
		}

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

+24 −5

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ public class OCCapability {
		private int mVersionMicro;
		private String mVersionString;
		private String mVersionEdition;

		// Theming
		private String mServerName;
		private String mServerSlogan;
		private String mServerColor;
		@@ -47,6 +49,8 @@ public class OCCapability {
		private String mServerElementColor;
		private String mServerLogo;
		private String mServerBackground;
		private CapabilityBooleanType mServerBackgroundDefault;
		private CapabilityBooleanType mServerBackgroundPlain;

		// Core PollInterval
		private int mCorePollinterval;
		@@ -103,6 +107,8 @@ public class OCCapability {
		mServerTextColor = "";
		mServerLogo = "";
		mServerBackground = "";
		mServerBackgroundDefault = CapabilityBooleanType.UNKNOWN;
		mServerBackgroundPlain = CapabilityBooleanType.UNKNOWN;

		mCorePollinterval = 0;

		@@ -257,6 +263,22 @@ public class OCCapability {
		this.mServerSlogan = mServerSlogan;
		}

		public CapabilityBooleanType getServerBackgroundPlain() {
		return mServerBackgroundPlain;
		}

		public void setServerBackgroundPlain(CapabilityBooleanType serverBackgroundPlain) {
		this.mServerBackgroundPlain = serverBackgroundPlain;
		}

		public CapabilityBooleanType getServerBackgroundDefault() {
		return mServerBackgroundDefault;
		}

		public void setServerBackgroundDefault(CapabilityBooleanType serverBackgroundDefault) {
		this.mServerBackgroundDefault = serverBackgroundDefault;
		}

		public String getVersionEdition() {
		return mVersionEdition;
		}
		@@ -265,7 +287,6 @@ public class OCCapability {
		this.mVersionEdition = versionEdition;
		}


		public int getCorePollinterval() {
		return mCorePollinterval;
		}
		@@ -322,7 +343,6 @@ public class OCCapability {
		this.mFilesSharingPublicExpireDateEnforced = filesSharingPublicExpireDateEnforced;
		}


		public CapabilityBooleanType getFilesSharingPublicSendMail() {
		return mFilesSharingPublicSendMail;
		}
		@@ -433,5 +453,4 @@ public class OCCapability {
		public void setEndToEndEncryption(CapabilityBooleanType endToEndEncryption) {
		this.mEndToEndEncryption = endToEndEncryption;
		}

		}