implement_add_device_functionality

gegham commented 4 years ago

There should be 3 methods for devices:
getAllDevices(): we already have this. It should fetch all the devices from the API.
addDevice(): This method should add a new device to API. It should not deal with anything but adding a device.
getDevice(): This should be the method called from the LoginActivity. It should:
1. Check if there is an existing device in shared prefs, then just return it.
2. If there is no device, then make the getAllDevices call, and then the addDevice call, with the logic that we already have.

So the Login activity and it’s ViewModel shouldn’t be aware if the device was created or it already existed.

There is no content yet.

gegham was assigned by musheghsahakyan98 4 years ago

gegham requested changes 4 years ago

ui/src/main/java/com/wireguard/android/activity/LoginActivity.java

ui/src/main/java/com/wireguard/android/api/ApiConstants.java

ui/src/main/java/com/wireguard/android/repository/DataRepository.java

ui/src/main/AndroidManifest.xml

												
			@@ -73,3 +73,3 @@
		
			            </intent-filter>
		
			        </activity>
		
			        <activity android:name=".activity.BaseActivityBubble" />

Do we need to have the BaseActivity in Manifest?

ui/src/main/java/com/wireguard/android/fragment/LoadingDialogFragment.java

												
			@@ -0,0 +32,4 @@
		
			        final Dialog dialog = new Dialog(getActivity(), getTheme()) {
		
			            @Override
		
			            public void onBackPressed() {
		
			                if (getActivity().getSupportFragmentManager().findFragmentByTag(LoginActivity.LOADING_TAG) != null) {

Why is the LoginActivity.LOADING_TAG used here?

												
			@@ -74,0 +128,4 @@
		
			                        final String brand = getBrand();
		
			                        final String model = getDeviceModel();
		
			                        final String imei = getDeviceID(context);
		
			                        final String deviceName = brand + " " + model + " " + ":" + " " + imei;

Put all the hardcoded strings in constants: " “, " : "

												
			@@ -74,0 +138,4 @@
		
			                                    String brandModel = brand + " " + model + " ";
		
			                                    final List<Device> list = response.body();
		
			                                    final List<String> arrayListDevicesName = new ArrayList<>();
		
			                                    boolean flag = true;

Rename the boolean

												
			@@ -74,0 +143,4 @@
		
			                                        final String[] deviceNameItem = device.getName().split(":");
		
			                                        final String[] myDeviceName = deviceName.split(":");
		
			                                        if(deviceNameItem.length>1){
		
			                                            if(deviceNameItem[0].contains(myDeviceName[0]) && deviceNameItem[1].contains(myDeviceName[1])){

Change magic numbers to constants

												
			@@ -74,0 +247,4 @@
		
			                }.getMutableLiveData();
		
			            }
		
			            private MutableLiveData<List<Device>> getAllDevices(Context context){

Do we need LIveData here?

												
			@@ -66,0 +142,4 @@
		
			                                    brandModel = deviceName;
		
			                                    final HashMap<String, String> body = new HashMap<>();
		
			                                    body.put(ApiConstants.DEVICE_NAME, brandModel);
		
			                                    body.put(ApiConstants.DEVICE_TYPE, "android");

Rename disposable2 and disposable properties accordingly

gegham approved these changes 4 years ago

gegham referenced this issue from a commit 4 years ago

Merge pull request 'implement_add_device_functionality' (#4) from implement_add_device_functionality into dev Reviewed-on: https://git.bubblev.org/bubblev/bubble-droid/pulls/4

gegham closed this pull request 4 years ago

gegham deleted branch implement_add_device_functionality 4 years ago

Reviewers

The pull request has been merged as 7dd33ca862.

@@ -66,0 +70,4 @@
                                 switch (deviceStatusResource.status){
                                     case SUCCESS:
                                         Toast.makeText(LoginActivity.this,"Success",Toast.LENGTH_SHORT).show();
                                         Intent intent = new Intent(LoginActivity.this,MainActivity.class);

@@ -66,0 +75,4 @@
                                         startActivity(intent);
                                         Log.d("TAG","Success");
                                         break;
                                     case LOADING:

@@ -6,2 +7,4 @@
     public static final String ADD_DEVICE_URL = "me/devices";
     public static final String USERNAME = "username";
     public static final String PASSWORD = "password";
     public static final String HEADER = "X-Bubble-Session";

@@ -66,0 +83,4 @@
                         .subscribeOn(Schedulers.newThread())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(listDevices->{
                             boolean flag = true;

@@ -66,0 +115,4 @@
                             String brandModel = brand + SPACE + model + SPACE;
                             final List<Device> list = listDevices;
                             final List<String> arrayListDevicesName = new ArrayList<>();
                             boolean isHaveDevice = false;

@@ -66,0 +85,4 @@
                                 }
                             }
                         });
                        // Toast.makeText(LoginActivity.this,"Success",Toast.LENGTH_SHORT).show();

@@ -86,0 +246,4 @@
         return Character.isUpperCase(first) ? brand : Character.toUpperCase(first) + brand.substring(1);
     }
     private String getDeviceIMEI(final Context context) {

@@ -71,6 +75,151 @@ public class DataRepository {
         }.getMutableLiveData();
     }
     public MutableLiveData<StatusResource<Device>> getAllDevices(Context context) {

#4 implement_add_device_functionality

Reviewers