ui_sprint_2

New Pull Request

Conversation 0 Commits 7 Files Changed 20

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/repository/DataRepository.java

gegham requested changes 4 years ago

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

												
			@@ -60,1 +72,4 @@
		
			    }
		
			    protected void showNetworkNotAvailableMessage(Context context) {
		
			        if (context instanceof LoginActivity) {

gegham commented 4 years ago

if (context instanceof LoginActivity) {
((LoginActivity) context).runOnUiThread(new Runnable() {
@Override public void run() {

We don’t need this codes anymore, and the method doesn’t need to take a context parameter, as it already has a context.

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

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

												
			@@ -449,0 +471,4 @@
		
			    private void setErrorMessage(Throwable throwable , NetworkBoundStatusResource<User> liveData){
		
			        if( throwable instanceof UnknownHostException || throwable instanceof ConnectException){
		
			           liveData.postMutableLiveData(StatusResource.error("no network"));

gegham commented 4 years ago

Fix the hardcode, reuse the static property in LoginActivity too.

gegham approved these changes 4 years ago

gegham referenced this issue from a commit 4 years ago

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

gegham closed this pull request 4 years ago

gegham deleted branch ui_sprint_2 4 years ago

Reviewers

gegham approved these changes 4 years ago

The pull request has been merged as 8d605ba5c1.

Sign in to join this conversation.

gegham

No Label

No Milestone

gegham

2 Participants

Notifications

Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

@@ -191,6 +195,9 @@ public class LoginActivity extends BaseActivityBubble {
                         break;
                     case ERROR:
                         closeLoadingDialog();
                         if("no network".equals(userStatusResource.message)){

@@ -447,2 +460,4 @@
         return liveData;
     }
     private void showNetworkNotAvailableMessage(Throwable throwable , Context context){

#12 ui_sprint_2

Reviewers