Kaynağa Gözat

Refactor code.

pull/8/head
Mushegh Sahakyan 4 yıl önce
ebeveyn
işleme
98a4b8433d
1 değiştirilmiş dosya ile 14 ekleme ve 18 silme
  1. +14
    -18
      ui/src/main/java/com/wireguard/android/activity/MainActivity.java

+ 14
- 18
ui/src/main/java/com/wireguard/android/activity/MainActivity.java Dosyayı Görüntüle

@@ -73,15 +73,7 @@ public class MainActivity extends AppCompatActivity {
connectionStateFlag = state; connectionStateFlag = state;
mainViewModel.connect(state, MainActivity.this).observe(MainActivity.this, new Observer<Boolean>() { mainViewModel.connect(state, MainActivity.this).observe(MainActivity.this, new Observer<Boolean>() {
@Override public void onChanged(final Boolean state) { @Override public void onChanged(final Boolean state) {
if (state) {
Toast.makeText(MainActivity.this, getString(R.string.connected_bubble), Toast.LENGTH_SHORT).show();
bubbleStatus.setText(getString(R.string.connected_bubble));
connectButton.setText(getString(R.string.disconnect));
} else {
Toast.makeText(MainActivity.this, getString(R.string.not_connected_bubble), Toast.LENGTH_SHORT).show();
bubbleStatus.setText(getString(R.string.not_connected_bubble));
connectButton.setText(getString(R.string.connect));
}
setConnectionStateUI(state);
} }
}); });
} }
@@ -93,15 +85,7 @@ public class MainActivity extends AppCompatActivity {
mainViewModel.connectWithPermission(connectionStateFlag, this) mainViewModel.connectWithPermission(connectionStateFlag, this)
.observe(this, new Observer<Boolean>() { .observe(this, new Observer<Boolean>() {
@Override public void onChanged(final Boolean state) { @Override public void onChanged(final Boolean state) {
if (state) {
Toast.makeText(MainActivity.this, getString(R.string.connected_bubble), Toast.LENGTH_SHORT).show();
bubbleStatus.setText(getString(R.string.connected_bubble));
connectButton.setText(getString(R.string.disconnect));
} else {
Toast.makeText(MainActivity.this, getString(R.string.not_connected_bubble), Toast.LENGTH_SHORT).show();
bubbleStatus.setText(getString(R.string.not_connected_bubble));
connectButton.setText(getString(R.string.connect));
}
setConnectionStateUI(state);
} }
}); });
} else { } else {
@@ -112,4 +96,16 @@ public class MainActivity extends AppCompatActivity {
} }
} }
} }

private void setConnectionStateUI(boolean state){
if (state) {
Toast.makeText(this, getString(R.string.connected_bubble), Toast.LENGTH_SHORT).show();
bubbleStatus.setText(getString(R.string.connected_bubble));
connectButton.setText(getString(R.string.disconnect));
} else {
Toast.makeText(this, getString(R.string.not_connected_bubble), Toast.LENGTH_SHORT).show();
bubbleStatus.setText(getString(R.string.not_connected_bubble));
connectButton.setText(getString(R.string.connect));
}
}
} }

Yükleniyor…
İptal
Kaydet