Merge pull request #11 from DevFactory/release/multiple-quality-improvements-fix-1

Multiple quality improvements - squid:S2131, squid:S1319

Author: realtime-framework

app/src/main/java/co/realtime/messagingandroidchat/ChatRoomActivity.java

@@ -8,7 +8,7 @@
 import android.widget.Button;
 import android.widget.TableLayout;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import config.Config;
 import domains.Message;
@@ -20,7 +20,7 @@
 
 public class ChatRoomActivity extends ActionBarActivity implements InterfaceRefresher {
 	private Boolean editing;
-	private ArrayList<String> channels;
+	private List<String> channels;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/co/realtime/messagingandroidchat/ComposeActivity.java

@@ -32,13 +32,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
 		final TextView charNumber = (TextView) findViewById(R.id.charNumber);
-    	charNumber.setText("" + Config.MSG_SIZE);
+    	charNumber.setText( String.valueOf(Config.MSG_SIZE));
 
     	final EditText text = (EditText) this.findViewById(R.id.editMessage);
 
 	    text.addTextChangedListener(new TextWatcher(){
 	        public void afterTextChanged(Editable s) {
-	        	charNumber.setText("" + (Config.MSG_SIZE - text.getText().toString().length()));
+	        	charNumber.setText(String.valueOf(Config.MSG_SIZE - text.getText().toString().length()));
 	        }
 	        public void beforeTextChanged(CharSequence s, int start, int count, int after){}
 	        public void onTextChanged(CharSequence s, int start, int before, int count){}

app/src/main/java/co/realtime/messagingandroidchat/MessageActivity.java

@@ -9,7 +9,7 @@
 import android.widget.Button;
 import android.widget.TableLayout;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import domains.Channel;
 import domains.Message;
@@ -87,7 +87,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
 	private void loadMsg() {
-        ArrayList<Message> messages = OrtcHandler.selfHandler.messages.get(channel).getMessages();
+        List<Message> messages = OrtcHandler.selfHandler.messages.get(channel).getMessages();
         for (Message msg : messages) {
             setmsg(msg);
         }

app/src/main/java/co/realtime/messagingandroidchat/NotificationActivity.java

@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
             refreshUI(user+":"+message);
 
             final TextView charNumber = (TextView) findViewById(R.id.charNumber);
-            charNumber.setText("" + 260);
+            charNumber.setText( String.valueOf(260));
 
             final EditText text = (EditText) this.findViewById(R.id.editMessage);
 

app/src/main/java/domains/Channel.java

@@ -1,10 +1,11 @@
 package domains;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class Channel {
 	private String name;
-	private ArrayList<Message> messages;
+	private List<Message> messages;
 	private int unRead;
 
 	public Channel(String name) {
@@ -18,7 +19,7 @@ public void addMessage(Message msg)
 		this.messages.add(msg);
 	}
 
-	public ArrayList<Message> getMessages(){
+	public List<Message> getMessages(){
 		return this.messages;
 	}
 

app/src/main/java/handlers/OrtcHandler.java

@@ -4,9 +4,7 @@
 import android.util.Log;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
+import java.util.*;
 
 import co.realtime.messagingandroidchat.MessageActivity;
 import config.Config;
@@ -31,7 +29,7 @@ public class OrtcHandler{
     public static OrtcHandler selfHandler;
 
 	public static OrtcClient client = null;
-	public HashMap<String, Channel> messages;
+	public Map<String, Channel> messages;
 	public Boolean isConnected;
 	public InterfaceRefresher rootView;
     public Context context;
@@ -85,7 +83,7 @@ public static void prepareClient(Context context, InterfaceRefresher rootView){
 				public void run(OrtcClient sender) {
 					selfHandler.isConnected = true;
 
-					ArrayList<String> channels = PreferencesManager.getInstance(selfHandler.context).loadChannels();
+					List<String> channels = PreferencesManager.getInstance(selfHandler.context).loadChannels();
 					for (String channel : channels) {
 						subscribeChannel(channel);
 					}

app/src/main/java/preferences/PreferencesManager.java

@@ -5,6 +5,7 @@
 import android.preference.PreferenceManager;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class PreferencesManager {
 
@@ -36,7 +37,7 @@ public void saveUser(String novaVersao){
         e.commit();
     }
 
-    public ArrayList<String> loadChannels(){
+    public List<String> loadChannels(){
         String channels = settings.getString(CHANNELS,null);
         if(channels == null)
         {
@@ -45,15 +46,15 @@ public ArrayList<String> loadChannels(){
 
         String[] parts = channels.split(",");
 
-        ArrayList<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<String>();
 
         for (String channel : parts) {
             list.add(channel);
         }
         return list;
     }
 
-    public void saveChannels(ArrayList<String> channels){
+    public void saveChannels(List<String> channels){
         SharedPreferences.Editor e = settings.edit();
         StringBuilder channelsString = new StringBuilder();
 

app/src/main/java/ui/CustomTableRow.java

@@ -114,7 +114,7 @@ private void setUnread(View tr) {
 		TextView unRead = (TextView) tr.findViewById(R.id.unRead);
 		Channel channelRef = OrtcHandler.selfHandler.messages.get(content);
 		if (channelRef.getUnRead() > 0)
-			unRead.setText("" + channelRef.getUnRead());
+			unRead.setText( String.valueOf(channelRef.getUnRead()) );
 		else {
 			unRead.setText("");
 		}