Merge pull request #918 from charithag/master

Fix twisted username and password fields in remote session

components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/src/main/java/org/wso2/carbon/device/mgt/extensions/remote.session/authentication/oauth/OAuthTokenValidatorStubFactory.java

@@ -107,8 +107,8 @@ public class OAuthTokenValidatorStubFactory extends BasePoolableObjectFactory {
             auth.setPreemptiveAuthentication(true);
             String username = tokenValidationProperties.get(RemoteSessionConstants.USERNAME);
             String password = tokenValidationProperties.get(RemoteSessionConstants.PASSWORD);
-            auth.setPassword(username);
+            auth.setUsername(username);
-            auth.setUsername(password);
+            auth.setPassword(password);
             Options options = client.getOptions();
             options.setProperty(HTTPConstants.AUTHENTICATE, auth);
             options.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Constants.VALUE_TRUE);

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java

@@ -412,6 +412,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override
+    public Operation getNextPendingOperation(DeviceIdentifier deviceIdentifier, long l) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public void updateOperation(DeviceIdentifier deviceIdentifier, Operation operation)
             throws OperationManagementException {
@@ -471,11 +476,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return 0;
     }
 
+    @Override
+    public List<Activity> getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public int getActivityCountUpdatedAfter(long l) throws OperationManagementException {
         return 0;
     }
 
+    @Override
+    public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException {
+        return 0;
+    }
+
     @Override
     public List<MonitoringOperation> getMonitoringOperationList(String s) {
         return null;

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java

@@ -412,6 +412,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override
+    public Operation getNextPendingOperation(DeviceIdentifier deviceIdentifier, long l) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public void updateOperation(DeviceIdentifier deviceIdentifier, Operation operation)
             throws OperationManagementException {
@@ -471,11 +476,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return 0;
     }
 
+    @Override
+    public List<Activity> getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public int getActivityCountUpdatedAfter(long l) throws OperationManagementException {
         return 0;
     }
 
+    @Override
+    public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException {
+        return 0;
+    }
+
     @Override
     public List<MonitoringOperation> getMonitoringOperationList(String s) {
         return null;

pom.xml

@@ -1230,7 +1230,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>3.1.34</carbon.devicemgt.version>
+        <carbon.devicemgt.version>3.1.47</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[3.1.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->