Skip to content

Commit

Permalink
feat: remove Zimbra Mobile Gateway feature (#271)
Browse files Browse the repository at this point in the history
ref: [CO-775]
  • Loading branch information
Polpetta authored Jul 12, 2023
1 parent 1a1cc4d commit 3a63a78
Show file tree
Hide file tree
Showing 33 changed files with 3,615 additions and 4,169 deletions.
7 changes: 3 additions & 4 deletions client/src/main/java/com/zimbra/client/ZFeatures.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,6 @@ public boolean getMailForwardingInFilter() {
return getBool(ZAttrProvisioning.A_zimbraFeatureMailForwardingInFiltersEnabled);
}

public boolean getMobileSync() {
return getBool(ZAttrProvisioning.A_zimbraFeatureMobileSyncEnabled);
}

public boolean getSkinChange() {
return getBool(ZAttrProvisioning.A_zimbraFeatureSkinChangeEnabled);
}
Expand Down Expand Up @@ -194,16 +190,19 @@ public boolean getNewAddrBookEnabled() {
return get(ZAttrProvisioning.A_zimbraFeatureNewAddrBookEnabled) == null
|| getBool(ZAttrProvisioning.A_zimbraFeatureNewAddrBookEnabled);
}

// defaults to TRUE
public boolean getPop3Enabled() {
return get(ZAttrProvisioning.A_zimbraPop3Enabled) == null
|| getBool(ZAttrProvisioning.A_zimbraPop3Enabled);
}

// defaults to TRUE
public boolean getSpam() {
return get(ZAttrProvisioning.A_zimbraFeatureAntispamEnabled) == null
|| getBool(ZAttrProvisioning.A_zimbraFeatureAntispamEnabled);
}

// defaults to TRUE
public boolean getWebClientEnabled() {
return get(ZAttrProvisioning.A_zimbraFeatureWebClientEnabled) == null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7143,7 +7143,8 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
public static final String A_zimbraFeatureMobileAppEnabled = "zimbraFeatureMobileAppEnabled";

/**
* Whether to enable Zimbra Mobile Gateway feature
* Deprecated since: 23.8.0. Zimbra Mobile Gateway feature has been
* removed. Orig desc: Whether to enable Zimbra Mobile Gateway feature
*
* @since ZCS 8.7.0,9.0.0
*/
Expand All @@ -7159,7 +7160,8 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
public static final String A_zimbraFeatureMobilePolicyEnabled = "zimbraFeatureMobilePolicyEnabled";

/**
* whether to permit mobile sync
* Deprecated since: 23.8.0. Zimbra Mobile Gateway feature has been
* removed. Orig desc: whether to permit mobile sync
*/
@ZAttr(id=347)
public static final String A_zimbraFeatureMobileSyncEnabled = "zimbraFeatureMobileSyncEnabled";
Expand Down Expand Up @@ -8927,7 +8929,9 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
public static final String A_zimbraIsMobileGatewayAppAccount = "zimbraIsMobileGatewayAppAccount";

/**
* whether or not an account represents a Mobile Gateway Proxy account
* Deprecated since: 23.8.0. Zimbra Mobile Gateway feature has been
* removed. Orig desc: whether or not an account represents a Mobile
* Gateway Proxy account
*
* @since ZCS 8.7.0,9.0.0
*/
Expand Down Expand Up @@ -14680,7 +14684,9 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
public static final String A_zimbraPrefZimletTreeOpen = "zimbraPrefZimletTreeOpen";

/**
* Option to turn on/off zimbra mobile gateway push notifications
* Deprecated since: 23.8.0. Zimbra Mobile Gateway feature has been
* removed. Orig desc: Option to turn on/off zimbra mobile gateway push
* notifications
*
* @since ZCS 8.7.0,9.0.0
*/
Expand Down
45 changes: 0 additions & 45 deletions common/src/main/java/com/zimbra/common/soap/AccountConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,6 @@ private AccountConstants() {
public static final String E_GET_SMIME_PUBLIC_CERTS_REQUEST = "GetSMIMEPublicCertsRequest";
public static final String E_GET_SMIME_PUBLIC_CERTS_RESPONSE = "GetSMIMEPublicCertsResponse";

// Zimbra Mobile Gateway
public static final String E_BOOTSTRAP_MOBILE_GATEWAY_APP_REQUEST =
"BootstrapMobileGatewayAppRequest";
public static final String E_BOOTSTRAP_MOBILE_GATEWAY_APP_RESPONSE =
"BootstrapMobileGatewayAppResponse";
public static final String E_RENEW_MOBILE_GATEWAY_APP_TOKEN_REQUEST =
"RenewMobileGatewayAppTokenRequest";
public static final String E_RENEW_MOBILE_GATEWAY_APP_TOKEN_RESPONSE =
"RenewMobileGatewayAppTokenResponse";
public static final String E_REGISTER_MOBILE_GATEWAY_APP_REQUEST =
"RegisterMobileGatewayAppRequest";
public static final String E_REGISTER_MOBILE_GATEWAY_APP_RESPONSE =
"RegisterMobileGatewayAppResponse";
public static final String E_GET_GCM_SENDER_ID_REQUEST = "GetGcmSenderIdRequest";
public static final String E_GET_GCM_SENDER_ID_RESPONSE = "GetGcmSenderIdResponse";

Expand Down Expand Up @@ -318,24 +305,6 @@ private AccountConstants() {
public static final QName GET_SMIME_PUBLIC_CERTS_RESPONSE =
QName.get(E_GET_SMIME_PUBLIC_CERTS_RESPONSE, NAMESPACE);

// Zimbra Mobile Gateway
public static final QName BOOTSTRAP_MOBILE_GATEWAY_APP_REQUEST =
QName.get(E_BOOTSTRAP_MOBILE_GATEWAY_APP_REQUEST, NAMESPACE);
public static final QName BOOTSTRAP_MOBILE_GATEWAY_APP_RESPONSE =
QName.get(E_BOOTSTRAP_MOBILE_GATEWAY_APP_RESPONSE, NAMESPACE);
public static final QName RENEW_MOBILE_GATEWAY_APP_TOKEN_REQUEST =
QName.get(E_RENEW_MOBILE_GATEWAY_APP_TOKEN_REQUEST, NAMESPACE);
public static final QName RENEW_MOBILE_GATEWAY_APP_TOKEN_RESPONSE =
QName.get(E_RENEW_MOBILE_GATEWAY_APP_TOKEN_RESPONSE, NAMESPACE);
public static final QName REGISTER_MOBILE_GATEWAY_APP_REQUEST =
QName.get(E_REGISTER_MOBILE_GATEWAY_APP_REQUEST, NAMESPACE);
public static final QName REGISTER_MOBILE_GATEWAY_APP_RESPONSE =
QName.get(E_REGISTER_MOBILE_GATEWAY_APP_RESPONSE, NAMESPACE);
public static final QName GET_GCM_SENDER_ID_REQUEST =
QName.get(E_GET_GCM_SENDER_ID_REQUEST, NAMESPACE);
public static final QName GET_GCM_SENDER_ID_RESPONSE =
QName.get(E_GET_GCM_SENDER_ID_RESPONSE, NAMESPACE);

// OAuth
public static final QName GET_OAUTH_CONSUMERS_REQUEST =
QName.get(E_GET_OAUTH_CONSUMERS_REQUEST, NAMESPACE);
Expand Down Expand Up @@ -578,20 +547,6 @@ private AccountConstants() {
public static final String A_CLEAR_ALL_SOAP_SESSIONS = "all";
public static final String A_EXCLUDE_CURRENT_SESSION = "excludeCurrent";

// Zimbra Mobile Gateway
public static final String E_APP_ID = "appId";
public static final String E_APP_KEY = "appKey";
public static final String A_WANT_APP_TOKEN = "wantAppToken";
public static final String E_ZMG_DEVICE = "zmgDevice";
public static final String A_DEVICE_ID = "appId";
public static final String A_REGISTRATION_ID = "registrationId";
public static final String A_PUSH_PROVIDER = "pushProvider";
public static final String A_OS_NAME = "osName";
public static final String A_OS_VERSION = "osVersion";
public static final String A_MAX_PAYLOAD_SIZE = "maxPayloadSize";
public static final String E_GCM_SENDER_ID = "gcmSenderId";
public static final String A_ZMG_PROXY = "zmgProxy";

// oauth consumer attributes
public static final String A_ACCESS_TOKEN = "accessToken";
public static final String A_CONSUMER_APP_NAME = "appName";
Expand Down
4 changes: 1 addition & 3 deletions common/src/main/java/com/zimbra/common/util/ZimbraLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -278,15 +278,13 @@ public final class ZimbraLog {

/** the "zimbra.activity" logger. For ACTIVITY-related events */
public static final Log activity = LogFactory.getLog("zimbra.activity");

/** the "zimbra.ews" logger. For EWS-related events */
public static final Log ews = LogFactory.getLog("zimbra.ews");

/** the "zimbra.oauth" logger. For OAuth code. */
public static final Log oauth = LogFactory.getLog("zimbra.oauth");

/** the "zimbra.zmg" logger. For Zimbra Mobile Gateway. */
public static final Log zmg = LogFactory.getLog("zimbra.zmg");

/** the "zimbra.smime" logger. For Zimbra Smime. */
public static final Log smime = LogFactory.getLog("zimbra.smime");

Expand Down
8 changes: 0 additions & 8 deletions soap/src/main/java/com/zimbra/soap/JaxbUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ public final class JaxbUtil {
com.zimbra.soap.account.message.AuthResponse.class,
com.zimbra.soap.account.message.AutoCompleteGalRequest.class,
com.zimbra.soap.account.message.AutoCompleteGalResponse.class,
com.zimbra.soap.account.message.BootstrapMobileGatewayAppRequest.class,
com.zimbra.soap.account.message.BootstrapMobileGatewayAppResponse.class,
com.zimbra.soap.account.message.ChangePasswordRequest.class,
com.zimbra.soap.account.message.ChangePasswordResponse.class,
com.zimbra.soap.account.message.CheckRightsRequest.class,
Expand Down Expand Up @@ -110,8 +108,6 @@ public final class JaxbUtil {
com.zimbra.soap.account.message.GetDistributionListMembersResponse.class,
com.zimbra.soap.account.message.GetDistributionListRequest.class,
com.zimbra.soap.account.message.GetDistributionListResponse.class,
com.zimbra.soap.account.message.GetGcmSenderIdRequest.class,
com.zimbra.soap.account.message.GetGcmSenderIdResponse.class,
com.zimbra.soap.account.message.GetIdentitiesRequest.class,
com.zimbra.soap.account.message.GetIdentitiesResponse.class,
com.zimbra.soap.account.message.GetInfoRequest.class,
Expand Down Expand Up @@ -148,10 +144,6 @@ public final class JaxbUtil {
com.zimbra.soap.account.message.ModifyWhiteBlackListResponse.class,
com.zimbra.soap.account.message.ModifyZimletPrefsRequest.class,
com.zimbra.soap.account.message.ModifyZimletPrefsResponse.class,
com.zimbra.soap.account.message.RegisterMobileGatewayAppRequest.class,
com.zimbra.soap.account.message.RegisterMobileGatewayAppResponse.class,
com.zimbra.soap.account.message.RenewMobileGatewayAppTokenRequest.class,
com.zimbra.soap.account.message.RenewMobileGatewayAppTokenResponse.class,
com.zimbra.soap.account.message.ResetPasswordRequest.class,
com.zimbra.soap.account.message.ResetPasswordResponse.class,
com.zimbra.soap.admin.message.ResetAccountPasswordRequest.class,
Expand Down
Loading

0 comments on commit 3a63a78

Please sign in to comment.