diff --git a/src/main/java/org/olat/admin/user/imp/TransientIdentity.java b/src/main/java/org/olat/admin/user/imp/TransientIdentity.java index b1ab83724b6af6603ba5f2079d7c1a1d58056d81..4a17c2954c3b0c40a197e53d4566d2a4db4643be 100644 --- a/src/main/java/org/olat/admin/user/imp/TransientIdentity.java +++ b/src/main/java/org/olat/admin/user/imp/TransientIdentity.java @@ -90,6 +90,11 @@ public class TransientIdentity implements Identity, User { return properties.get(UserConstants.INSTITUTIONALEMAIL); } + @Override + public String getSmsTelMobile() { + return properties.get(UserConstants.SMSTELMOBILE); + } + public String getPassword() { return password; } diff --git a/src/main/java/org/olat/admin/user/imp/UpdateIdentity.java b/src/main/java/org/olat/admin/user/imp/UpdateIdentity.java index 4ebb3ca58ecd2e908bb3aabfdc237365f86fa833..3de1d29c910e2cd9ed7cbc124e74217480cb5e44 100644 --- a/src/main/java/org/olat/admin/user/imp/UpdateIdentity.java +++ b/src/main/java/org/olat/admin/user/imp/UpdateIdentity.java @@ -173,6 +173,11 @@ public class UpdateIdentity implements Identity { return updatedProperties.get(UserConstants.INSTITUTIONALEMAIL); } + @Override + public String getSmsTelMobile() { + return updatedProperties.get(UserConstants.SMSTELMOBILE); + } + @Override public Date getCreationDate() { return user.getCreationDate(); diff --git a/src/main/java/org/olat/basesecurity/model/QueryUserHelper.java b/src/main/java/org/olat/basesecurity/model/QueryUserHelper.java index 42475c06f860bc591a7e8310822ee784d45075c0..6bce3b909d7f277de20893600aa853ea00958d0d 100644 --- a/src/main/java/org/olat/basesecurity/model/QueryUserHelper.java +++ b/src/main/java/org/olat/basesecurity/model/QueryUserHelper.java @@ -75,6 +75,11 @@ public class QueryUserHelper implements User { return null; } + @Override + public String getSmsTelMobile() { + return null; + } + @Override public Preferences getPreferences() { return null; diff --git a/src/main/java/org/olat/core/commons/services/sms/manager/SimpleMessageServiceImpl.java b/src/main/java/org/olat/core/commons/services/sms/manager/SimpleMessageServiceImpl.java index fbf629be65a59731713c8ac2531df851be7c18f5..5900eb518fc114a0a98f4f617373c8524bdb6f7e 100644 --- a/src/main/java/org/olat/core/commons/services/sms/manager/SimpleMessageServiceImpl.java +++ b/src/main/java/org/olat/core/commons/services/sms/manager/SimpleMessageServiceImpl.java @@ -23,6 +23,7 @@ package org.olat.core.commons.services.sms.manager; import java.util.List; import java.util.Random; +import org.apache.logging.log4j.Logger; import org.olat.core.commons.services.sms.MessageLog; import org.olat.core.commons.services.sms.MessagesSPI; import org.olat.core.commons.services.sms.SimpleMessageException; @@ -35,8 +36,6 @@ import org.olat.core.gui.components.form.flexible.impl.Form; import org.olat.core.gui.control.WindowControl; import org.olat.core.helpers.Settings; import org.olat.core.id.Identity; -import org.olat.core.id.UserConstants; -import org.apache.logging.log4j.Logger; import org.olat.core.logging.Tracing; import org.olat.core.util.StringHelper; import org.springframework.beans.factory.annotation.Autowired; @@ -99,7 +98,7 @@ public class SimpleMessageServiceImpl implements SimpleMessageService { @Override public void sendMessage(String text, Identity recipient) throws SimpleMessageException { - String telNumber = recipient.getUser().getProperty(UserConstants.SMSTELMOBILE, null); + String telNumber = recipient.getUser().getSmsTelMobile(); sendMessage(text, telNumber, recipient); } diff --git a/src/main/java/org/olat/core/id/User.java b/src/main/java/org/olat/core/id/User.java index a91134f158d68e8990660318adecaa288b8f3ae6..74c476e402b410d08ee023d7c10b8f0175bd42e7 100644 --- a/src/main/java/org/olat/core/id/User.java +++ b/src/main/java/org/olat/core/id/User.java @@ -51,6 +51,12 @@ public interface User extends CreateInfo, Persistable { public String getEmail(); public String getInstitutionalEmail(); + + /** + * + * @return The real value, don't show it on any user interface + */ + public String getSmsTelMobile(); /** * Get the users prefereces object diff --git a/src/main/java/org/olat/core/util/mail/ui/EMailIdentity.java b/src/main/java/org/olat/core/util/mail/ui/EMailIdentity.java index 9f23e11df347c2be2ba4b7bce713f62215249c6a..23ac3ff0e0f75a72b16c2ea11f126b946222a8e6 100644 --- a/src/main/java/org/olat/core/util/mail/ui/EMailIdentity.java +++ b/src/main/java/org/olat/core/util/mail/ui/EMailIdentity.java @@ -126,6 +126,11 @@ public class EMailIdentity implements Identity { return data.get(UserConstants.INSTITUTIONALEMAIL); } + @Override + public String getSmsTelMobile() { + return data.get(UserConstants.SMSTELMOBILE); + } + @Override public Date getLastModified() { return null; diff --git a/src/main/java/org/olat/course/run/preview/PreviewIdentity.java b/src/main/java/org/olat/course/run/preview/PreviewIdentity.java index 071a1a43250abac745bbb4227689e2e9c86941a1..5b1b029c509f12ee5e667411025498699a337e3b 100644 --- a/src/main/java/org/olat/course/run/preview/PreviewIdentity.java +++ b/src/main/java/org/olat/course/run/preview/PreviewIdentity.java @@ -100,9 +100,11 @@ public final class PreviewIdentity implements Identity, User { return data.get(UserConstants.LASTNAME); } - /** - * @see org.olat.core.id.Identity#getUser() - */ + @Override + public String getSmsTelMobile() { + return data.get(UserConstants.SMSTELMOBILE); + } + @Override public User getUser() { return this; @@ -143,9 +145,6 @@ public final class PreviewIdentity implements Identity, User { // } - /** - * @see org.olat.core.commons.persistence.Auditable#getCreationDate() - */ @Override public Date getCreationDate() { return new Date(); @@ -160,10 +159,7 @@ public final class PreviewIdentity implements Identity, User { public Integer getStatus() { return Identity.STATUS_ACTIV; } - - /** - * @see org.olat.core.commons.persistence.Persistable#equalsByPersistableKey(org.olat.core.commons.persistence.Persistable) - */ + @Override public boolean equalsByPersistableKey(Persistable persistable) { return equals(persistable); diff --git a/src/main/java/org/olat/user/UserImpl.java b/src/main/java/org/olat/user/UserImpl.java index ca69ab1df34b14fb52e4f68c7fd78bbbe37bc49d..0f188976ebb91a20f08342a5cbf7465470788522 100644 --- a/src/main/java/org/olat/user/UserImpl.java +++ b/src/main/java/org/olat/user/UserImpl.java @@ -343,6 +343,14 @@ public class UserImpl implements Persistable, User { this.institutionalEmail = institutionalEmail; } + public String getSmsTelMobile() { + return smsTelMobile; + } + + public void setSmsTelMobile(String smsTelMobile) { + this.smsTelMobile = smsTelMobile; + } + public boolean isWebdav() { return webdav; }