From b397ab2bbdfdedf3489c54e996bb8d9c50398ed7 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 2 Feb 2017 21:26:16 +0800
Subject: [PATCH] Support pasting multiple lines

---
 mobile/src/main/res/layout/dialog_acl_rule.xml  |  3 +--
 .../shadowsocks/acl/CustomRulesFragment.scala   | 17 ++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/mobile/src/main/res/layout/dialog_acl_rule.xml b/mobile/src/main/res/layout/dialog_acl_rule.xml
index 6750be86..dfb27e8d 100644
--- a/mobile/src/main/res/layout/dialog_acl_rule.xml
+++ b/mobile/src/main/res/layout/dialog_acl_rule.xml
@@ -10,6 +10,5 @@
     <EditText android:id="@+id/content"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:inputType="textNoSuggestions"
-              android:lines="1"/>
+              android:inputType="textNoSuggestions|textMultiLine"/>
 </LinearLayout>
diff --git a/mobile/src/main/scala/com/github/shadowsocks/acl/CustomRulesFragment.scala b/mobile/src/main/scala/com/github/shadowsocks/acl/CustomRulesFragment.scala
index 5426c3ab..0bf6a523 100644
--- a/mobile/src/main/scala/com/github/shadowsocks/acl/CustomRulesFragment.scala
+++ b/mobile/src/main/scala/com/github/shadowsocks/acl/CustomRulesFragment.scala
@@ -20,6 +20,7 @@ import com.github.shadowsocks.widget.UndoSnackbarManager
 import com.github.shadowsocks.{MainActivity, R, ToolbarFragment}
 
 import scala.collection.mutable
+import scala.io.Source
 
 /**
   * @author Mygod
@@ -144,8 +145,12 @@ class CustomRulesFragment extends ToolbarFragment with Toolbar.OnMenuItemClickLi
       apply()
       index
     } else -1
-    def addToProxy(input: String): Int = try addSubnet(Subnet.fromString(input)) catch {
-      case _: IllegalArgumentException => addHostname(input)
+    def addToProxy(input: String): Int = {
+      val acl = new Acl().fromSource(Source.fromString(input), defaultBypass = true)
+      var result = -1
+      for (hostname <- acl.proxyHostnames) result = addHostname(hostname)
+      if (acl.bypass) for (subnet <- acl.subnets) result = addSubnet(subnet)
+      result
     }
     def addFromTemplate(template: Int, text: CharSequence): Int = template match {
       case GENERIC => addToProxy(text.toString)
@@ -298,13 +303,7 @@ class CustomRulesFragment extends ToolbarFragment with Toolbar.OnMenuItemClickLi
         .create().show()
       true
     case R.id.action_import =>
-      try {
-        val items = clipboard.getPrimaryClip.getItemAt(0).getText.toString.split("\n")
-        if (items.nonEmpty) {
-          items.foreach(adapter.addToProxy)
-          return true
-        }
-      } catch {
+      try if (adapter.addToProxy(clipboard.getPrimaryClip.getItemAt(0).getText.toString) != -1) return true catch {
         case _: Exception =>
       }
       Snackbar.make(getActivity.findViewById(R.id.snackbar), R.string.action_import_err, Snackbar.LENGTH_LONG).show()