Remember last channel in .tt files for Android

Introduces <join-last-channel> in <join> section of .tt files.

Author: amirmahdifard

ChangeLog.txt

@@ -23,6 +23,7 @@ Default Qt Client
 - Fixed language not set at first start
 - Fixed OPUS DTX mode sending too big packets when variable bitrate mode (VBR) was disabled
 Android Client
+- The "last joined channel" checkbox and nickname's value now saves on tt files up on export and loads up on impoart, so your settings for these options will no longer be lost!
 - Ability to export each server in to a .tt file separately
 - Broadcast messages are now shown in the chat tab
 - Added the ability to send broadcast messages

Client/TeamTalkAndroid/src/main/java/dk/bearware/gui/ServerEntryActivity.java

@@ -122,12 +122,12 @@ protected void onPause() {
     @Override
     protected void onStart() {
         super.onStart();
-        
-        if ((serverentry != null) && serverentry.rememberLastChannel) {
+
+        if (serverentry != null) {
             showServer(serverentry);
             serverentry = null;
         }
-        
+
         // Bind to LocalService if not already
         if (mConnection == null)
             mConnection = new TeamTalkConnection(this);

Client/TeamTalkAndroid/src/main/java/dk/bearware/gui/ServerListActivity.java

@@ -164,7 +164,7 @@ protected void onPause() {
     protected void onStart() {
         super.onStart();
 
-        if ((serverentry != null) && serverentry.rememberLastChannel) {
+        if (serverentry != null) {
             saveServers();
         }
 
@@ -275,7 +275,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     if (entries != null) {
                         for (ServerEntry entry : entries) {
                             entry.servertype = ServerEntry.ServerType.LOCAL;
-                            entry.rememberLastChannel = true;
                         }
                         servers.addAll(entries);
                         Collections.sort(servers, this);

Client/TeamTalkAndroid/src/main/java/dk/bearware/gui/Utils.java

@@ -294,7 +294,6 @@ public static Vector<ServerEntry> getXmlServerEntries(String xml) {
             if (hostnode.getNodeType() == Node.ELEMENT_NODE) {
                 Element hostelement = (Element) hostnode;
                 ServerEntry entry = new ServerEntry();
-                entry.rememberLastChannel = false;
                 NodeList namenode = hostelement.getElementsByTagName("name");
                 if (namenode.getLength() > 0)
                     entry.servername = namenode.item(0).getTextContent();
@@ -361,6 +360,9 @@ public static Vector<ServerEntry> getXmlServerEntries(String xml) {
                         NodeList passwordnode = authelement.getElementsByTagName("password");
                         if (passwordnode.getLength() > 0)
                             entry.password = passwordnode.item(0).getTextContent();
+                        NodeList nicknamenode = authelement.getElementsByTagName("nickname");
+                        if (nicknamenode.getLength() > 0)
+                            entry.nickname = nicknamenode.item(0).getTextContent();
                     }
                 }
                 //process <join>
@@ -369,6 +371,9 @@ public static Vector<ServerEntry> getXmlServerEntries(String xml) {
                     Node joinnode = joinlist.item(0);
                     if (joinnode.getNodeType() == Node.ELEMENT_NODE) {
                         Element joinelement = (Element) joinnode;
+                        NodeList joinlastchannelnode = hostelement.getElementsByTagName("join-last-channel");
+                        if (joinlastchannelnode.getLength() > 0)
+                            entry.rememberLastChannel = joinlastchannelnode.item(0).getTextContent().equalsIgnoreCase("true");
                         NodeList channelnode = joinelement.getElementsByTagName("channel");
                         if (channelnode.getLength() > 0)
                             entry.channel = channelnode.item(0).getTextContent();
@@ -426,8 +431,10 @@ public static boolean saveServers(Vector<ServerEntry> servers, String path) {
                 serializer.startTag(null, "auth");
                 serializer.startTag(null, "username").text(server.username).endTag(null, "username");
                 serializer.startTag(null, "password").text(server.password).endTag(null, "password");
+                serializer.startTag(null, "nickname").text(server.nickname).endTag(null, "nickname");
                 serializer.endTag(null, "auth");
                 serializer.startTag(null, "join");
+                serializer.startTag(null, "join-last-channel").text(String.valueOf(server.rememberLastChannel)).endTag(null, "join-last-channel");
                 serializer.startTag(null, "channel").text(server.channel).endTag(null, "channel");
                 serializer.startTag(null, "password").text(server.chanpasswd).endTag(null, "password");
                 serializer.endTag(null, "join");