Merge lp:~vbkaisetsu/tomdroid/link-to-long-title into lp:tomdroid/beta

[Koichi Akabe]

This branch sorts titles on create match pattern for Linkify.
Therefore, it chooses long titles to create links.

For example, there are two notes which are named "Ubuntu" and "UbuntuOne", and the third note has "UbuntuOne" in the content.
This branch always link to "UbuntuOne", because I think nobody want to link to "Ubuntu" in this situation.

[lp:~vbkaisetsu/tomdroid/link-to-long-title]

460. By Koichi Akabe on 2012-09-08

remove unused variable

[Stefan Hammer (j-4-deactivatedaccount)]

This is already fixed in the current code. Thanks for the input, it helped a lot!
I am looking forward to new contributions from you :-)

Unmerged revisions

460. By Koichi Akabe on 2012-09-08

remove unused variable

459. By Koichi Akabe on 2012-09-08

sort titles when create Linkify match pattern

=== modified file 'src/org/tomdroid/NoteManager.java'
--- src/org/tomdroid/NoteManager.java	2012-09-07 08:55:07 +0000
+++ src/org/tomdroid/NoteManager.java	2012-09-08 09:23:19 +0000
@@ -550,7 +550,6 @@
 	 */
 	public static Pattern buildNoteLinkifyPattern(Activity activity, String noteTitle)  {
 	
-		StringBuilder sb = new StringBuilder();
 		Cursor cursor = getTitles(activity);
 	
 		// cursor must not be null and must return more than 0 entry
@@ -560,21 +559,25 @@
 	
 			cursor.moveToFirst();
 	
+			ArrayList<String> titles = new ArrayList<String>();
+			
 			do {
 				title = cursor.getString(cursor.getColumnIndexOrThrow(Note.TITLE));
 				if(title.length() == 0 || title.equals(noteTitle))
 					continue;
 				// Pattern.quote() here make sure that special characters in the note's title are properly escaped
-				sb.append("("+Pattern.quote(title)+")|");
+				titles.add("("+Pattern.quote(title)+")");
 	
 			} while (cursor.moveToNext());
 			
 			// if only empty titles, return
-			if (sb.length() == 0)
+			if (titles.size() == 0)
 				return null;
 			
-			// get rid of the last | that is not needed (I know, its ugly.. better idea?)
-			String pt = sb.substring(0, sb.length()-1);
+			// sort titles to give priority to long titles 
+			String[] titlearray = titles.toArray(new String[0]);
+			Arrays.sort(titlearray, new StringLengthComparator());
+			String pt = TextUtils.join("|", titlearray);
 	
 			// return a compiled match pattern
 			return Pattern.compile(pt, Pattern.CASE_INSENSITIVE);
@@ -588,4 +591,10 @@
 		return null;
 	}
 	
+	public static class StringLengthComparator implements Comparator<String>{
+		public int compare(String str1, String str2) {
+			return ((String)str2).length() - ((String)str1).length();
+		}
+	}
+
 }