diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-02-07 19:19:20 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-02-17 21:14:09 +0100 |
commit | 6e2b630900f9de56f4ae1f2915f7b1ba3c1f90ed (patch) | |
tree | 53694268b30823c8973d6ae280ed766f4b44b974 /app/src/main/java/com/wireguard/android/fragment/TunnelController.java | |
parent | wg: bump commit (diff) | |
download | wireguard-android-6e2b630900f9de56f4ae1f2915f7b1ba3c1f90ed.tar.xz wireguard-android-6e2b630900f9de56f4ae1f2915f7b1ba3c1f90ed.zip |
GoBackend: integrate into app
Diffstat (limited to 'app/src/main/java/com/wireguard/android/fragment/TunnelController.java')
-rw-r--r-- | app/src/main/java/com/wireguard/android/fragment/TunnelController.java | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelController.java b/app/src/main/java/com/wireguard/android/fragment/TunnelController.java index ca40654e..990509e0 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelController.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelController.java @@ -1,18 +1,13 @@ package com.wireguard.android.fragment; -import android.app.AlertDialog; import android.content.Context; import android.databinding.DataBindingUtil; import android.databinding.ViewDataBinding; -import android.text.Html; -import android.text.method.LinkMovementMethod; import android.util.Log; import android.view.View; -import android.widget.TextView; import com.commonsware.cwac.crossport.design.widget.Snackbar; import com.wireguard.android.R; -import com.wireguard.android.backend.WgQuickBackend; import com.wireguard.android.databinding.TunnelDetailFragmentBinding; import com.wireguard.android.databinding.TunnelListItemBinding; import com.wireguard.android.model.Tunnel; @@ -47,26 +42,11 @@ public final class TunnelController { if (throwable == null) return; final Context context = view.getContext(); - if (ExceptionLoggers.unwrap(throwable) - instanceof WgQuickBackend.ModuleNotLoadedException) { - final String message = context.getString(R.string.not_supported_message); - final String title = context.getString(R.string.not_supported_title); - final AlertDialog dialog = new AlertDialog.Builder(context) - .setMessage(Html.fromHtml(message)) - .setPositiveButton(R.string.ok, null) - .setTitle(title) - .show(); - // Make links work. - ((TextView) dialog.findViewById(android.R.id.message)) - .setMovementMethod(LinkMovementMethod.getInstance()); - Log.e(TAG, title, throwable); - } else { - final String error = ExceptionLoggers.unwrap(throwable).getMessage(); - final int messageResId = checked ? R.string.error_up : R.string.error_down; - final String message = context.getString(messageResId, error); - Snackbar.make(view, message, Snackbar.LENGTH_LONG).show(); - Log.e(TAG, message, throwable); - } + final String error = ExceptionLoggers.unwrap(throwable).getMessage(); + final int messageResId = checked ? R.string.error_up : R.string.error_down; + final String message = context.getString(messageResId, error); + Snackbar.make(view, message, Snackbar.LENGTH_LONG).show(); + Log.e(TAG, message, throwable); }); } } |