Fixed issue #46 - showing buddy info in offline mode; localization fi…

…x and small code review
solkin · Feb 2, 2013 · 3dc9886 · 3dc9886
1 parent a3b275d
commit 3dc9886
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 60 deletions.
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
@@ -1,10 +1,10 @@
-#Fri, 01 Feb 2013 02:38:20 +0400
+#Sat, 02 Feb 2013 14:36:43 +0400
 #Mon Jun 13 14:36:58 MSD 2011
-netbeans.user=/Users/solkin/Library/Application Support/NetBeans/7.2.1
+netbeans.user=/home/solkin/.netbeans/7.2.1
 javadoc.preview=true
 platform.apis.defaults=JSR239-1.0,SATSA-1.0,WMA-2.0,JSR82-1.1,JSR184-1.1,SATSA-JCRMI-1.0,JSR280-1.0,SATSA-APDU-1.0,JSR234-1.0,SATSA-CRYPTO-1.0,JSR179-1.0,JSR180-1.1.0,JSR179-1.0.1,JSR75-1.0,JSR238-1.0,JSR226-1.0,JSR180-1.0.1,JSR211-1.0,JSR177-1.0,J2ME-XMLRPC-1.0,JSR229-1.1,SATSA-PKI-1.0,J2ME-WS-1.0,JSR229-1.1.0,MMAPI-1.2,MMAPI-1.1,JSR256-1.2
 selected.configurations=Mandarin_AnimSmiles,Mandarin_StatSmiles
-deployment.counter=1380
-config.active=Mandarin_AnimSmiles
-deployment.number=0.13.79
+deployment.counter=1382
+config.active=
+deployment.number=0.13.81
 app-version.autoincrement=true
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -92,12 +92,12 @@ obfuscation.custom=
 obfuscation.level=0
 obfuscator.destjar=${build.dir}/obfuscated.jar
 obfuscator.srcjar=${build.dir}/before-obfuscation.jar
-platform.active=Java_TM__Platform_Micro_Edition_SDK_3_0
-platform.active.description=Java(TM) Platform Micro Edition SDK 3.0
-platform.apis=JSR211-1.0,JSR75-1.0,J2ME-WS-1.0,JSR82-1.1,JSR179-1.0,JSR184-1.1,JSR238-1.0,MMAPI-1.2,JSR256-1.2,JSR229-1.1,JSR180-1.1.0,JSR226-1.0,SATSA-1.0,WMA-2.0,JSR280-1.0
-platform.bootclasspath=${platform.home}/lib/jsr172_1.0.jar:${platform.home}/lib/jsr135_1.2.jar:${platform.home}/lib/jsr238_1.0.jar:${platform.home}/lib/jsr75_1.0.jar:${platform.home}/lib/jsr211_1.0.jar:${platform.home}/lib/jsr177_1.0.jar:${platform.home}/lib/jsr184_1.1.jar:${platform.home}/lib/jsr180_1.1.jar:${platform.home}/lib/jsr226_1.0.jar:${platform.home}/lib/jsr205_2.0.jar:${platform.home}/lib/jsr082_1.1.jar:${platform.home}/lib/jsr179_1.0.jar:${platform.home}/lib/jsr256_1.2.jar:${platform.home}/lib/jsr229_1.1.jar:${platform.home}/lib/jsr280_1.0.jar:${platform.home}/lib/midp_2.0.jar:${platform.home}/lib/cldc_1.0.jar
+platform.active=Sun_Java_TM__Wireless_Toolkit_2_5_2_01_for_CLDC
+platform.active.description=Sun Java(TM) Wireless Toolkit 2.5.2_01 for CLDC
+platform.apis=WMA-2.0,MMAPI-1.1,JSR238-1.0,JSR211-1.0,JSR82-1.1,JSR177-1.0,JSR179-1.0.1,JSR234-1.0,SATSA-APDU-1.0,J2ME-WS-1.0,J2ME-XMLRPC-1.0,SATSA-JCRMI-1.0,SATSA-CRYPTO-1.0,JSR239-1.0,JSR229-1.1.0,SATSA-PKI-1.0,JSR180-1.0.1,JSR226-1.0,JSR75-1.0,JSR184-1.1
+platform.bootclasspath=${platform.home}/lib/jsr226.jar:${platform.home}/lib/jsr239.jar:${platform.home}/lib/jsr75.jar:${platform.home}/lib/satsa-crypto.jar:${platform.home}/lib/jsr229.jar:${platform.home}/lib/satsa-pki.jar:${platform.home}/lib/jsr238.jar:${platform.home}/lib/jsr179.jar:${platform.home}/lib/jsr211.jar:${platform.home}/lib/j2me-xmlrpc.jar:${platform.home}/lib/jsr180.jar:${platform.home}/lib/mmapi.jar:${platform.home}/lib/satsa-jcrmi.jar:${platform.home}/lib/jsr082.jar:${platform.home}/lib/satsa-apdu.jar:${platform.home}/lib/jsr184.jar:${platform.home}/lib/j2me-ws.jar:${platform.home}/lib/wma20.jar:${platform.home}/lib/jsr234.jar:${platform.home}/lib/cldcapi10.jar:${platform.home}/lib/midpapi20.jar
 platform.configuration=CLDC-1.0
-platform.device=DefaultCldcPhone1
+platform.device=DefaultColorPhone
 platform.fat.jar=true
 platform.profile=MIDP-2.0
 platform.trigger=CLDC

diff --git a/src/com/tomclaw/mandarin/icq/IcqStatusUtil.java b/src/com/tomclaw/mandarin/icq/IcqStatusUtil.java
@@ -7,16 +7,16 @@
  */
 public class IcqStatusUtil {
 
-  public static final String[] statusesDescr = new String[]{"STATUS_OFFLINE", "STATUS_ONLINE", "STATUS_AWAY", "STATUS_NA", "STATUS_OCCUPIED", "STATUS_DND", "STATUS_INVISIBLE", "STATUS_FFC", "STATUS_EVIL", "STATUS_DEPRESSION", "STATUS_ATHOME", "STATUS_ATWORK", "STATUS_LAUNCH", "STATUS_MOBILE"};
-  public static final int[] statusIds = new int[]{-1, 0x0000, 0x0001, 0x0004, 0x0010, 0x0002, 0x0100, 0x1000, 0x1001, 0x1002, 0x1003, 0x1004, 0x1005, 0x1006};
+  public static final String[] statusesDescr = new String[] { "STATUS_OFFLINE", "STATUS_ONLINE", "STATUS_AWAY", "STATUS_NA", "STATUS_OCCUPIED", "STATUS_DND", "STATUS_INVISIBLE", "STATUS_FFC", "STATUS_EVIL", "STATUS_DEPRESSION", "STATUS_ATHOME", "STATUS_ATWORK", "STATUS_LAUNCH", "STATUS_MOBILE" };
+  public static final int[] statusIds = new int[] { -1, 0x0000, 0x0001, 0x0004, 0x0010, 0x0002, 0x0100, 0x1000, 0x1001, 0x1002, 0x1003, 0x1004, 0x1005, 0x1006 };
   public static final byte[][] aStatusBytes = {
-    {( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x75}, // QipStatus: <<Free For Chat>>
-    {( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x79}, // QipStatus: <<Evil>>
-    {( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x70}, // QipStatus: <<Depression>>
-    {( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x76}, // QipStatus: <<At home>>
-    {( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x77}, // QipStatus: <<At work>>
-    {( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x78}, // QipStatus: <<Lunch>>
-    {( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x74}, // QipStatus: <<From phone>>
+    { ( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x75 }, // QipStatus: <<Free For Chat>>
+    { ( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x79 }, // QipStatus: <<Evil>>
+    { ( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x70 }, // QipStatus: <<Depression>>
+    { ( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x76 }, // QipStatus: <<At home>>
+    { ( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x77 }, // QipStatus: <<At work>>
+    { ( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x78 }, // QipStatus: <<Lunch>>
+    { ( byte ) 0xb7, ( byte ) 0x07, ( byte ) 0x43, ( byte ) 0x78, ( byte ) 0xf5, ( byte ) 0x0c, ( byte ) 0x77, ( byte ) 0x77, ( byte ) 0x97, ( byte ) 0x77, ( byte ) 0x57, ( byte ) 0x78, ( byte ) 0x50, ( byte ) 0x2d, ( byte ) 0x05, ( byte ) 0x74 }, // QipStatus: <<From phone>>
   };
 
   public static boolean expectIsStatus( int status ) {

diff --git a/src/com/tomclaw/mandarin/main/BuddyItem.java b/src/com/tomclaw/mandarin/main/BuddyItem.java
@@ -1,6 +1,7 @@
 package com.tomclaw.mandarin.main;
 
 import com.tomclaw.tcuilite.GroupChild;
+import com.tomclaw.utils.StringUtil;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -21,7 +22,7 @@ public abstract class BuddyItem extends GroupChild {
   private int statusIndex = 0;
   public boolean isAvaitingAuth = false;
   public int unreadCount = 0;
-  /**Typing thread **/
+  /** Typing thread **/
   private Timer typingTimer;
   private TimerTask timerTask;
 
@@ -61,7 +62,9 @@ public void setUnreadCount( int unreadCount, String resource ) {
 
   public void setUserPhone( String userPhone ) {
     this.userPhone = userPhone;
-    userId = userPhone;
+    if ( StringUtil.isNullOrEmpty( userId ) ) {
+      userId = userPhone;
+    }
   }
 
   public void setTypingStatus( boolean isTyping ) {

diff --git a/src/com/tomclaw/mandarin/main/RmsRenderer.java b/src/com/tomclaw/mandarin/main/RmsRenderer.java
@@ -35,6 +35,7 @@ public static GroupHeader getRmsGroupHeader( byte[] data, AccountRoot accoutRoot
         t_Int = DataUtil.get16( data, offset );
         offset += 2;
         groupChild.setUserPhone( StringUtil.byteArrayToString( data, offset, t_Int, true ) );
+        System.out.println(groupChild.getUserPhone());
         offset += t_Int;
         groupChild.setBuddyType( DataUtil.get16( data, offset ) );
         offset += 2;

diff --git a/src/com/tomclaw/mandarin/mmp/MmpStatusUtil.java b/src/com/tomclaw/mandarin/mmp/MmpStatusUtil.java
@@ -11,11 +11,11 @@
 public class MmpStatusUtil {
 
   public static int phoneStatus = 56;
-  public static final String[] statusesDescr = new String[]{
+  public static final String[] statusesDescr = new String[] {
     "STATUS_OFFLINE", "STATUS_ONLINE", "STATUS_AWAY", "STATUS_FFC", "STATUS_DND", "STATUS_INVISIBLE" };
-  public static final long[] statusIds = new long[]{
+  public static final long[] statusIds = new long[] {
     0x00000000, 0x00000001, 0x00000002, 0x00000104, 0x00000204, 0x80000000 };
-  public static final String[] statusesNames = new String[]{
+  public static final String[] statusesNames = new String[] {
     "status_0", "status_1", "status_2", "status_chat", "status_dnd", "status_3" };
   public static final String statusX = "status_";
   public static int baseStatusCount = 5;

diff --git a/src/com/tomclaw/mandarin/xmpp/AffiliationAddFrame.java b/src/com/tomclaw/mandarin/xmpp/AffiliationAddFrame.java
@@ -20,7 +20,8 @@ public class AffiliationAddFrame extends Window {
   public Field reasonField;
   String requestId = "";
 
-  public AffiliationAddFrame( XmppAccountRoot xmppAccountRoot, String groupChatJid ) {
+  public AffiliationAddFrame( XmppAccountRoot xmppAccountRoot, 
+          String groupChatJid ) {
     super( MidletMain.screen );
     this.xmppAccountRoot = xmppAccountRoot;
     this.groupChatJid = groupChatJid;
@@ -44,35 +45,30 @@ public void actionPerformed() {
     };
     /** Crating pane **/
     Pane pane = new Pane( null, false );
-
     pane.addItem( new Label( Localization.getMessage( "AFFILIATION_JID" ).concat( ":" ) ) );
     jidField = new Field( "" );
     jidField.setFocusable( true );
     jidField.setFocused( true );
     pane.addItem( jidField );
-
     afflTypeGroup = new RadioGroup();
     Radio memberRadio = new Radio( Localization.getMessage( "GROUP_CHAT_MEMBER" ), true );
     Radio adminRadio = new Radio( Localization.getMessage( "GROUP_CHAT_ADMIN" ), false );
     Radio ownerRadio = new Radio( Localization.getMessage( "GROUP_CHAT_OWNER" ), false );
     Radio outcastRadio = new Radio( Localization.getMessage( "GROUP_CHAT_OUTCAST" ), false );
-
     memberRadio.setFocusable( true );
     adminRadio.setFocusable( true );
     ownerRadio.setFocusable( true );
     outcastRadio.setFocusable( true );
-
     afflTypeGroup.addRadio( memberRadio );
     afflTypeGroup.addRadio( adminRadio );
     afflTypeGroup.addRadio( ownerRadio );
     afflTypeGroup.addRadio( outcastRadio );
-
-    pane.addItem( new Label( Localization.getMessage( "AFFILIATION_TYPE" ).concat( ":" ) ) );
+    pane.addItem( new Label( Localization.getMessage( "AFFILIATION_TYPE" )
+            .concat( ":" ) ) );
     pane.addItem( memberRadio );
     pane.addItem( adminRadio );
     pane.addItem( ownerRadio );
     pane.addItem( outcastRadio );
-
     pane.addItem( new Label( Localization.getMessage( "AFFILIATION_REASON" ) ) );
     reasonField = new Field( "" );
     reasonField.setFocusable( true );
@@ -108,8 +104,10 @@ public void sendAffiliationAdd() throws IOException {
     MidletMain.screen.setWaitScreenState( true );
   }
 
-  public void setRequestResult( XmppAccountRoot xmppAccountRoot, String requestId ) {
-    if ( xmppAccountRoot.equals( this.xmppAccountRoot ) && requestId.equals( this.requestId ) ) {
+  public void setRequestResult( XmppAccountRoot xmppAccountRoot, 
+          String requestId ) {
+    if ( xmppAccountRoot.equals( this.xmppAccountRoot ) 
+            && requestId.equals( this.requestId ) ) {
       MidletMain.screen.setWaitScreenState( false );
       MidletMain.screen.setActiveWindow( s_prevWindow );
       try {

diff --git a/src/com/tomclaw/mandarin/xmpp/GroupChatNickEditFrame.java b/src/com/tomclaw/mandarin/xmpp/GroupChatNickEditFrame.java
@@ -1,5 +1,6 @@
 package com.tomclaw.mandarin.xmpp;
 
+import com.tomclaw.mandarin.main.ActionExec;
 import com.tomclaw.mandarin.main.MidletMain;
 import com.tomclaw.tcuilite.*;
 import com.tomclaw.tcuilite.localization.Localization;
@@ -12,16 +13,11 @@
  */
 public class GroupChatNickEditFrame extends Window {
 
-  public XmppAccountRoot xmppAccountRoot;
-  public XmppItem xmppItem;
-  public Field nickField;
+  private Field nickField;
 
   public GroupChatNickEditFrame( final XmppAccountRoot xmppAccountRoot, 
           final XmppItem xmppItem ) {
     super( MidletMain.screen );
-    /** Accepting variables **/
-    this.xmppAccountRoot = xmppAccountRoot;
-    this.xmppItem = xmppItem;
     /** Header **/
     header = new Header( Localization.getMessage( "GROUP_CHAT_NICK_EDIT" ) );
     /** Soft **/
@@ -42,6 +38,7 @@ public void actionPerformed() {
                   xmppAccountRoot.statusIndex ), null, 5, false, null, null );
           xmppItem.groupChatNick = nickField.getText();
         } catch ( IOException ex ) {
+          ActionExec.showFail( "IO_EXCEPTION" );
         }
         MidletMain.screen.setActiveWindow( s_prevWindow );
       }

diff --git a/src/com/tomclaw/mandarin/xmpp/GroupChatUsersFrame.java b/src/com/tomclaw/mandarin/xmpp/GroupChatUsersFrame.java
@@ -15,17 +15,17 @@
  */
 public class GroupChatUsersFrame extends Window {
 
-  public XmppAccountRoot xmppAccountRoot;
-  public String groupChatJid;
-  public boolean isRole;
-  public Tab tab;
-  public List participantList;
-  public List moderatorList;
-  public List memberList;
-  public List adminList;
-  public List ownerList;
-  public List outcastList;
-  public String requestId = "";
+  private XmppAccountRoot xmppAccountRoot;
+  private String groupChatJid;
+  private boolean isRole;
+  private Tab tab;
+  private List participantList;
+  private List moderatorList;
+  private List memberList;
+  private List adminList;
+  private List ownerList;
+  private List outcastList;
+  private String requestId = "";
 
   public GroupChatUsersFrame( final XmppAccountRoot xmppAccountRoot,
           final String groupChatJid, final boolean isRole ) {
@@ -43,21 +43,23 @@ public void actionPerformed() {
         MidletMain.screen.setActiveWindow( s_prevWindow );
       }
     };
-    final PopupItem infoPopupItem = new PopupItem( Localization.getMessage( "INFO_AFFILIATION" ) ) {
+    final PopupItem infoPopupItem = new PopupItem(
+            Localization.getMessage( "INFO_AFFILIATION" ) ) {
       public void actionPerformed() {
         if ( ( ( List ) tab.gObject ).selectedIndex != -1
                 && ( ( List ) tab.gObject ).selectedIndex < ( ( List ) tab.gObject ).items.size() ) {
-          GroupChatUser groupChatUser = ( GroupChatUser ) ( ( List ) tab.gObject ).items.elementAt( ( ( List ) tab.gObject ).selectedIndex );
+          GroupChatUser groupChatUser = ( GroupChatUser ) ( ( List ) tab.gObject ).items.elementAt(
+                  ( ( List ) tab.gObject ).selectedIndex );
           String[] param = null;
           String[] value = null;
           if ( groupChatUser.affiliation != null ) {
-            param = new String[]{ "AFFILIATION_JID", "NICK", "AFFILIATION_REASON", "AFFILIATION" };
-            value = new String[]{ groupChatUser.jid, groupChatUser.nick,
+            param = new String[] { "AFFILIATION_JID", "NICK", "AFFILIATION_REASON", "AFFILIATION" };
+            value = new String[] { groupChatUser.jid, groupChatUser.nick,
               groupChatUser.reason == null ? Localization.getMessage( "NO_REASON" ) : groupChatUser.reason,
               Localization.getMessage( groupChatUser.affiliation.toUpperCase() ) };
           } else if ( groupChatUser.role != null ) {
-            param = new String[]{ "AFFILIATION_JID", "NICK", "AFFILIATION_REASON", "ROLE" };
-            value = new String[]{ groupChatUser.jid, groupChatUser.nick, groupChatUser.reason == null ? Localization.getMessage( "NO_REASON" ) : groupChatUser.reason,
+            param = new String[] { "AFFILIATION_JID", "NICK", "AFFILIATION_REASON", "ROLE" };
+            value = new String[] { groupChatUser.jid, groupChatUser.nick, groupChatUser.reason == null ? Localization.getMessage( "NO_REASON" ) : groupChatUser.reason,
               Localization.getMessage( groupChatUser.role.toUpperCase() ) };
           }
           InfoFrame infoFrame = new InfoFrame( param, value );
@@ -131,6 +133,7 @@ public void stateChanged( int previousIndex, int selectedIndex, int tabsCount )
         }
       }
     };
+    tab.selectedIndex = 0;
     /** Setting GObject **/
     setGObject( tab );
     /** Requesting lists **/
@@ -188,7 +191,8 @@ public void setResult( XmppAccountRoot xmppAccountRoot, String id, Vector items
   }
 
   public void setError( XmppAccountRoot xmppAccountRoot, String id ) {
-    if ( this.xmppAccountRoot.equals( xmppAccountRoot ) && id.startsWith( requestId ) ) {
+    if ( this.xmppAccountRoot.equals( xmppAccountRoot )
+            && id.startsWith( requestId ) ) {
       MidletMain.screen.setWaitScreenState( false );
       ActionExec.showFail( Localization.getMessage( "PERMISSION_DENIED" ) );
       requestId = "";

diff --git a/src/com/tomclaw/mandarin/xmpp/ServiceItem.java b/src/com/tomclaw/mandarin/xmpp/ServiceItem.java
@@ -54,14 +54,12 @@ public Identity getIdentityByType( String type ) {
   public boolean containsFeature( String feature ) {
     LogUtil.outMessage( "Features present: " + ( features != null ) );
     if ( features != null ) {
-      LogUtil.outMessage( "-------Features-------" );
       for ( int c = 0; c < features.size(); c++ ) {
         LogUtil.outMessage( ( String ) features.elementAt( c ) );
         if ( ( ( String ) features.elementAt( c ) ).equals( feature ) ) {
           return true;
         }
       }
-      LogUtil.outMessage( "----------------------" );
     }
     return false;
   }

diff --git a/src/res/localization/string_ru.properties b/src/res/localization/string_ru.properties
@@ -363,6 +363,9 @@ INC_FILE=\u0412\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u0444\u0430\u0439\u04
 INC_FILE_FROM=\u0412\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u0444\u0430\u0439\u043b \u043e\u0442
 FILE_BROWSER_FRAME=\u0424\u0430\u0439\u043b-\u0431\u0440\u0430\u0443\u0437\u0435\u0440
 TRANSACTION_WITH=\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u0441
+BYTES=\u0411\u0430\u0439\u0442
+KIB=\u041a\u0438\u0411
+MiB=\u041c\u0438\u0411
 # }
 # Transaction statuses
 NO_STATUS=\u041d\u0435\u0442 \u0441\u0442\u0430\u0442\u0443\u0441\u0430