1 files changed, 3 insertions, 21 deletions

diff --git a/app/src/main/java/com/wireguard/android/ConfigActivity.java b/app/src/main/java/com/wireguard/android/ConfigActivity.java
index 24284eb1..b92b34e3 100644
--- a/app/src/main/java/com/wireguard/android/ConfigActivity.java
+++ b/app/src/main/java/com/wireguard/android/ConfigActivity.java
@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.wireguard.android.backends.VpnService;
 import com.wireguard.config.Config;
 
 /**
@@ -18,7 +17,6 @@ import com.wireguard.config.Config;
 
 public class ConfigActivity extends BaseConfigActivity {
     private static final String KEY_EDITOR_STATE = "editorState";
-    private static final int REQUEST_IMPORT = 1;
     private static final String TAG_DETAIL = "detail";
     private static final String TAG_EDIT = "edit";
     private static final String TAG_LIST = "list";
@@ -134,17 +132,10 @@ public class ConfigActivity extends BaseConfigActivity {
     }
 
     @Override
-    public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
-        if (requestCode == REQUEST_IMPORT) {
-            if (resultCode == RESULT_OK)
-                VpnService.getInstance().importFrom(data.getData());
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    @Override
     public void onBackPressed() {
+        final ConfigListFragment listFragment = (ConfigListFragment) fragments.get(TAG_LIST);
+        if (listFragment.isVisible() && listFragment.tryCollapseMenu())
+            return;
         super.onBackPressed();
         // The visible fragment is now the one that was on top of the back stack, if there was one.
         if (isEditing())
@@ -200,19 +191,10 @@ public class ConfigActivity extends BaseConfigActivity {
                 // The back arrow in the action bar should act the same as the back button.
                 onBackPressed();
                 return true;
-            case R.id.menu_action_add:
-                startActivity(new Intent(this, AddActivity.class));
-                return true;
             case R.id.menu_action_edit:
                 // Try to make the editing fragment visible.
                 setIsEditing(true);
                 return true;
-            case R.id.menu_action_import:
-                final Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-                intent.addCategory(Intent.CATEGORY_OPENABLE);
-                intent.setType("*/*");
-                startActivityForResult(intent, REQUEST_IMPORT);
-                return true;
             case R.id.menu_action_save:
                 // This menu item is handled by the editing fragment.
                 return false;