소스 검색

Refactor code.

pull/8/head
Mushegh Sahakyan 4 년 전
부모
커밋
31d10ee3fa
4개의 변경된 파일5개의 추가작업 그리고 11개의 파일을 삭제
  1. +4
    -4
      ui/src/main/java/com/wireguard/android/activity/LoginActivity.java
  2. +0
    -3
      ui/src/main/java/com/wireguard/android/repository/DataRepository.java
  3. +0
    -4
      ui/src/main/java/com/wireguard/android/viewmodel/MainViewModel.java
  4. +1
    -0
      ui/src/main/res/values/strings.xml

+ 4
- 4
ui/src/main/java/com/wireguard/android/activity/LoginActivity.java 파일 보기

@@ -48,7 +48,7 @@ public class LoginActivity extends BaseActivityBubble {
@Override public void onClick(final View v) {
final String url = BASE_URL_PREFIX + bubbleName.getText().toString() + BASE_URL_SUFFIX;
if(url.split(SEPARATOR).length!=3){
Toast.makeText(LoginActivity.this,"Hostname not valid",Toast.LENGTH_LONG).show();
Toast.makeText(LoginActivity.this,getResources().getText(R.string.hostname_not_valid),Toast.LENGTH_LONG).show();
return;
}
if(DataRepository.getRepositoryInstance()==null) {
@@ -58,10 +58,10 @@ public class LoginActivity extends BaseActivityBubble {
loginViewModel.buildClientService(url);
}
loginViewModel.setUserURL(LoginActivity.this,url);
final String username = userName.getText().toString().trim();
final String password = LoginActivity.this.password.getText().toString().trim();
final String usernameInput = userName.getText().toString().trim();
final String passwordInput = password.getText().toString().trim();
showLoadingDialog();
login(username, password);
login(usernameInput, passwordInput);
}
});
}


+ 0
- 3
ui/src/main/java/com/wireguard/android/repository/DataRepository.java 파일 보기

@@ -317,9 +317,6 @@ public class DataRepository {
return config;
}

public TunnelManager getTunnelManager() {
return tunnelManager;
}

public ObservableTunnel createTunnel(final Context context, final boolean stateTunnel){
//TODO implement config is null case


+ 0
- 4
ui/src/main/java/com/wireguard/android/viewmodel/MainViewModel.java 파일 보기

@@ -20,10 +20,6 @@ public class MainViewModel extends ViewModel {
return DataRepository.getRepositoryInstance().getTunnel(context,stateTunnel);
}

public TunnelManager getTunnelManager() {
return DataRepository.getRepositoryInstance().getTunnelManager();
}

public void buildRepositoryInstance(Context context, String url){
DataRepository.buildRepositoryInstance(context,url);
}


+ 1
- 0
ui/src/main/res/values/strings.xml 파일 보기

@@ -246,4 +246,5 @@
<string name="connected_bubble">Connected</string>
<string name="failed_bubble">Failed</string>
<string name="disconnect">Disconnect</string>
<string name="hostname_not_valid">Hostname not valid</string>
</resources>

불러오는 중...
취소
저장