BKNDLSS-17823 Remove all unregisterDeviceOnServer as well as registerDeviceOnServer methods

Author: oleg

src/com/backendless/Messaging.java

@@ -65,11 +65,11 @@
 public final class Messaging
 {
   private final static String MESSAGING_MANAGER_SERVER_ALIAS = "com.backendless.services.messaging.MessagingService";
-  public final static String DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS = "com.backendless.services.messaging.DeviceRegistrationService";
+  private final static String DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS = "com.backendless.services.messaging.DeviceRegistrationService";
   private final static String EMAIL_MANAGER_SERVER_ALIAS = "com.backendless.services.mail.CustomersEmailService";
   private final static String DEFAULT_CHANNEL_NAME = "default";
-  public final static String OS;
-  public final static String OS_VERSION;
+  private final static String OS;
+  private final static String OS_VERSION;
   private static final Messaging instance = new Messaging();
   private static final ChannelFactory chanelFactory = new ChannelFactory();
 
@@ -131,6 +131,21 @@ public static String getDeviceId()
     return DeviceIdHolder.id;
   }
 
+  public static String getDeviceRegistrationManagerServerAlias()
+  {
+    return DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS;
+  }
+
+  public static String getOS()
+  {
+    return OS;
+  }
+
+  public static String getOsVersion()
+  {
+    return OS_VERSION;
+  }
+
   static Messaging getInstance()
   {
     return instance;

src/com/backendless/push/DeviceRegistrationUtil.java

@@ -31,14 +31,14 @@ public String registerDeviceOnServer( String deviceToken, final List<String> cha
 
     DeviceRegistration deviceRegistration = new DeviceRegistration();
     deviceRegistration.setDeviceId( Messaging.getDeviceId() );
-    deviceRegistration.setOs( Messaging.OS );
-    deviceRegistration.setOsVersion( Messaging.OS_VERSION );
+    deviceRegistration.setOs( Messaging.getOS() );
+    deviceRegistration.setOsVersion( Messaging.getOsVersion() );
     deviceRegistration.setDeviceToken( deviceToken );
     deviceRegistration.setChannels( channels );
     if( expiration != 0 )
       deviceRegistration.setExpiration( new Date( expiration ) );
 
-    return Invoker.invokeSync( Messaging.DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS, "registerDevice", new Object[] { deviceRegistration } );
+    return Invoker.invokeSync( Messaging.getDeviceRegistrationManagerServerAlias(), "registerDevice", new Object[] { deviceRegistration } );
   }
 
   public void registerDeviceOnServer( String deviceToken, final List<String> channels, final long expiration, final AsyncCallback<String> responder )
@@ -50,14 +50,14 @@ public void registerDeviceOnServer( String deviceToken, final List<String> chann
 
       DeviceRegistration deviceRegistration = new DeviceRegistration();
       deviceRegistration.setDeviceId( Messaging.getDeviceId() );
-      deviceRegistration.setOs( Messaging.OS );
-      deviceRegistration.setOsVersion( Messaging.OS_VERSION );
+      deviceRegistration.setOs( Messaging.getOS() );
+      deviceRegistration.setOsVersion( Messaging.getOsVersion() );
       deviceRegistration.setDeviceToken( deviceToken );
       deviceRegistration.setChannels( channels );
       if( expiration != 0 )
         deviceRegistration.setExpiration( new Date( expiration ) );
 
-      Invoker.invokeAsync( Messaging.DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS, "registerDevice", new Object[] { deviceRegistration }, new AsyncCallback<String>()
+      Invoker.invokeAsync( Messaging.getDeviceRegistrationManagerServerAlias(), "registerDevice", new Object[] { deviceRegistration }, new AsyncCallback<String>()
       {
         @Override
         public void handleResponse( String response )
@@ -83,21 +83,21 @@ public void handleFault( BackendlessFault fault )
 
   public boolean unregisterDeviceOnServer()
   {
-    return (Boolean) Invoker.invokeSync( Messaging.DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS, "unregisterDevice", new Object[] { Messaging.getDeviceId() } );
+    return (Boolean) Invoker.invokeSync( Messaging.getDeviceRegistrationManagerServerAlias(), "unregisterDevice", new Object[] { Messaging.getDeviceId() } );
   }
 
   public void unregisterDeviceOnServer( final AsyncCallback<Boolean> responder )
   {
-    Invoker.invokeAsync( Messaging.DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS, "unregisterDevice", new Object[] { Messaging.getDeviceId() }, responder );
+    Invoker.invokeAsync( Messaging.getDeviceRegistrationManagerServerAlias(), "unregisterDevice", new Object[] { Messaging.getDeviceId() }, responder );
   }
 
   public int unregisterDeviceOnServer( List<String> channels )
   {
-    return (int) Invoker.invokeSync( Messaging.DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS, "unregisterDevice", new Object[] { Messaging.getDeviceId(), channels } );
+    return (int) Invoker.invokeSync( Messaging.getDeviceRegistrationManagerServerAlias(), "unregisterDevice", new Object[] { Messaging.getDeviceId(), channels } );
   }
 
   public void unregisterDeviceOnServer( List<String> channels, final AsyncCallback<Integer> responder )
   {
-    Invoker.invokeAsync( Messaging.DEVICE_REGISTRATION_MANAGER_SERVER_ALIAS, "unregisterDevice", new Object[] { Messaging.getDeviceId(), channels }, responder );
+    Invoker.invokeAsync( Messaging.getDeviceRegistrationManagerServerAlias(), "unregisterDevice", new Object[] { Messaging.getDeviceId(), channels }, responder );
   }
 }