From 2bd5c430d01bcbc2087d630d431a793a4c0a497d Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 13 Aug 2021 16:53:55 +0200 Subject: Add a dialog in Log Window allowing to start pending auth --- main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt | 2 -- main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'main/src/ui/java/de') diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt b/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt index 5a42599f..d01797f2 100644 --- a/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt +++ b/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt @@ -601,8 +601,6 @@ class ConfigConverter : BaseActivity(), FileSelectCallback, View.OnClickListener // We parsed the intent, relay on saved instance for restoring setIntent(null) } - - } private fun doImportIntent(intent: Intent) { diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java index 64eb720d..611e10e9 100644 --- a/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java +++ b/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java @@ -87,8 +87,10 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. private TextView mUpStatus; private TextView mDownStatus; private TextView mConnectStatus; + private TextView mStartPendingIntent; private boolean mShowOptionsLayout; private CheckBox mClearLogCheckBox; + private Intent mPendingIntent; @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { @@ -622,6 +624,10 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. mUpStatus = (TextView) v.findViewById(R.id.speedUp); mDownStatus = (TextView) v.findViewById(R.id.speedDown); mConnectStatus = (TextView) v.findViewById(R.id.speedStatus); + mStartPendingIntent = (TextView) v.findViewById(R.id.trigger_pending_action); + mStartPendingIntent.setOnClickListener((view) -> {if (mPendingIntent != null) + startActivity(mPendingIntent); + }); if (mShowOptionsLayout) mOptionsLayout.setVisibility(View.VISIBLE); return v; @@ -663,6 +669,8 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. if (mConnectStatus != null) mConnectStatus.setText(cleanLogMessage); } + mStartPendingIntent.setVisibility(intent == null ? View.GONE : View.VISIBLE); + mPendingIntent = intent; }); } } -- cgit v1.2.3