1 files changed, 193 insertions, 183 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
index e15fe509..cf712e7c 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
@@ -22,8 +22,10 @@ import android.view.*;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import de.blinkt.openvpn.*;
 import de.blinkt.openvpn.activities.ConfigConverter;
 import de.blinkt.openvpn.activities.FileSelect;
@@ -34,120 +36,120 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.TreeSet;
 
-public class VPNProfileList extends ListFragment {
+public class VPNProfileList extends ListFragment implements OnClickListener {
 
-	public final static int RESULT_VPN_DELETED = Activity.RESULT_FIRST_USER;
-    public final static int RESULT_VPN_DUPLICATE = Activity.RESULT_FIRST_USER +1 ;
+    public final static int RESULT_VPN_DELETED = Activity.RESULT_FIRST_USER;
+    public final static int RESULT_VPN_DUPLICATE = Activity.RESULT_FIRST_USER + 1;
 
-	private static final int MENU_ADD_PROFILE = Menu.FIRST;
+    private static final int MENU_ADD_PROFILE = Menu.FIRST;
 
-	private static final int START_VPN_CONFIG = 92;
-	private static final int SELECT_PROFILE = 43;
-	private static final int IMPORT_PROFILE = 231;
+    private static final int START_VPN_CONFIG = 92;
+    private static final int SELECT_PROFILE = 43;
+    private static final int IMPORT_PROFILE = 231;
     private static final int FILE_PICKER_RESULT_KITKAT = 392;
 
-	private static final int MENU_IMPORT_PROFILE = Menu.FIRST +1;
+    private static final int MENU_IMPORT_PROFILE = Menu.FIRST + 1;
 
 
     class VPNArrayAdapter extends ArrayAdapter<VpnProfile> {
 
-		public VPNArrayAdapter(Context context, int resource,
-				int textViewResourceId) {
-			super(context, resource, textViewResourceId);
-		}
-
-		@Override
-		public View getView(final int position, View convertView, ViewGroup parent) {
-			View v = super.getView(position, convertView, parent);
-
-			View titleview = v.findViewById(R.id.vpn_list_item_left);
-			titleview.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					VpnProfile profile =(VpnProfile) getListAdapter().getItem(position);
-					startVPN(profile);
-				}
-			});
-
-			View settingsview = v.findViewById(R.id.quickedit_settings);
-			settingsview.setOnClickListener(new OnClickListener() {
-
-				@Override
-				public void onClick(View v) {
-					VpnProfile editProfile = (VpnProfile) getListAdapter().getItem(position);
-					editVPN(editProfile);
-
-				}
-			});
-
-			return v;
-		}
-	}
-
-
-
+        public VPNArrayAdapter(Context context, int resource,
+                               int textViewResourceId) {
+            super(context, resource, textViewResourceId);
+        }
 
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            View v = super.getView(position, convertView, parent);
+
+            View titleview = v.findViewById(R.id.vpn_list_item_left);
+            titleview.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    VpnProfile profile = (VpnProfile) getListAdapter().getItem(position);
+                    startVPN(profile);
+                }
+            });
+
+            View settingsview = v.findViewById(R.id.quickedit_settings);
+            settingsview.setOnClickListener(new OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
+                    VpnProfile editProfile = (VpnProfile) getListAdapter().getItem(position);
+                    editVPN(editProfile);
+
+                }
+            });
+
+            return v;
+        }
+    }
 
 
+    private ArrayAdapter<VpnProfile> mArrayadapter;
 
+    protected VpnProfile mEditProfile = null;
 
-	private ArrayAdapter<VpnProfile> mArrayadapter;
 
-	protected VpnProfile mEditProfile=null;
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
 
+    }
 
 
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setHasOptionsMenu(true);
+    class MiniImageGetter implements ImageGetter {
 
-	}
 
+        @Override
+        public Drawable getDrawable(String source) {
+            Drawable d = null;
+            if ("ic_menu_add".equals(source))
+                d = getActivity().getResources().getDrawable(R.drawable.ic_menu_add_grey);
+            else if ("ic_menu_archive".equals(source))
+                d = getActivity().getResources().getDrawable(R.drawable.ic_menu_import_grey);
+
+
+            if (d != null) {
+                d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());
+                return d;
+            } else {
+                return null;
+            }
+        }
+    }
 
-	class MiniImageGetter implements ImageGetter {
 
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.vpn_profile_list, container, false);
 
-		@Override
-		public Drawable getDrawable(String source) {
-			Drawable d=null;
-			if ("ic_menu_add".equals(source))
-				d = getActivity().getResources().getDrawable(R.drawable.ic_menu_add_grey);
-			else if("ic_menu_archive".equals(source))
-				d = getActivity().getResources().getDrawable(R.drawable.ic_menu_import_grey);
-			
-			
-			
-			if(d!=null) {
-				d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());
-				return d;
-			}else{
-				return null;
-			}
-		}
-	}
+        TextView newvpntext = (TextView) v.findViewById(R.id.add_new_vpn_hint);
+        TextView importvpntext = (TextView) v.findViewById(R.id.import_vpn_hint);
 
+        newvpntext.setText(Html.fromHtml(getString(R.string.add_new_vpn_hint), new MiniImageGetter(), null));
+        importvpntext.setText(Html.fromHtml(getString(R.string.vpn_import_hint), new MiniImageGetter(), null));
 
-	@Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.vpn_profile_list, container,false);
+        ImageButton fab_add = (ImageButton) v.findViewById(R.id.fab_add);
+        ImageButton fab_import = (ImageButton) v.findViewById(R.id.fab_import);
+        if (fab_add != null)
+            fab_add.setOnClickListener(this);
 
-		TextView newvpntext = (TextView) v.findViewById(R.id.add_new_vpn_hint);
-		TextView importvpntext = (TextView) v.findViewById(R.id.import_vpn_hint);
-		
-		newvpntext.setText(Html.fromHtml(getString(R.string.add_new_vpn_hint),new MiniImageGetter(),null));
-		importvpntext.setText(Html.fromHtml(getString(R.string.vpn_import_hint),new MiniImageGetter(),null));
+        if (fab_import != null)
+            fab_import.setOnClickListener(this);
 
-		return v;
+        return v;
 
-	}
+    }
 
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		setListAdapter();
-	}
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        setListAdapter();
+    }
 
     static class VpnProfileNameComparator implements Comparator<VpnProfile> {
 
@@ -172,52 +174,63 @@ public class VPNProfileList extends ListFragment {
 
     }
 
-	private void setListAdapter() {
-		mArrayadapter = new VPNArrayAdapter(getActivity(),R.layout.vpn_list_item,R.id.vpn_item_title);
-		Collection<VpnProfile> allvpn = getPM().getProfiles();
+    private void setListAdapter() {
+        mArrayadapter = new VPNArrayAdapter(getActivity(), R.layout.vpn_list_item, R.id.vpn_item_title);
+        Collection<VpnProfile> allvpn = getPM().getProfiles();
 
         TreeSet<VpnProfile> sortedset = new TreeSet<VpnProfile>(new VpnProfileNameComparator());
         sortedset.addAll(allvpn);
         mArrayadapter.addAll(sortedset);
 
         setListAdapter(mArrayadapter);
-	}
-
+    }
 
 
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		menu.add(0, MENU_ADD_PROFILE, 0 , R.string.menu_add_profile)
-		.setIcon(R.drawable.ic_menu_add)
-		.setAlphabeticShortcut('a')
-		.setTitleCondensed(getActivity().getString(R.string.add))
-		.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS |  MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        menu.add(0, MENU_ADD_PROFILE, 0, R.string.menu_add_profile)
+                .setIcon(R.drawable.ic_menu_add)
+                .setAlphabeticShortcut('a')
+                .setTitleCondensed(getActivity().getString(R.string.add))
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
 
-		menu.add(0, MENU_IMPORT_PROFILE, 0,  R.string.menu_import)
-		.setIcon(R.drawable.ic_menu_import)
-		.setAlphabeticShortcut('i')
-		.setTitleCondensed(getActivity().getString(R.string.menu_import_short))
-		.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT );
-	}
+        menu.add(0, MENU_IMPORT_PROFILE, 0, R.string.menu_import)
+                .setIcon(R.drawable.ic_menu_import)
+                .setAlphabeticShortcut('i')
+                .setTitleCondensed(getActivity().getString(R.string.menu_import_short))
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    }
 
 
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		final int itemId = item.getItemId();
-		if (itemId == MENU_ADD_PROFILE) {
-			onAddOrDuplicateProfile(null);
-			return true;
-		} else if (itemId == MENU_IMPORT_PROFILE) {
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int itemId = item.getItemId();
+        if (itemId == MENU_ADD_PROFILE) {
+            onAddOrDuplicateProfile(null);
+            return true;
+        } else if (itemId == MENU_IMPORT_PROFILE) {
             return startImportConfigFilePicker();
-		} else {
-			return super.onOptionsItemSelected(item);
-		}
-	}
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.fab_import:
+                startImportConfigFilePicker();
+                break;
+            case R.id.fab_add:
+                onAddOrDuplicateProfile(null);
+                break;
+        }
+    }
 
     private boolean startImportConfigFilePicker() {
-        boolean startOldFileDialog=true;
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-                startOldFileDialog = ! startFilePicker();
+        boolean startOldFileDialog = true;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+            startOldFileDialog = !startFilePicker();
 
         if (startOldFileDialog)
             startImportConfig();
@@ -228,8 +241,8 @@ public class VPNProfileList extends ListFragment {
     @TargetApi(Build.VERSION_CODES.KITKAT)
     private boolean startFilePicker() {
 
-       Intent i = Utils.getFilePickerIntent(getActivity(), Utils.FileType.OVPN_CONFIG);
-        if (i!=null) {
+        Intent i = Utils.getFilePickerIntent(getActivity(), Utils.FileType.OVPN_CONFIG);
+        if (i != null) {
             startActivityForResult(i, FILE_PICKER_RESULT_KITKAT);
             return true;
         } else
@@ -237,32 +250,29 @@ public class VPNProfileList extends ListFragment {
     }
 
     private void startImportConfig() {
-		Intent intent = new Intent(getActivity(),FileSelect.class);
-		intent.putExtra(FileSelect.NO_INLINE_SELECTION, true);
-		intent.putExtra(FileSelect.WINDOW_TITLE, R.string.import_configuration_file);
-		startActivityForResult(intent, SELECT_PROFILE);
-	}
-
-
-
+        Intent intent = new Intent(getActivity(), FileSelect.class);
+        intent.putExtra(FileSelect.NO_INLINE_SELECTION, true);
+        intent.putExtra(FileSelect.WINDOW_TITLE, R.string.import_configuration_file);
+        startActivityForResult(intent, SELECT_PROFILE);
+    }
 
 
-	private void onAddOrDuplicateProfile(final VpnProfile mCopyProfile) {
-		Context context = getActivity();
-		if (context != null) {
-			final EditText entry = new EditText(context);
-			entry.setSingleLine();
+    private void onAddOrDuplicateProfile(final VpnProfile mCopyProfile) {
+        Context context = getActivity();
+        if (context != null) {
+            final EditText entry = new EditText(context);
+            entry.setSingleLine();
 
-			AlertDialog.Builder dialog = new AlertDialog.Builder(context);
+            AlertDialog.Builder dialog = new AlertDialog.Builder(context);
             if (mCopyProfile == null)
-			    dialog.setTitle(R.string.menu_add_profile);
+                dialog.setTitle(R.string.menu_add_profile);
             else {
                 dialog.setTitle(context.getString(R.string.duplicate_profile_title, mCopyProfile.mName));
                 entry.setText(getString(R.string.copy_of_profile, mCopyProfile.mName));
             }
 
             dialog.setMessage(R.string.add_profile_name_prompt);
-			dialog.setView(entry);
+            dialog.setView(entry);
 
             dialog.setNeutralButton(R.string.menu_import_short,
                     new DialogInterface.OnClickListener() {
@@ -271,7 +281,7 @@ public class VPNProfileList extends ListFragment {
                             startImportConfigFilePicker();
                         }
                     });
-			dialog.setPositiveButton(android.R.string.ok,
+            dialog.setPositiveButton(android.R.string.ok,
                     new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
@@ -292,32 +302,32 @@ public class VPNProfileList extends ListFragment {
 
 
                     });
-			dialog.setNegativeButton(android.R.string.cancel, null);
-			dialog.create().show();
-		}
+            dialog.setNegativeButton(android.R.string.cancel, null);
+            dialog.create().show();
+        }
 
-	}
+    }
 
-	private void addProfile(VpnProfile profile) {
-		getPM().addProfile(profile);
-		getPM().saveProfileList(getActivity());
-		getPM().saveProfile(getActivity(),profile);
-		mArrayadapter.add(profile);
-	}
+    private void addProfile(VpnProfile profile) {
+        getPM().addProfile(profile);
+        getPM().saveProfileList(getActivity());
+        getPM().saveProfile(getActivity(), profile);
+        mArrayadapter.add(profile);
+    }
 
-	private ProfileManager getPM() {
-		return ProfileManager.getInstance(getActivity());
-	}
+    private ProfileManager getPM() {
+        return ProfileManager.getInstance(getActivity());
+    }
 
 
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
 
-		if(resultCode == RESULT_VPN_DELETED){
-			if(mArrayadapter != null && mEditProfile !=null)
-				mArrayadapter.remove(mEditProfile);
-		} else if (resultCode == RESULT_VPN_DUPLICATE && data != null) {
+        if (resultCode == RESULT_VPN_DELETED) {
+            if (mArrayadapter != null && mEditProfile != null)
+                mArrayadapter.remove(mEditProfile);
+        } else if (resultCode == RESULT_VPN_DUPLICATE && data != null) {
             String profileUUID = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID);
             VpnProfile profile = ProfileManager.get(getActivity(), profileUUID);
             if (profile != null)
@@ -325,37 +335,37 @@ public class VPNProfileList extends ListFragment {
         }
 
 
-        if(resultCode != Activity.RESULT_OK)
-			return;
+        if (resultCode != Activity.RESULT_OK)
+            return;
 
 
-		if (requestCode == START_VPN_CONFIG) {
-			String configuredVPN = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID);
+        if (requestCode == START_VPN_CONFIG) {
+            String configuredVPN = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID);
 
-			VpnProfile profile = ProfileManager.get(getActivity(),configuredVPN);
-			getPM().saveProfile(getActivity(), profile);
-			// Name could be modified, reset List adapter
-			setListAdapter();
+            VpnProfile profile = ProfileManager.get(getActivity(), configuredVPN);
+            getPM().saveProfile(getActivity(), profile);
+            // Name could be modified, reset List adapter
+            setListAdapter();
 
-		} else if(requestCode== SELECT_PROFILE) {
+        } else if (requestCode == SELECT_PROFILE) {
             String fileData = data.getStringExtra(FileSelect.RESULT_DATA);
             Uri uri = new Uri.Builder().path(fileData).scheme("file").build();
 
             startConfigImport(uri);
-		} else if(requestCode == IMPORT_PROFILE) {
-			String profileUUID = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID);
-			mArrayadapter.add(ProfileManager.get(getActivity(), profileUUID));
-		} else if(requestCode == FILE_PICKER_RESULT_KITKAT) {
+        } else if (requestCode == IMPORT_PROFILE) {
+            String profileUUID = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID);
+            mArrayadapter.add(ProfileManager.get(getActivity(), profileUUID));
+        } else if (requestCode == FILE_PICKER_RESULT_KITKAT) {
             if (data != null) {
                 Uri uri = data.getData();
                 startConfigImport(uri);
             }
         }
 
-	}
+    }
 
     private void startConfigImport(Uri uri) {
-        Intent startImport = new Intent(getActivity(),ConfigConverter.class);
+        Intent startImport = new Intent(getActivity(), ConfigConverter.class);
         startImport.setAction(ConfigConverter.IMPORT_PROFILE);
         startImport.setData(uri);
         startActivityForResult(startImport, IMPORT_PROFILE);
@@ -363,20 +373,20 @@ public class VPNProfileList extends ListFragment {
 
 
     private void editVPN(VpnProfile profile) {
-		mEditProfile =profile;
-		Intent vprefintent = new Intent(getActivity(),VPNPreferences.class)
-		.putExtra(getActivity().getPackageName() + ".profileUUID", profile.getUUID().toString());
+        mEditProfile = profile;
+        Intent vprefintent = new Intent(getActivity(), VPNPreferences.class)
+                .putExtra(getActivity().getPackageName() + ".profileUUID", profile.getUUID().toString());
 
-		startActivityForResult(vprefintent,START_VPN_CONFIG);
-	}
+        startActivityForResult(vprefintent, START_VPN_CONFIG);
+    }
 
-	private void startVPN(VpnProfile profile) {
+    private void startVPN(VpnProfile profile) {
 
-		getPM().saveProfile(getActivity(), profile);
+        getPM().saveProfile(getActivity(), profile);
 
-		Intent intent = new Intent(getActivity(),LaunchVPN.class);
-		intent.putExtra(LaunchVPN.EXTRA_KEY, profile.getUUID().toString());
-		intent.setAction(Intent.ACTION_MAIN);
-		startActivity(intent);
-	}
+        Intent intent = new Intent(getActivity(), LaunchVPN.class);
+        intent.putExtra(LaunchVPN.EXTRA_KEY, profile.getUUID().toString());
+        intent.setAction(Intent.ACTION_MAIN);
+        startActivity(intent);
+    }
 }