diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
commit | 9108878992e9825a00c44f0596818d0ab245b183 (patch) | |
tree | 088b116ca4b1236827337a3d5ae204abc0f907bb /app/src/main/java/de/blinkt/openvpn/activities | |
parent | 6c1434addf1ee25a8c7ce30c240e2033d5075f35 (diff) | |
parent | 0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (diff) |
Merge branch 'leap_0.9.8' into #8797_certificate_expiration
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/activities')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java b/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java deleted file mode 100644 index 130084f5..00000000 --- a/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java +++ /dev/null @@ -1,37 +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.os.Bundle; -import android.view.MenuItem; - -import se.leap.bitmaskclient.R; -import de.blinkt.openvpn.fragments.LogFragment; - -/** - * Created by arne on 13.10.13. - */ -public class LogWindow extends BaseActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.log_window); - getActionBar().setDisplayHomeAsUpEnabled(true); - - if (savedInstanceState == null) { - getFragmentManager().beginTransaction() - .add(R.id.container, new LogFragment()) - .commit(); - } - - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - return super.onOptionsItemSelected(item); - } -} |