From 319ec5396371c6be311a2cc49630f392ca3c49ab Mon Sep 17 00:00:00 2001 From: Mushegh98 Date: Wed, 17 Jun 2020 21:36:16 +0400 Subject: [PATCH] Rename getConfig function to createTunnel. --- .../com/getbubblenow/android/activity/LoginActivity.java | 6 +----- .../getbubblenow/android/repository/DataRepository.java | 2 +- .../getbubblenow/android/viewmodel/LoginViewModel.java | 8 ++------ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ui/src/main/java/com/getbubblenow/android/activity/LoginActivity.java b/ui/src/main/java/com/getbubblenow/android/activity/LoginActivity.java index 2893778..0ca09a9 100644 --- a/ui/src/main/java/com/getbubblenow/android/activity/LoginActivity.java +++ b/ui/src/main/java/com/getbubblenow/android/activity/LoginActivity.java @@ -21,10 +21,6 @@ import com.getbubblenow.android.R; import com.getbubblenow.android.repository.DataRepository; import com.getbubblenow.android.resource.StatusResource; import com.getbubblenow.android.viewmodel.LoginViewModel; -import com.getbubblenow.android.model.User; -import com.getbubblenow.android.repository.DataRepository; -import com.getbubblenow.android.resource.StatusResource; -import com.getbubblenow.android.viewmodel.LoginViewModel; public class LoginActivity extends BaseActivityBubble { @@ -208,7 +204,7 @@ public class LoginActivity extends BaseActivityBubble { super.onActivityResult(requestCode, resultCode, data); if (requestCode == REQUEST_CODE && resultCode == RESULT_OK) { showLoadingDialog(); - loginViewModel.getConfig(this).observe(this, new Observer>() { + loginViewModel.createTunnel(this).observe(this, new Observer>() { @Override public void onChanged(final StatusResource objectStatusResource) { closeLoadingDialog(); switch (objectStatusResource.status){ diff --git a/ui/src/main/java/com/getbubblenow/android/repository/DataRepository.java b/ui/src/main/java/com/getbubblenow/android/repository/DataRepository.java index 69e88b9..9a969ad 100644 --- a/ui/src/main/java/com/getbubblenow/android/repository/DataRepository.java +++ b/ui/src/main/java/com/getbubblenow/android/repository/DataRepository.java @@ -291,7 +291,7 @@ public class DataRepository { }.getMutableLiveData(); } - public MutableLiveData> getConfig(Context context) { + public MutableLiveData> createTunnel(Context context) { return new NetworkBoundStatusResource(){ @Override protected void createCall() { diff --git a/ui/src/main/java/com/getbubblenow/android/viewmodel/LoginViewModel.java b/ui/src/main/java/com/getbubblenow/android/viewmodel/LoginViewModel.java index 72eae6c..031d0ce 100644 --- a/ui/src/main/java/com/getbubblenow/android/viewmodel/LoginViewModel.java +++ b/ui/src/main/java/com/getbubblenow/android/viewmodel/LoginViewModel.java @@ -4,10 +4,6 @@ import android.content.Context; import com.getbubblenow.android.repository.DataRepository; import com.getbubblenow.android.resource.StatusResource; -import com.getbubblenow.android.model.User; -import com.getbubblenow.android.repository.DataRepository; -import com.getbubblenow.android.resource.StatusResource; -import com.getbubblenow.android.util.UserStore; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -39,7 +35,7 @@ public class LoginViewModel extends ViewModel { DataRepository.getRepositoryInstance().setHostName(context,hostname); } - public MutableLiveData> getConfig(Context context) { - return DataRepository.getRepositoryInstance().getConfig(context); + public MutableLiveData> createTunnel(Context context) { + return DataRepository.getRepositoryInstance().createTunnel(context); } }