frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

global: format code

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2020-03-09 12:36:47 -06:00
parent 40ebf8006e
commit 2e55e5fd05
19 changed files with 305 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.java
+34 -34
View File
@@ -34,8 +34,20 @@ import androidx.databinding.DataBindingUtil;
@NonNullForAll
public class TunnelDetailFragment extends BaseFragment {
@Nullable private TunnelDetailFragmentBinding binding;
@Nullable private Timer timer;
@Nullable private State lastState = State.TOGGLE;
@Nullable private Timer timer;
private String formatBytes(final long bytes) {
if (bytes < 1024)
return requireContext().getString(R.string.transfer_bytes, bytes);
else if (bytes < 1024 * 1024)
return requireContext().getString(R.string.transfer_kibibytes, bytes / 1024.0);
else if (bytes < 1024 * 1024 * 1024)
return requireContext().getString(R.string.transfer_mibibytes, bytes / (1024.0 * 1024.0));
else if (bytes < 1024 * 1024 * 1024 * 1024)
return requireContext().getString(R.string.transfer_gibibytes, bytes / (1024.0 * 1024.0 * 1024.0));
return requireContext().getString(R.string.transfer_tibibytes, bytes / (1024.0 * 1024.0 * 1024.0) / 1024.0);
}
@Override
public void onCreate(@Nullable final Bundle savedInstanceState) {
@@ -48,27 +60,6 @@ public class TunnelDetailFragment extends BaseFragment {
inflater.inflate(R.menu.tunnel_detail, menu);
}
@Override
public void onStop() {
super.onStop();
if (timer != null) {
timer.cancel();
timer = null;
}
}
@Override
public void onResume() {
super.onResume();
timer = new Timer();
timer.scheduleAtFixedRate(new TimerTask() {
@Override
public void run() {
updateStats();
}
}, 0, 1000);
}
@Override
public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGroup container,
@Nullable final Bundle savedInstanceState) {
@@ -86,6 +77,18 @@ public class TunnelDetailFragment extends BaseFragment {
super.onDestroyView();
}
@Override
public void onResume() {
super.onResume();
timer = new Timer();
timer.scheduleAtFixedRate(new TimerTask() {
@Override
public void run() {
updateStats();
}
}, 0, 1000);
}
@Override
public void onSelectedTunnelChanged(@Nullable final ObservableTunnel oldTunnel, @Nullable final ObservableTunnel newTunnel) {
if (binding == null)
@@ -99,6 +102,15 @@ public class TunnelDetailFragment extends BaseFragment {
updateStats();
}
@Override
public void onStop() {
super.onStop();
if (timer != null) {
timer.cancel();
timer = null;
}
}
@Override
public void onViewStateRestored(@Nullable final Bundle savedInstanceState) {
if (binding == null) {
@@ -110,18 +122,6 @@ public class TunnelDetailFragment extends BaseFragment {
super.onViewStateRestored(savedInstanceState);
}
private String formatBytes(final long bytes) {
if (bytes < 1024)
return requireContext().getString(R.string.transfer_bytes, bytes);
else if (bytes < 1024*1024)
return requireContext().getString(R.string.transfer_kibibytes, bytes/1024.0);
else if (bytes < 1024*1024*1024)
return requireContext().getString(R.string.transfer_mibibytes, bytes/(1024.0*1024.0));
else if (bytes < 1024*1024*1024*1024)
return requireContext().getString(R.string.transfer_gibibytes, bytes/(1024.0*1024.0*1024.0));
return requireContext().getString(R.string.transfer_tibibytes, bytes/(1024.0*1024.0*1024.0)/1024.0);
}
private void updateStats() {
if (binding == null || !isResumed())
return;
ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+8 -8
View File
@@ -262,14 +262,6 @@ public class TunnelListFragment extends BaseFragment {
});
}
private void showSnackbar(final CharSequence message) {
if (binding != null) {
final Snackbar snackbar = Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG);
snackbar.setAnchorView(binding.createFab);
snackbar.show();
}
}
private void onTunnelDeletionFinished(final Integer count, @Nullable final Throwable throwable) {
final String message;
if (throwable == null) {
@@ -337,6 +329,14 @@ public class TunnelListFragment extends BaseFragment {
});
}
private void showSnackbar(final CharSequence message) {
if (binding != null) {
final Snackbar snackbar = Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG);
snackbar.setAnchorView(binding.createFab);
snackbar.show();
}
}
private MultiselectableRelativeLayout viewForTunnel(final ObservableTunnel tunnel, final List tunnels) {
return (MultiselectableRelativeLayout) binding.tunnelList.findViewHolderForAdapterPosition(tunnels.indexOf(tunnel)).itemView;
}