Mercurial Mercurial > beem > otr / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Checkstyle
authorDa Risk <darisk972@gmail.com>
Mon, 31 May 2010 00:17:26 +0200
changeset 747 22969380eb13
parent 746 6b48526b94ef
child 750 7ca6b25f3624
Checkstyle
src/com/beem/project/beem/BeemApplication.java file | annotate | diff | comparison | revisions
src/com/beem/project/beem/service/BeemChatManager.java file | annotate | diff | comparison | revisions
src/com/beem/project/beem/service/RosterAdapter.java file | annotate | diff | comparison | revisions
src/com/beem/project/beem/service/XmppConnectionAdapter.java file | annotate | diff | comparison | revisions
src/com/beem/project/beem/ui/ContactList.java file | annotate | diff | comparison | revisions 
--- a/src/com/beem/project/beem/BeemApplication.java	Mon May 31 00:05:36 2010 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Mon May 31 00:17:26 2010 +0200
@@ -67,21 +67,21 @@
     public static final String STATUS_KEY = "status";
     /** Preference key for status message. */
     public static final String STATUS_TEXT_KEY = "status_text";
-    /** Preference key for the use of a proxy */
+    /** Preference key for the use of a proxy. */
     public static final String PROXY_USE_KEY = "proxy_use";
-    /** Preference key for the type of proxy */
+    /** Preference key for the type of proxy. */
     public static final String PROXY_TYPE_KEY = "proxy_type";
-    /** Preference key for the proxy server */
+    /** Preference key for the proxy server. */
     public static final String PROXY_SERVER_KEY = "proxy_server";
-    /** Preference key for the proxy port */
+    /** Preference key for the proxy port. */
     public static final String PROXY_PORT_KEY = "proxy_port";
-    /** Preference key for the proxy username */
+    /** Preference key for the proxy username. */
     public static final String PROXY_USERNAME_KEY = "proxy_username";
-    /** Preference key for the proxy password */
+    /** Preference key for the proxy password. */
     public static final String PROXY_PASSWORD_KEY = "proxy_password";
-    /** Preference key for vibrate on notification */
+    /** Preference key for vibrate on notification. */
     public static final String NOTIFICATION_VIBRATE_KEY = "notification_vibrate";
-    /** Preference key for notification sound */
+    /** Preference key for notification sound. */
     public static final String NOTIFICATION_SOUND_KEY = "notification_sound";
 
     //TODO add the other one
--- a/src/com/beem/project/beem/service/BeemChatManager.java	Mon May 31 00:05:36 2010 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Mon May 31 00:17:26 2010 +0200
@@ -56,7 +56,6 @@
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.Uri;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
@@ -255,7 +254,8 @@
 	 */
 	private PendingIntent makeChatIntent(IChat chat) {
 	    Intent chatIntent = new Intent(mService, com.beem.project.beem.ui.Chat.class);
-	    chatIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+	    chatIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP
+		    | Intent.FLAG_ACTIVITY_NEW_TASK);
 	    try {
 		chatIntent.setData(chat.getParticipant().toUri());
 	    } catch (RemoteException e) {
--- a/src/com/beem/project/beem/service/RosterAdapter.java	Mon May 31 00:05:36 2010 +0200
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Mon May 31 00:17:26 2010 +0200
@@ -156,7 +156,7 @@
 	Collection<RosterEntry> list = mAdaptee.getEntries();
 	List<Contact> coList = new ArrayList<Contact>(list.size());
 	for (RosterEntry entry : list) {
-		coList.add(getContactFromRosterEntry(entry));
+	    coList.add(getContactFromRosterEntry(entry));
 	}
 	return coList;
     }
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Mon May 31 00:05:36 2010 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Mon May 31 00:17:26 2010 +0200
@@ -61,10 +61,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.Uri;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
-import android.preference.PreferenceManager;
 import android.util.Log;
 
 import com.beem.project.beem.BeemService;
--- a/src/com/beem/project/beem/ui/ContactList.java	Mon May 31 00:05:36 2010 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Mon May 31 00:17:26 2010 +0200
@@ -159,8 +159,8 @@
 		startActivity(new Intent(ContactList.this, AddContact.class));
 		return true;
 	    case R.id.menu_disconnect:
-		    stopService(SERVICE_INTENT);
-		    finish();
+		stopService(SERVICE_INTENT);
+		finish();
 		return true;
 	    default:
 		return false;
@@ -293,8 +293,7 @@
 	if (!mBinded) {
 	    mBinded = bindService(SERVICE_INTENT, mServConn, BIND_AUTO_CREATE);
 	    Log.d(TAG, "on resume bind = " + mBinded);
-	}
-	else {
+	} else {
 	    if (!mSettings.getBoolean("settings_key_hide_groups", false))
 		buildBanner();
 	    else
BEEM-OTR