Fix parent activity problem.

eduvpn · Nov 8, 2016 · 6ba82fd · 6ba82fd
1 parent ec9097d
commit 6ba82fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java b/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
@@ -5,7 +5,6 @@
 
 package de.blinkt.openvpn.activities;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.MenuItem;
 

diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
@@ -11,6 +11,7 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ListFragment;
+import android.app.TaskStackBuilder;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -24,6 +25,7 @@
 import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
+import android.support.v4.app.NavUtils;
 import android.text.SpannableString;
 import android.text.format.DateFormat;
 import android.text.style.ImageSpan;
@@ -445,14 +447,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
         } else if (item.getItemId() == android.R.id.home) {
             // This is called when the Home (Up) button is pressed
             // in the Action Bar.
-            Intent parentActivityIntent = new Intent(getActivity(), MainActivity.class);
-            parentActivityIntent.addFlags(
-                    Intent.FLAG_ACTIVITY_CLEAR_TOP |
-                            Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(parentActivityIntent);
-            getActivity().finish();
+            NavUtils.navigateUpFromSameTask(getActivity());
             return true;
-
         }
         return super.onOptionsItemSelected(item);