Minor changes in some variables for better understanding

app/build.gradle

@@ -47,6 +47,8 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:21.+'
     compile files('/home/theofilos/new_git/QRPushToTalk/libraries/android-async-http-1.4.6.jar')
     compile files('/home/theofilos/new_git/QRPushToTalk/libraries/gson-2.3.1.jar')
+    compile files('/home/theo/git/QRPushToTalk/libraries/android-async-http-1.4.6.jar')
+    compile files('/home/theo/git/QRPushToTalk/libraries/gson-2.3.1.jar')
 }
 
 
@@ -62,8 +64,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 21
         applicationId "com.terracom.qrpttbeta"
-        versionCode 79
-        versionName "0.8.9"
+        versionCode 80
+        versionName "0.9.0"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
         buildConfigField "boolean", "DONATE_NAG", "false"
     }

app/src/main/java/com/terracom/qrpttbeta/app/QRPushToTalkActivity.java

@@ -102,6 +102,9 @@ public class QRPushToTalkActivity extends ActionBarActivity implements ListView.
      */
     public static final String EXTRA_DRAWER_FRAGMENT = "drawer_fragment";
 
+    public static final String LastChannelPreference = "lastchannelloggedprefs";
+    public static String nameOfSavedLastLoggedChannel = "";
+
     private QRPushToTalkService.QRPushToTalkBinder mService;
     private QRPushToTalkDatabase mDatabase;
     private Settings mSettings;
@@ -386,6 +389,16 @@ protected void onDestroy() {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
         preferences.unregisterOnSharedPreferenceChangeListener(this);
         mDatabase.close();
+
+
+        if(!ServerEditFragment.CompanyNameStr.equals("")){
+            SharedPreferences mysettings = getSharedPreferences(LastChannelPreference,0);
+            SharedPreferences.Editor myEditor = mysettings.edit();
+            myEditor.putString("LastChannel",ServerEditFragment.CompanyNameStr);
+            myEditor.commit();
+        }
+
+
         super.onDestroy();
     }
 
@@ -747,6 +760,11 @@ public void onDisconnected(JumbleException e) throws RemoteException {
             }
         }*/
 
+
+        SharedPreferences mysettings = getSharedPreferences(LastChannelPreference,0);
+        nameOfSavedLastLoggedChannel = mysettings.getString("LastChannel","");
+
+
         ServerConnectTask connectTask = new ServerConnectTask(this, mDatabase);
         connectTask.execute(server);
     }

app/src/main/java/com/terracom/qrpttbeta/servers/ServerEditFragment.java

@@ -20,80 +20,22 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.content.ContextWrapper;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
-
-import com.google.gson.JsonObject;
 import com.terracom.jumble.Constants;
 import com.terracom.jumble.model.Server;
 import com.terracom.qrpttbeta.R;
 import com.terracom.qrpttbeta.Settings;
-import com.terracom.qrpttbeta.app.QRPushToTalkActivity;
 import com.terracom.qrpttbeta.db.DatabaseProvider;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicResponseHandler;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.json.JSONStringer;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-import android.widget.Toast;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.loopj.android.http.AsyncHttpClient;
-import com.loopj.android.http.AsyncHttpResponseHandler;
-import com.loopj.android.http.RequestParams;
-
-import java.util.List;
 import java.util.Random;
-import com.terracom.qrpttbeta.servers.HttpRequest;
 
-import ch.boye.httpclientandroidlib.client.HttpClient;
 
 public class ServerEditFragment extends DialogFragment {
     private TextView mNameTitle;
@@ -104,9 +46,9 @@ public class ServerEditFragment extends DialogFragment {
     private EditText mPasswordEdit;
     private TextView mErrorText;
 
-    public String resultFromWebService = "Tipotadenmphkeakoma";
+    public String resultFromWebService = "Noresponseyet";
     public String uname = "";
-    public String CompanyNameStr= "";
+    public static String CompanyNameStr= "";
     public String GuardAliasStr = "";
     public String errorResultFromJsonStr = "";
     public String errorMessageFromJsonStr = "";
@@ -118,6 +60,7 @@ public class ServerEditFragment extends DialogFragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setStyle(DialogFragment.STYLE_NO_TITLE, 0);
+
     }
 
     @Override
@@ -146,32 +89,25 @@ public void onClick(View v) {
                 getFormData();
                 try {
                     Thread.sleep(6000);
-                    //resultFromWebService = resultFromWebService.substring(1, resultFromWebService.length()-1);
                     resultFromWebService = resultFromWebService.replace("(","");
                     resultFromWebService = resultFromWebService.replace(")","");
-
-                    Log.d("+KALO SLEEP H MOUFA???+",resultFromWebService);
                     try {
-                        JSONObject jsonaqui = new JSONObject(resultFromWebService);
-                        errorResultFromJsonStr = jsonaqui.get("result").toString();
-                        errorMessageFromJsonStr = jsonaqui.get("Message").toString();
-                        if(jsonaqui.get("result").toString().equals("0")){
-                            //EMFWLEVMENO JSON
-                            JSONObject jsonaquidata = jsonaqui.getJSONObject("data");
-                            CompanyNameStr = jsonaquidata.get("CompanyName").toString().replaceAll("\\s","").trim();
-                            GuardAliasStr = jsonaquidata.get("GuardAlias").toString().replaceAll("\\s","").trim();
-                            Log.d("Jsnqui.get(\"CompanyName\")",CompanyNameStr);
-                            Log.d("--Jsonaqui.get(\"data\")-",GuardAliasStr);
+                        JSONObject myjson = new JSONObject(resultFromWebService);
+                        errorResultFromJsonStr = myjson.get("result").toString();
+                        errorMessageFromJsonStr = myjson.get("Message").toString();
+                        if(myjson.get("result").toString().equals("0")){
+                            JSONObject myjsondata = myjson.getJSONObject("data");
+                            CompanyNameStr = myjsondata.get("CompanyName").toString().replaceAll("\\s","").trim();
+                            GuardAliasStr = myjsondata.get("GuardAlias").toString().replaceAll("\\s","").trim();
+                        }else{
+                            CompanyNameStr = "";
                         }
-
-                        Log.d("+++++JSONAQUI???++++++",jsonaqui.toString());
                     } catch (JSONException e) {
-                        Log.d("++DEN STRING SE JSON++","++++++++++++++++");
+                        CompanyNameStr = "";
                         e.printStackTrace();
                     }
 
                 } catch (InterruptedException e) {
-                    Log.d("++DEN EPIASE TO SLEEP++","");
                     e.printStackTrace();
                 }
                 if (validate()) {
@@ -197,7 +133,6 @@ protected String doInBackground(String... urls) {
         // onPostExecute displays the results of the AsyncTask.
         @Override
         protected void onPostExecute(String resultAfterPost) {
-            Log.d("~~META TO POSTEXECUTE~~", resultAfterPost);
         }
     }
 
@@ -208,10 +143,8 @@ public String WebserviceGet(String jsonGuard) {
             resultFromWebService = req.trustAllCerts().trustAllHosts().body();
             resultFromWebService = resultFromWebService.replace("(","");
             resultFromWebService = resultFromWebService.replace(")","");
-            Log.d("------REQ BODY2------",resultFromWebService);
             return resultFromWebService;
         }catch(Exception e){
-            Log.d("=-=-To exception is:=-=",e.getMessage());
             return e.getMessage();
         }
     }
@@ -243,8 +176,6 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         mHostEdit = (EditText) view.findViewById(R.id.server_edit_host);
         mPortEdit = (EditText) view.findViewById(R.id.server_edit_port);
         mUsernameEdit = (EditText) view.findViewById(R.id.server_edit_username);
-        //mUsernameEdit.setHint(settings.getDefaultUsername());
-        //mUsernameEdit.setHint("Insert demo here");
         mPasswordEdit = (EditText) view.findViewById(R.id.server_edit_password);
         mErrorText = (TextView) view.findViewById(R.id.server_edit_error);
         if (getServer() != null) {
@@ -253,7 +184,6 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             mHostEdit.setText(oldServer.getHost());
             mPortEdit.setText(String.valueOf(oldServer.getPort()));
             mUsernameEdit.setText(oldServer.getUsername());
-            //mPasswordEdit.setText(oldServer.getPassword());
             mPasswordEdit.setText("");
         }
 
@@ -336,26 +266,19 @@ public void getFormData(){
         String username = (mUsernameEdit).getText().toString().trim();
         String passwordPIN = mPasswordEdit.getText().toString().trim();
 
-
         if(username.equals("demo") || username.equals(null) || username.equals("Demo")|| username.equals("DEMO")){
             username = randomNumStr;
             uname = username;
-            //mUsernameEdit.setText(username);
             mUsernameEdit.setText(uname);
         }else{
             JSONObject jsonGuard = new JSONObject();
             try {
                 jsonGuard.put("GuardID",username);
                 jsonGuard.put("GuardPIN",passwordPIN);
-                Log.d("=====TO JSON m====",jsonGuard.toString());
-                Log.d("==jsGrd.gtStr(GrdID)==",jsonGuard.getString("GuardID"));
-                Log.d("==jsGrd.gtStr(GrdPIN)==",jsonGuard.getString("GuardPIN"));
             } catch (JSONException e) {
                 e.printStackTrace();
             }
-
             new HttpAsyncTask().execute(jsonGuard.toString());
-
         }
     }
 
@@ -381,18 +304,8 @@ public boolean validate() {
             }
         }
 
-        /*if(!mUsernameEdit.getText().equals("demo") && !mUsernameEdit.getText().toString().startsWith("demo") && !mUsernameEdit.getText().equals("Demo") && !mUsernameEdit.getText().toString().startsWith("Demo") && !mUsernameEdit.getText().equals("DEMO") && !mUsernameEdit.getText().toString().startsWith("DEMO")){
-            error = "Guard ID or PIN not valid!";
-        }*/
-
-        //mErrorText.setVisibility(error != null ? View.VISIBLE : View.GONE);
-        /*if (error != null) {
-            mErrorText.setText(error);
-            return false;
-        } else {
-            return true;
-        }*/
         if(mUsernameEdit.getText().equals("demo") || mUsernameEdit.getText().toString().startsWith("demo")){
+            CompanyNameStr = "";
             mErrorText.setVisibility(View.GONE);
             uname = mUsernameEdit.getText().toString().trim().replaceAll("\\s","");
             if(uname.length() == 8){
@@ -418,4 +331,5 @@ public interface ServerEditListener {
         public void serverInfoUpdated();
         public void connectToServer(Server server);
     }
-}
+}
+

app/src/main/res/layout/channel_user_row.xml

@@ -25,8 +25,9 @@
     android:background="?attr/selectableItemBackground">
 
     <FrameLayout
-        android:layout_width="32dp"
-        android:layout_height="32dp">
+        android:id="@+id/eikonitsa"
+        android:layout_width="28dp"
+        android:layout_height="28dp">
 
         <!--<betaqrpttew.CircleImageView-->
             <!--android:id="@+id/user_row_avatar"-->