Merge pull request #3 from tonsense/master

RaNaN · RaNaN · commit 14533bdbb6f6 · 2013-03-14T10:15:14.000-07:00
Make share Intent accept multiple URLs
diff --git a/src/org/pyload/android/client/AddLinksActivity.java b/src/org/pyload/android/client/AddLinksActivity.java
@@ -52,11 +52,14 @@ protected void onStart() {
         }
 		String url = intent.getStringExtra("url");
 		if (url != null){
+			StringBuilder urls = new StringBuilder();
             Matcher m = Patterns.WEB_URL.matcher(url);
-            if (m.find()) {
-                url = m.group();
-                EditText view = (EditText) findViewById(R.id.links);
-                view.setText(url);
+            while (m.find()) {
+                urls.append(m.group() + "\n");
+            }
+            if(urls.length()>0) {
+	            EditText view = (EditText) findViewById(R.id.links);
+	            view.setText(urls.toString());
             }
 		}
 		String path = intent.getStringExtra("dlcpath");

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,14 @@ protected void onStart() {`
`52`	`52`	`}`
`53`	`53`	`String url = intent.getStringExtra("url");`
`54`	`54`	`if (url != null){`
	`55`	`+ StringBuilder urls = new StringBuilder();`
`55`	`56`	`Matcher m = Patterns.WEB_URL.matcher(url);`
`56`		`- if (m.find()) {`
`57`		`- url = m.group();`
`58`		`- EditText view = (EditText) findViewById(R.id.links);`
`59`		`- view.setText(url);`
	`57`	`+ while (m.find()) {`
	`58`	`+ urls.append(m.group() + "\n");`
	`59`	`+ }`
	`60`	`+ if(urls.length()>0) {`
	`61`	`+ EditText view = (EditText) findViewById(R.id.links);`
	`62`	`+ view.setText(urls.toString());`
`60`	`63`	`}`
`61`	`64`	`}`
`62`	`65`	`String path = intent.getStringExtra("dlcpath");`