diff options
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/activities/BaseActivity.java | 27 | ||||
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java | 99 | 
2 files changed, 0 insertions, 126 deletions
| diff --git a/app/src/main/java/de/blinkt/openvpn/activities/BaseActivity.java b/app/src/main/java/de/blinkt/openvpn/activities/BaseActivity.java deleted file mode 100644 index 8cdc1e90..00000000 --- a/app/src/main/java/de/blinkt/openvpn/activities/BaseActivity.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2012-2015 Arne Schwabe - * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt - */ - -package de.blinkt.openvpn.activities; - -import android.app.Activity; -import android.app.UiModeManager; -import android.content.res.Configuration; -import android.os.Bundle; -import android.view.Window; - -public class BaseActivity extends Activity { -    private boolean isAndroidTV() { -        final UiModeManager uiModeManager = (UiModeManager) getSystemService(Activity.UI_MODE_SERVICE); -        return uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION; -    } - -    @Override -    protected void onCreate(Bundle savedInstanceState) { -        if (isAndroidTV()) { -            requestWindowFeature(Window.FEATURE_OPTIONS_PANEL); -        } -        super.onCreate(savedInstanceState); -    } -} diff --git a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java deleted file mode 100644 index 068821f5..00000000 --- a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2012-2016 Arne Schwabe - * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt - */ - -package de.blinkt.openvpn.activities; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.ComponentName; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.ServiceConnection; -import android.os.IBinder; -import android.os.RemoteException; - -import de.blinkt.openvpn.LaunchVPN; -import se.leap.bitmaskclient.R; -import de.blinkt.openvpn.core.IOpenVPNServiceInternal; -import de.blinkt.openvpn.core.OpenVPNService; -import de.blinkt.openvpn.core.ProfileManager; -import de.blinkt.openvpn.core.VpnStatus; - -/** - * Created by arne on 13.10.13. - */ -public class DisconnectVPN extends Activity implements DialogInterface.OnClickListener, DialogInterface.OnCancelListener { -    private IOpenVPNServiceInternal mService; -    private ServiceConnection mConnection = new ServiceConnection() { - - - -        @Override -        public void onServiceConnected(ComponentName className, -                                       IBinder service) { - -            mService = IOpenVPNServiceInternal.Stub.asInterface(service); -        } - -        @Override -        public void onServiceDisconnected(ComponentName arg0) { -            mService = null; -        } - -    }; - -    @Override -    protected void onResume() { -        super.onResume(); -        Intent intent = new Intent(this, OpenVPNService.class); -        intent.setAction(OpenVPNService.START_SERVICE); -        bindService(intent, mConnection, Context.BIND_AUTO_CREATE); -        showDisconnectDialog(); -    } - -    @Override -    protected void onPause() { -        super.onPause(); -        unbindService(mConnection); -    } - -    private void showDisconnectDialog() { -        AlertDialog.Builder builder = new AlertDialog.Builder(this); -        builder.setTitle(R.string.title_cancel); -        builder.setMessage(R.string.cancel_connection_query); -        builder.setNegativeButton(android.R.string.cancel, this); -        builder.setPositiveButton(R.string.cancel_connection, this); -        builder.setNeutralButton(R.string.reconnect, this); -        builder.setOnCancelListener(this); - -        builder.show(); -    } - -    @Override -    public void onClick(DialogInterface dialog, int which) { -        if (which == DialogInterface.BUTTON_POSITIVE) { -            ProfileManager.setConntectedVpnProfileDisconnected(this); -            if (mService != null) { -                try { -                    mService.stopVPN(false); -                } catch (RemoteException e) { -                    VpnStatus.logException(e); -                } -            } -        } else if (which == DialogInterface.BUTTON_NEUTRAL) { -            Intent intent = new Intent(this, LaunchVPN.class); -            intent.putExtra(LaunchVPN.EXTRA_KEY, VpnStatus.getLastConnectedVPNProfile()); -            intent.setAction(Intent.ACTION_MAIN); -            startActivity(intent); -        } -        finish(); -    } - -    @Override -    public void onCancel(DialogInterface dialog) { -        finish(); -    } -} | 
