Merge lp:~mcveat/tomdroid/loggers-cleanup into lp:~tomdroid-maintainers/tomdroid/main

[Piotr Adamski]

[Koichi Akabe (vbkaisetsu)]

Hello Piotr,

"if (Tomdroid.LOGGING_ENABLED)"s are written for all Log.xxx functions.

It is repetitious.
I think it will be more simpler if you create functions which check Tomdroid.LOGGING_ENABLED and use Log.xxx.

Regards,
Koichi Akabe

[Alex Belisle Turcot (alex-belisleturcot)]

Bu then, would the debug Strings be created every time, even when logging is
not enabled ?

check this:
http://stackoverflow.com/questions/963492/in-log4j-does-checking-isdebugenabled-before-logging-improve-performance

[quote]
*The guard statement (checking isDebugEnabled()) is there to prevent
potentially expensive computation of the log message*
...
*Better yet is to use a more up-to-date logging framework where the log
statements take a format string and a list of arguments to be substituted by
the formatter—but "lazily," only if the logger is enabled. This is the
approach taken by
slf4j<http://www.slf4j.org/apidocs/org/slf4j/Logger.html#debug%28java.lang.String,%20java.lang.Object%5B%5D%29>
.*
[/quote]

Current logging frameworks ensure sure that debug Strings are not
concatenated unless debug is enabled. I'm not sure how to do that in
Android, you may need to code this mini-framework yourself...

Regards,
Alex

On Thu, Oct 27, 2011 at 7:58 AM, Koichi Akabe <email address hidden> wrote:

> Hello Piotr,
>
> "if (Tomdroid.LOGGING_ENABLED)"s are written for all Log.xxx functions.
>
> It is repetitious.
> I think it will be more simpler if you create functions which check
> Tomdroid.LOGGING_ENABLED and use Log.xxx.
>
> Regards,
> Koichi Akabe
> --
> https://code.launchpad.net/~mcveat/tomdroid/loggers-cleanup/+merge/80501
> You are subscribed to branch lp:tomdroid.
>

[Piotr Adamski (mcveat)]

On Thu, Oct 27, 2011 at 2:25 PM, Alex Belisle Turcot
<email address hidden> wrote:
> Bu then, would the debug Strings be created every time, even when logging is
> not enabled ?

I was also concerned about that.

> Current logging frameworks ensure sure that debug Strings are not
> concatenated unless debug is enabled. I'm not sure how to do that in
> Android, you may need to code this mini-framework yourself...

Should be pretty straightforward, yet not so versatile with use of
java.text.MessageFormat and varargs. I'll try how it rolls this
evening.

Regards
Piotr

[lp:~mcveat/tomdroid/loggers-cleanup]

256. By Piotr Adamski on 2011-10-27

excluded turning off logging logic to separate clas TLog

257. By Piotr Adamski on 2011-10-27

merged with main

258. By Piotr Adamski on 2011-10-27

updated license note

259. By Piotr Adamski on 2011-10-27

removed forgotten debug statements

[Piotr Adamski (mcveat)]

I've implemented simple logging utility that should remove the boilerplate code of checking logging switch state, yet avoiding unnecessary string concatenations. Tell what you think about it.

[Koichi Akabe (vbkaisetsu)]

I think it is great work!!

[Olivier Bilodeau (plaxx)]

Good stuff! Thanks! Next time try not to re-organize imports please. Makes patches larger than they should be and merging more complicated.

review: Approve

[Olivier Bilodeau (plaxx)]

Turns out I needed to make additional changes. See https://code.launchpad.net/~tomdroid-dev/tomdroid/loggers-cleanup if you are interested.

=== modified file 'src/org/tomdroid/Note.java'
--- src/org/tomdroid/Note.java	2011-09-05 19:47:25 +0000
+++ src/org/tomdroid/Note.java	2011-10-27 17:18:24 +0000
@@ -23,19 +23,18 @@
  */
 package org.tomdroid;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import android.os.Handler;
+import android.text.SpannableStringBuilder;
+import android.text.format.Time;
+import android.util.TimeFormatException;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.tomdroid.util.NoteContentBuilder;
+import org.tomdroid.util.TLog;
 import org.tomdroid.util.XmlUtils;
 
-import android.os.Handler;
-import android.text.SpannableStringBuilder;
-import android.text.format.Time;
-import android.util.Log;
-import android.util.TimeFormatException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class Note {
 
@@ -145,9 +144,9 @@
 		// Tomboy's (C# library) format: 2010-01-23T12:07:38.7743020-05:00
 		Matcher m = dateCleaner.matcher(lastChangeDateStr);
 		if (m.find()) {
-			Log.d(TAG, "I had to clean out extra sub-milliseconds from the date");
+			TLog.d(TAG, "I had to clean out extra sub-milliseconds from the date");
 			lastChangeDateStr = m.group(1)+m.group(2);
-			Log.v(TAG, "new date: "+lastChangeDateStr);
+			TLog.v(TAG, "new date: {0}", lastChangeDateStr);
 		}
 		
 		lastChangeDate = new Time();

=== modified file 'src/org/tomdroid/NoteManager.java'
--- src/org/tomdroid/NoteManager.java	2011-09-05 19:47:25 +0000
+++ src/org/tomdroid/NoteManager.java	2011-10-27 17:18:24 +0000
@@ -24,20 +24,19 @@
  */
 package org.tomdroid;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.tomdroid.ui.Tomdroid;
-import org.tomdroid.util.NoteListCursorAdapter;
-import org.tomdroid.util.XmlUtils;
-
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
-import android.util.Log;
 import android.widget.ListAdapter;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.NoteListCursorAdapter;
+import org.tomdroid.util.TLog;
+import org.tomdroid.util.XmlUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class NoteManager {
 	
@@ -107,17 +106,19 @@
 		if (managedCursor.getCount() == 0) {
 			
 			// This note is not in the database yet we need to insert it
-			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"A new note has been detected (not yet in db)");
+			TLog.v(TAG, "A new note has been detected (not yet in db)");
 			
     		Uri uri = cr.insert(Tomdroid.CONTENT_URI, values);
 
-    		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Note inserted in content provider. ID: "+uri+" TITLE:"+note.getTitle()+" GUID:"+note.getGuid());
+    		TLog.v(TAG, "Note inserted in content provider. ID: {0} TITLE:{1} GUID:{2}", uri, note.getTitle(),
+                    note.getGuid());
 		} else {
 			
 			// Overwrite the previous note if it exists
 			cr.update(Tomdroid.CONTENT_URI, values, Note.GUID+" = ?", whereArgs);
 			
-			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Note updated in content provider. TITLE:"+note.getTitle()+" GUID:"+note.getGuid());
+			TLog.v(TAG, "Note updated in content provider. TITLE:{0} GUID:{1}", note.getTitle(),
+                    note.getGuid());
 		}
 	}
 	
@@ -209,7 +210,7 @@
 		}
 		else {
 			// TODO send an error to the user
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+			TLog.d(TAG, "Cursor returned null or 0 notes");
 		}
 		
 		return id;
@@ -229,7 +230,7 @@
 		Matcher m = stripTitle.matcher(xmlContent);
 		if (m.find()) {
 			xmlContent = xmlContent.substring(m.end(), xmlContent.length());
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "stripped the title from note-content");
+			TLog.d(TAG, "stripped the title from note-content");
 		}
 		
 		return xmlContent;

=== modified file 'src/org/tomdroid/NoteProvider.java'
--- src/org/tomdroid/NoteProvider.java	2010-09-17 20:37:42 +0000
+++ src/org/tomdroid/NoteProvider.java	2011-10-27 17:18:24 +0000
@@ -43,16 +43,7 @@
  */
 package org.tomdroid;
 
-import java.util.HashMap;
-import java.util.UUID;
-
-import org.tomdroid.ui.Tomdroid;
-
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
+import android.content.*;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.SQLException;
@@ -61,7 +52,11 @@
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.text.TextUtils;
-import android.util.Log;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.TLog;
+
+import java.util.HashMap;
+import java.util.UUID;
 
 public class NoteProvider extends ContentProvider {
 	
@@ -107,10 +102,8 @@
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        	if (Tomdroid.LOGGING_ENABLED) {
-        		Log.d(TAG, "Upgrading database from version " + oldVersion + " to "
-                    + newVersion + ", which will destroy all old data");
-        	}
+        	TLog.d(TAG, "Upgrading database from version {0} to {1}, which will destroy all old data",
+                    oldVersion, newVersion);
             db.execSQL("DROP TABLE IF EXISTS notes");
             onCreate(db);
         }

=== modified file 'src/org/tomdroid/sync/SyncService.java'
--- src/org/tomdroid/sync/SyncService.java	2010-12-13 02:55:59 +0000
+++ src/org/tomdroid/sync/SyncService.java	2011-10-27 17:18:24 +0000
@@ -24,23 +24,21 @@
  */
 package org.tomdroid.sync;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.tomdroid.Note;
-import org.tomdroid.NoteManager;
-import org.tomdroid.ui.Tomdroid;
-import org.tomdroid.util.ErrorList;
-
-import org.tomdroid.R;
 import android.app.Activity;
 import android.database.Cursor;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.widget.Toast;
+import org.tomdroid.Note;
+import org.tomdroid.NoteManager;
+import org.tomdroid.R;
+import org.tomdroid.util.ErrorList;
+import org.tomdroid.util.TLog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public abstract class SyncService {
 	
@@ -174,7 +172,7 @@
 		} else {
 			
 			// TODO send an error to the user
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+			TLog.d(TAG, "Cursor returned null or 0 notes");
 		}
 	}
 	
@@ -214,7 +212,7 @@
 	
 	protected void setSyncProgress(int progress) {
 		synchronized (TAG) {
-			Log.v(TAG, "sync progress: " + progress);
+			TLog.v(TAG, "sync progress: {0}", progress);
 			Message progressMessage = new Message();
 			progressMessage.what = SYNC_PROGRESS;
 			progressMessage.arg1 = progress;

=== modified file 'src/org/tomdroid/sync/sd/SdCardSyncService.java'
--- src/org/tomdroid/sync/sd/SdCardSyncService.java	2011-09-05 19:47:25 +0000
+++ src/org/tomdroid/sync/sd/SdCardSyncService.java	2011-10-27 17:18:24 +0000
@@ -24,30 +24,22 @@
  */
 package org.tomdroid.sync.sd;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
+import android.app.Activity;
+import android.os.Handler;
+import android.util.TimeFormatException;
 import org.tomdroid.Note;
 import org.tomdroid.sync.SyncService;
 import org.tomdroid.ui.Tomdroid;
 import org.tomdroid.util.ErrorList;
+import org.tomdroid.util.TLog;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
-import android.app.Activity;
-import android.os.Handler;
-import android.util.Log;
-import android.util.TimeFormatException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class SdCardSyncService extends SyncService {
 	
@@ -89,18 +81,18 @@
 		setSyncProgress(0);
 
 		// start loading local notes
-		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG, "Loading local notes");
+		TLog.v(TAG, "Loading local notes");
 		
 		File path = new File(Tomdroid.NOTES_PATH);
 		
 		if (!path.exists())
 			path.mkdir();
 		
-		Log.i(TAG, "Path "+path+" exists: "+path.exists());
+		TLog.i(TAG, "Path {0} exists: {1}", path, path.exists());
 		
 		// Check a second time, if not the most likely cause is the volume doesn't exist
 		if(!path.exists()) {
-			if (Tomdroid.LOGGING_ENABLED) Log.w(TAG, "Couldn't create "+path);
+			TLog.w(TAG, "Couldn't create {0}", path);
 			sendMessage(NO_SD_CARD);
 			setSyncProgress(100);
 			return;
@@ -111,7 +103,7 @@
 		
 		// If there are no notes, warn the UI through an empty message
 		if (fileList == null || fileList.length == 0) {
-			if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "There are no notes in "+path);
+			TLog.i(TAG, "There are no notes in {0}", path);
 			sendMessage(PARSING_NO_NOTES);
 			setSyncProgress(100);
 			return;
@@ -169,7 +161,7 @@
 				contents = readFile();
 			} catch (IOException e) {
 				e.printStackTrace();
-				if (Tomdroid.LOGGING_ENABLED) Log.w(TAG, "Something went wrong trying to read the note");
+				TLog.w(TAG, "Something went wrong trying to read the note");
 				sendMessage(PARSING_FAILED, ErrorList.createError(note, e));
 				onWorkDone();
 				return;
@@ -193,27 +185,27 @@
 		        StringReader sr = new StringReader(contents);
 		        InputSource is = new InputSource(sr);
 		        
-				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "parsing note");
+				TLog.d(TAG, "parsing note");
 				xr.parse(is);
 
 			// TODO wrap and throw a new exception here
 			} catch (Exception e) {
 				e.printStackTrace();
-				if(e instanceof TimeFormatException) Log.e(TAG, "Problem parsing the note's date and time");
+				if(e instanceof TimeFormatException) TLog.e(TAG, "Problem parsing the note's date and time");
 				sendMessage(PARSING_FAILED, ErrorList.createErrorWithContents(note, e, contents));
 				onWorkDone();
 				return;
 			}
 
 			// extract the <note-content..>...</note-content>
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "retrieving what is inside of note-content");
+			TLog.d(TAG, "retrieving what is inside of note-content");
 			
 			// FIXME here we are re-reading the whole note just to grab note-content out, there is probably a best way to do this (I'm talking to you xmlpull.org!)
 			Matcher m = note_content.matcher(contents);
 			if (m.find()) {
 				note.setXmlContent(m.group(1));
 			} else {
-				if (Tomdroid.LOGGING_ENABLED) Log.w(TAG, "Something went wrong trying to grab the note-content out of a note");
+				TLog.w(TAG, "Something went wrong trying to grab the note-content out of a note");
 				sendMessage(PARSING_FAILED, ErrorList.createErrorWithContents(note, "Something went wrong trying to grab the note-content out of a note", contents));
 				onWorkDone();
 				return;

=== modified file 'src/org/tomdroid/sync/web/OAuthConnection.java'
--- src/org/tomdroid/sync/web/OAuthConnection.java	2010-08-31 21:00:35 +0000
+++ src/org/tomdroid/sync/web/OAuthConnection.java	2011-10-27 17:18:24 +0000
@@ -22,9 +22,7 @@
  */
 package org.tomdroid.sync.web;
 
-import java.io.UnsupportedEncodingException;
-import java.net.UnknownHostException;
-
+import android.net.Uri;
 import oauth.signpost.OAuthConsumer;
 import oauth.signpost.OAuthProvider;
 import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer;
@@ -33,7 +31,6 @@
 import oauth.signpost.exception.OAuthExpectationFailedException;
 import oauth.signpost.exception.OAuthMessageSignerException;
 import oauth.signpost.exception.OAuthNotAuthorizedException;
-
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -41,11 +38,11 @@
 import org.apache.http.entity.StringEntity;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.tomdroid.ui.Tomdroid;
 import org.tomdroid.util.Preferences;
+import org.tomdroid.util.TLog;
 
-import android.net.Uri;
-import android.util.Log;
+import java.io.UnsupportedEncodingException;
+import java.net.UnknownHostException;
 
 public class OAuthConnection extends WebConnection {
 	
@@ -168,14 +165,14 @@
 			return null;
 		}
 		
-		if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "Authorization URL : "+url);
+		TLog.i(TAG, "Authorization URL : {0}", url);
 		
 		return Uri.parse(url);
 	}
 	
 	public boolean getAccess(String verifier) throws UnknownHostException {
 		
-		Log.i(TAG, "Verifier: "+verifier);
+		TLog.i(TAG, "Verifier: {0}", verifier);
 		
 		// this method shouldn't have been called
 		if (isAuthenticated())
@@ -183,9 +180,7 @@
 		
 		if (!requestToken.equals("") && !requestTokenSecret.equals("")) {
 			consumer.setTokenWithSecret(requestToken, requestTokenSecret);
-			if(Tomdroid.LOGGING_ENABLED) {
-				Log.d(TAG, "Added request token "+requestTokenSecret+" and request token secret "+requestTokenSecret);
-			}
+			TLog.d(TAG, "Added request token {0} and request token secret {1)", requestTokenSecret, requestTokenSecret);
 		}
 		else
 			return false;
@@ -225,7 +220,7 @@
 		
 		saveConfiguration();
 		
-		if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "Got access token "+consumer.getToken()+".");
+		TLog.i(TAG, "Got access token {0}.", consumer.getToken());
 		
 		return true;
 	}

=== modified file 'src/org/tomdroid/sync/web/SnowySyncService.java'
--- src/org/tomdroid/sync/web/SnowySyncService.java	2010-11-05 23:54:32 +0000
+++ src/org/tomdroid/sync/web/SnowySyncService.java	2011-10-27 17:18:24 +0000
@@ -22,24 +22,22 @@
  */
 package org.tomdroid.sync.web;
 
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-
+import android.app.Activity;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Message;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.tomdroid.Note;
 import org.tomdroid.sync.ServiceAuth;
 import org.tomdroid.sync.SyncService;
-import org.tomdroid.ui.Tomdroid;
 import org.tomdroid.util.ErrorList;
 import org.tomdroid.util.Preferences;
+import org.tomdroid.util.TLog;
 
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
 
 public class SnowySyncService extends SyncService implements ServiceAuth {
 	
@@ -88,7 +86,7 @@
 					authUri = auth.getAuthorizationUrl(server);
 					
 				} catch (UnknownHostException e) {
-					Log.e(TAG, "Internet connection not available");
+					TLog.e(TAG, "Internet connection not available");
 					sendMessage(NO_INTERNET);
 				}
 				
@@ -114,12 +112,12 @@
 					boolean result = auth.getAccess(uri.getQueryParameter("oauth_verifier"));
 
 					if (result) {
-						if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "The authorization process is complete.");
+						TLog.i(TAG, "The authorization process is complete.");
 					} else {
-						Log.e(TAG, "Something went wrong during the authorization process.");
+						TLog.e(TAG, "Something went wrong during the authorization process.");
 					}
 				} catch (UnknownHostException e) {
-					Log.e(TAG, "Internet connection not available");
+					TLog.e(TAG, "Internet connection not available");
 					sendMessage(NO_INTERNET);
 				}
 				
@@ -140,7 +138,7 @@
 		
 		// start loading snowy notes
 		setSyncProgress(0);
-		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG, "Loading Snowy notes");
+		TLog.v(TAG, "Loading Snowy notes");
 		
 		final String userRef = Preferences.getString(Preferences.Key.SYNC_SERVER_USER_API);
 		
@@ -193,7 +191,7 @@
 								jsonNote = notes.getJSONObject(i);
 								insertNote(new Note(jsonNote));
 							} catch (JSONException e) {
-								Log.e(TAG, "Problem parsing the server response", e);
+								TLog.e(TAG, e, "Problem parsing the server response");
 								String json = (jsonNote != null) ? jsonNote.toString(2) : rawResponse;
 								sendMessage(PARSING_FAILED, ErrorList.createErrorWithContents("JSON parsing", "json", e, json));
 							}
@@ -207,7 +205,7 @@
 								.getLong("latest-sync-revision"));
 						
 					} catch (JSONException e) {
-						Log.e(TAG, "Problem parsing the server response", e);
+						TLog.e(TAG, e, "Problem parsing the server response");
 						sendMessage(PARSING_FAILED, ErrorList.createErrorWithContents("JSON parsing", "json", e, rawResponse));
 						setSyncProgress(100);
 						return;
@@ -216,7 +214,7 @@
 					setSyncProgress(100);
 					
 				} catch (java.net.UnknownHostException e) {
-					Log.e(TAG, "Internet connection not available");
+					TLog.e(TAG, "Internet connection not available");
 					sendMessage(NO_INTERNET);
 					setSyncProgress(100);
 					return;

=== modified file 'src/org/tomdroid/sync/web/WebConnection.java'
--- src/org/tomdroid/sync/web/WebConnection.java	2010-08-30 16:33:02 +0000
+++ src/org/tomdroid/sync/web/WebConnection.java	2011-10-27 17:18:24 +0000
@@ -22,21 +22,19 @@
  */
 package org.tomdroid.sync.web;
 
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.tomdroid.util.TLog;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.UnknownHostException;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.tomdroid.ui.Tomdroid;
-
-import android.util.Log;
-
 public abstract class WebConnection {
 	
 	private static final String TAG = "WebConnection";
@@ -80,7 +78,7 @@
 		String result = null;
 		
 		// Examine the response status
-		if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "Response status : "+response.getStatusLine().toString());
+		TLog.i(TAG, "Response status : {0}", response.getStatusLine().toString());
 
 		// Get hold of the response entity
 		HttpEntity entity = response.getEntity();
@@ -96,7 +94,7 @@
 				
 				result = convertStreamToString(instream);
 				
-				if (Tomdroid.LOGGING_ENABLED) Log.i(TAG, "Received : "+result);
+				TLog.i(TAG, "Received : {0}", result);
 				
 				// Closing the input stream will trigger connection release
 				instream.close();

=== modified file 'src/org/tomdroid/ui/PreferencesActivity.java'
--- src/org/tomdroid/ui/PreferencesActivity.java	2011-09-04 17:48:08 +0000
+++ src/org/tomdroid/ui/PreferencesActivity.java	2011-10-27 17:18:24 +0000
@@ -23,22 +23,11 @@
  */
 package org.tomdroid.ui;
 
-import java.util.ArrayList;
-
-import org.tomdroid.NoteManager;
-import org.tomdroid.R;
-import org.tomdroid.sync.ServiceAuth;
-import org.tomdroid.sync.SyncManager;
-import org.tomdroid.sync.SyncService;
-import org.tomdroid.util.FirstNote;
-import org.tomdroid.util.Preferences;
-import org.tomdroid.util.SearchSuggestionProvider;
-
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
-import android.content.DialogInterface.OnClickListener;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -46,12 +35,22 @@
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
 import android.provider.SearchRecentSuggestions;
-import android.util.Log;
 import android.widget.Toast;
+import org.tomdroid.NoteManager;
+import org.tomdroid.R;
+import org.tomdroid.sync.ServiceAuth;
+import org.tomdroid.sync.SyncManager;
+import org.tomdroid.sync.SyncService;
+import org.tomdroid.util.FirstNote;
+import org.tomdroid.util.Preferences;
+import org.tomdroid.util.SearchSuggestionProvider;
+import org.tomdroid.util.TLog;
+
+import java.util.ArrayList;
 
 public class PreferencesActivity extends PreferenceActivity {
 	
@@ -89,7 +88,7 @@
 				
 				// did the selection change?
 				if (!syncService.getValue().contentEquals(selectedSyncServiceKey)) {
-					Log.d(TAG, "preference change triggered");
+					TLog.d(TAG, "preference change triggered");
 					
 					syncServiceChanged(selectedSyncServiceKey);
 				}
@@ -126,7 +125,7 @@
 	        	Toast.makeText(getBaseContext(),
                         getString(R.string.deletedSearchHistory),
                         Toast.LENGTH_LONG).show();
-	        	Log.d(TAG, "Deleted search history.");
+	        	TLog.d(TAG, "Deleted search history.");
 	        	
 	        	return true;
 	        }
@@ -145,7 +144,7 @@
 		}
 
 		// service needs authentication
-		Log.i(TAG, "Creating dialog");
+		TLog.i(TAG, "Creating dialog");
 
 		final ProgressDialog authProgress = ProgressDialog.show(this, "",
 				getString(R.string.prefSyncCompleteAuth), true, false);

=== modified file 'src/org/tomdroid/ui/Search.java'
--- src/org/tomdroid/ui/Search.java	2011-09-04 17:48:08 +0000
+++ src/org/tomdroid/ui/Search.java	2011-10-27 17:18:24 +0000
@@ -23,12 +23,6 @@
  */
 package org.tomdroid.ui;
 
-import org.tomdroid.Note;
-import org.tomdroid.NoteManager;
-import org.tomdroid.R;
-import org.tomdroid.sync.SyncManager;
-import org.tomdroid.util.SearchSuggestionProvider;
-
 import android.app.ListActivity;
 import android.app.SearchManager;
 import android.content.Intent;
@@ -38,11 +32,16 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.SearchRecentSuggestions;
-import android.util.Log;
 import android.view.View;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import org.tomdroid.Note;
+import org.tomdroid.NoteManager;
+import org.tomdroid.R;
+import org.tomdroid.sync.SyncManager;
+import org.tomdroid.util.SearchSuggestionProvider;
+import org.tomdroid.util.TLog;
 
 public class Search extends ListActivity {
 	
@@ -94,7 +93,7 @@
 	}
 
 	public void showResults(String query) {
-		if (Tomdroid.LOGGING_ENABLED) Log.d(TAG,"Start searching for: "+query);
+		TLog.d(TAG, "Start searching for: {0}", query);
 		
 		
 		// adapter that binds the ListView UI to the notes in the note manager
@@ -103,7 +102,7 @@
 		
 		// set the view shown when query not found
 		listEmptyView = (TextView) findViewById(R.id.no_results);
-		listEmptyView.setText(getString(R.string.strNoResults, new Object[] {query}));
+		listEmptyView.setText(getString(R.string.strNoResults, query));
 		getListView().setEmptyView(listEmptyView);
 	}
 	

=== modified file 'src/org/tomdroid/ui/SyncMessageHandler.java'
--- src/org/tomdroid/ui/SyncMessageHandler.java	2010-12-13 02:55:59 +0000
+++ src/org/tomdroid/ui/SyncMessageHandler.java	2011-10-27 17:18:24 +0000
@@ -24,24 +24,23 @@
  */
 package org.tomdroid.ui;
 
-import org.tomdroid.R;
-import org.tomdroid.sync.SyncManager;
-import org.tomdroid.sync.SyncService;
-import org.tomdroid.util.ErrorList;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.RotateAnimation;
 import android.widget.ImageView;
 import android.widget.Toast;
+import org.tomdroid.R;
+import org.tomdroid.sync.SyncManager;
+import org.tomdroid.sync.SyncService;
+import org.tomdroid.util.ErrorList;
+import org.tomdroid.util.TLog;
 
 public class SyncMessageHandler extends Handler {
 
@@ -109,8 +108,7 @@
 				break;
 
 			default:
-				if (Tomdroid.LOGGING_ENABLED)
-					Log.i(TAG, "handler called with an unknown message");
+				TLog.i(TAG, "handler called with an unknown message");
 				break;
 
 		}

=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
--- src/org/tomdroid/ui/Tomdroid.java	2011-09-04 17:48:08 +0000
+++ src/org/tomdroid/ui/Tomdroid.java	2011-10-27 17:18:24 +0000
@@ -24,23 +24,13 @@
  */
 package org.tomdroid.ui;
 
-import org.tomdroid.Note;
-import org.tomdroid.NoteManager;
-import org.tomdroid.R;
-import org.tomdroid.sync.ServiceAuth;
-import org.tomdroid.sync.SyncManager;
-import org.tomdroid.sync.SyncService;
-import org.tomdroid.util.FirstNote;
-import org.tomdroid.util.Preferences;
-import org.tomdroid.util.Send;
-
 import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
-import android.content.DialogInterface.OnClickListener;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
@@ -48,17 +38,22 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
+import android.view.*;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
+import org.tomdroid.Note;
+import org.tomdroid.NoteManager;
+import org.tomdroid.R;
+import org.tomdroid.sync.ServiceAuth;
+import org.tomdroid.sync.SyncManager;
+import org.tomdroid.sync.SyncService;
+import org.tomdroid.util.FirstNote;
+import org.tomdroid.util.Preferences;
+import org.tomdroid.util.Send;
+import org.tomdroid.util.TLog;
 
 public class Tomdroid extends ListActivity {
 
@@ -75,8 +70,6 @@
 	// TODO hardcoded for now
 	public static final String	NOTES_PATH			= Environment.getExternalStorageDirectory()
 															+ "/tomdroid/";
-	// Logging should be disabled for release builds
-	public static final boolean	LOGGING_ENABLED		= false;
 	// Set this to false for release builds, the reason should be obvious
 	public static final boolean	CLEAR_PREFERENCES	= false;
 
@@ -100,7 +93,7 @@
 
 		// did we already show the warning and got destroyed by android's activity killer?
 		if (Preferences.getBoolean(Preferences.Key.FIRST_RUN)) {
-			Log.i(TAG, "Tomdroid is first run.");
+			TLog.i(TAG, "Tomdroid is first run.");
 			
 			// add a first explanatory note
 			NoteManager.putNote(this, FirstNote.createFirstNote());
@@ -197,7 +190,7 @@
 			Uri uri = intent.getData();
 
 			if (uri != null && uri.getScheme().equals("tomdroid")) {
-				Log.i(TAG, "Got url : " + uri.toString());
+				TLog.i(TAG, "Got url : {0}", uri.toString());
 
 				final ProgressDialog dialog = ProgressDialog.show(this, "",	getString(R.string.prefSyncCompleteAuth), true, false);
 

=== modified file 'src/org/tomdroid/ui/ViewNote.java'
--- src/org/tomdroid/ui/ViewNote.java	2011-09-05 15:05:46 +0000
+++ src/org/tomdroid/ui/ViewNote.java	2011-10-27 17:18:24 +0000
@@ -23,22 +23,11 @@
  */
 package org.tomdroid.ui;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.tomdroid.Note;
-import org.tomdroid.NoteManager;
-import org.tomdroid.R;
-import org.tomdroid.sync.SyncManager;
-import org.tomdroid.util.LinkifyPhone;
-import org.tomdroid.util.NoteContentBuilder;
-import org.tomdroid.util.Send;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
-import android.content.DialogInterface.OnClickListener;
 import android.database.Cursor;
 import android.graphics.Color;
 import android.net.Uri;
@@ -48,11 +37,21 @@
 import android.text.SpannableStringBuilder;
 import android.text.util.Linkify;
 import android.text.util.Linkify.TransformFilter;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.TextView;
+import org.tomdroid.Note;
+import org.tomdroid.NoteManager;
+import org.tomdroid.R;
+import org.tomdroid.sync.SyncManager;
+import org.tomdroid.util.LinkifyPhone;
+import org.tomdroid.util.NoteContentBuilder;
+import org.tomdroid.util.Send;
+import org.tomdroid.util.TLog;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 // TODO this class is starting to smell
 public class ViewNote extends Activity {
@@ -91,7 +90,7 @@
 		if (uri != null) {
 			
 			// We were triggered by an Intent URI 
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "ViewNote started: Intent-filter triggered.");
+			TLog.d(TAG, "ViewNote started: Intent-filter triggered.");
 
 			// TODO validate the good action?
 			// intent.getAction()
@@ -107,7 +106,7 @@
 				
 			} else {
 				
-				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The note "+uri+" doesn't exist");
+				TLog.d(TAG, "The note {0} doesn't exist", uri);
 				
 				// TODO put error string in a translatable resource
 				new AlertDialog.Builder(this)
@@ -123,7 +122,7 @@
 			}
 		} else {
 			
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The Intent's data was null.");
+			TLog.d(TAG, "The Intent's data was null.");
 			
 			// TODO put error string in a translatable resource
 			new AlertDialog.Builder(this)
@@ -250,7 +249,7 @@
 		} else {
 			
 			// TODO send an error to the user
-			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "Cursor returned null or 0 notes");
+			TLog.d(TAG, "Cursor returned null or 0 notes");
 		}
 		
 		return null;

=== modified file 'src/org/tomdroid/util/FirstNote.java'
--- src/org/tomdroid/util/FirstNote.java	2010-10-09 19:58:11 +0000
+++ src/org/tomdroid/util/FirstNote.java	2011-10-27 17:18:24 +0000
@@ -22,13 +22,11 @@
  */
 package org.tomdroid.util;
 
+import org.tomdroid.Note;
+
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.tomdroid.Note;
-
-import android.util.Log;
-
 /**
  * Creates an introductory note object 
  * @author Olivier Bilodeau <[e-mail]>
@@ -40,7 +38,7 @@
 	private static final String	TAG = "FirstNote";
 	
 	public static Note createFirstNote() {
-		Log.v(TAG, "Creating first note");
+		TLog.v(TAG, "Creating first note");
 		
 		Note note = new Note();
 		

=== modified file 'src/org/tomdroid/util/NoteContentBuilder.java'
--- src/org/tomdroid/util/NoteContentBuilder.java	2011-09-05 19:45:38 +0000
+++ src/org/tomdroid/util/NoteContentBuilder.java	2011-10-27 17:18:24 +0000
@@ -22,19 +22,15 @@
  */
 package org.tomdroid.util;
 
-import java.io.StringReader;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.tomdroid.ui.Tomdroid;
-import org.tomdroid.xml.NoteContentHandler;
-import org.xml.sax.InputSource;
-
 import android.os.Handler;
 import android.os.Message;
 import android.text.SpannableStringBuilder;
-import android.util.Log;
+import org.tomdroid.xml.NoteContentHandler;
+import org.xml.sax.InputSource;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.StringReader;
 
 public class NoteContentBuilder implements Runnable {
 	
@@ -89,12 +85,12 @@
 	        spf.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
 	        SAXParser sp = spf.newSAXParser();
 
-			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG, "parsing note");
+			TLog.v(TAG, "parsing note");
 	        sp.parse(noteContentIs, new NoteContentHandler(noteContent));
 		} catch (Exception e) {
 			e.printStackTrace();
 			// TODO handle error in a more granular way
-			Log.e(TAG, "There was an error parsing the note.");
+			TLog.e(TAG, "There was an error parsing the note.");
 			successful = false;
 		}
 		

=== added file 'src/org/tomdroid/util/TLog.java'
--- src/org/tomdroid/util/TLog.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/util/TLog.java	2011-10-27 17:18:24 +0000
@@ -0,0 +1,83 @@
+/*
+ * Tomdroid
+ * Tomboy on Android
+ * http://www.launchpad.net/tomdroid
+ *
+ * Copyright 2011 Piotr Adamski <[e-mail]>
+ *
+ * This file is part of Tomdroid.
+ *
+ * Tomdroid is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Tomdroid is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.tomdroid.util;
+
+import android.util.Log;
+
+import static java.text.MessageFormat.format;
+
+/**
+ * @author Piotr Adamski <[e-mail]>
+ */
+public class TLog {
+    // Logging should be disabled for release builds
+    private static final boolean LOGGING_ENABLED = false;
+
+    public static void v(String tag, Throwable t, String msg, Object... args) {
+        if (LOGGING_ENABLED) Log.v(tag, format(msg, args), t);
+    }
+
+    public static void v(String tag, String msg, Object... args) {
+        v(tag, null, msg, args);
+    }
+
+    public static void d(String tag, Throwable t, String msg, Object... args) {
+        if (LOGGING_ENABLED) Log.d(tag, format(msg, args), t);
+    }
+
+    public static void d(String tag, String msg, Object... args) {
+        d(tag, null, msg, args);
+    }
+
+    public static void i(String tag, Throwable t, String msg, Object... args) {
+        if (LOGGING_ENABLED) Log.i(tag, format(msg, args), t);
+    }
+
+    public static void i(String tag, String msg, Object... args) {
+        i(tag, null, msg, args);
+    }
+
+    public static void w(String tag, Throwable t, String msg, Object... args) {
+        if (LOGGING_ENABLED) Log.w(tag, format(msg, args), t);
+    }
+
+    public static void w(String tag, String msg, Object... args) {
+        w(tag, null, msg, args);
+    }
+
+    public static void e(String tag, Throwable t, String msg, Object... args) {
+        Log.e(tag, format(msg, args), t);
+    }
+
+    public static void e(String tag, String msg, Object... args) {
+        e(tag, null, msg, args);
+    }
+
+    public static void wtf(String tag, Throwable t, String msg, Object... args) {
+        Log.wtf(tag, format(msg, args), t);
+    }
+
+    public static void wtf(String tag, String msg, Object... args) {
+        wtf(tag, null, msg, args);
+    }
+}