From 427bdd3d6dd7fcf4f53dbe8dac305f6f91a59229 Mon Sep 17 00:00:00 2001 From: Theo-Chamalis Date: Sat, 21 Feb 2015 12:02:35 +0200 Subject: [PATCH] Implemented automatic insertion of demo users in demo channel, and paid users in their own private channels after they have been registered to that channel by our company. Also made many graphical improvements in the in-channel layouts. --- app/build.gradle | 6 +- .../qrpttbeta/app/QRPushToTalkActivity.java | 18 + .../qrpttbeta/channel/ChannelListAdapter.java | 347 +++++++++++++----- .../qrpttbeta/servers/ServerEditFragment.java | 102 +---- app/src/main/res/layout/channel_user_row.xml | 5 +- 5 files changed, 291 insertions(+), 187 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ce1df535..42c1cc2d 100755 --- a/app/build.gradle +++ b/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" } diff --git a/app/src/main/java/com/terracom/qrpttbeta/app/QRPushToTalkActivity.java b/app/src/main/java/com/terracom/qrpttbeta/app/QRPushToTalkActivity.java index 85125135..99a965cb 100755 --- a/app/src/main/java/com/terracom/qrpttbeta/app/QRPushToTalkActivity.java +++ b/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); } diff --git a/app/src/main/java/com/terracom/qrpttbeta/channel/ChannelListAdapter.java b/app/src/main/java/com/terracom/qrpttbeta/channel/ChannelListAdapter.java index acd9d123..5e3b5696 100755 --- a/app/src/main/java/com/terracom/qrpttbeta/channel/ChannelListAdapter.java +++ b/app/src/main/java/com/terracom/qrpttbeta/channel/ChannelListAdapter.java @@ -25,11 +25,11 @@ import android.os.RemoteException; import android.support.v7.widget.RecyclerView; import android.util.DisplayMetrics; -import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -38,6 +38,7 @@ import com.terracom.jumble.model.Channel; import com.terracom.jumble.model.User; import com.terracom.qrpttbeta.R; +import com.terracom.qrpttbeta.app.QRPushToTalkActivity; import com.terracom.qrpttbeta.db.QRPushToTalkDatabase; import com.terracom.qrpttbeta.drawable.CircleDrawable; import com.terracom.qrpttbeta.drawable.FlipDrawable; @@ -54,6 +55,7 @@ public class ChannelListAdapter extends RecyclerView.Adapter { // Set particular bits to make the integer-based model item ids unique. public static final long CHANNEL_ID_MASK = (0x1L << 32); public static final long USER_ID_MASK = (0x1L << 33); + String nameOfChannel = QRPushToTalkActivity.nameOfSavedLastLoggedChannel; /** * Time (in ms) to run the flip animation for. @@ -65,7 +67,6 @@ public class ChannelListAdapter extends RecyclerView.Adapter { private QRPushToTalkDatabase mDatabase; private List mRootChannels; private List mNodes; - public static Channel TempoChannel; /** * A mapping of user-set channel expansions. * If a key is not mapped, default to hiding empty channels. @@ -110,111 +111,277 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewT public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { final Node node = mNodes.get(position); - if(node.isChannel() && !node.getChannel().getName().equals("Demo Channel") && !node.getChannel().getName().equals("QR-PushToTalk Server")){ - - final Channel channel = node.getChannel(); - ChannelViewHolder cvh = (ChannelViewHolder) viewHolder; - cvh.mChannelExpandToggle.setVisibility(View.INVISIBLE); - cvh.mChannelName.setText(""); - cvh.mChannelUserCount.setText(""); - try { - updateChannels(); // FIXME: very inefficient. - } catch (RemoteException e) { - e.printStackTrace(); - } + if(!nameOfChannel.equals("")){ + if(node.isChannel() && !node.getChannel().getName().equals(nameOfChannel) && !node.getChannel().getName().equals("QR-PushToTalk Server")){ - } else if(node.isUser() && !node.getParent().getChannel().getName().equals("Demo Channel")){ + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + ChannelViewHolder cvh = (ChannelViewHolder) viewHolder; + cvh.mChannelExpandToggle.setVisibility(View.GONE); + cvh.mChannelName.setText(""); + cvh.mChannelName.setVisibility(View.GONE); + cvh.mChannelUserCount.setText(""); + cvh.mChannelUserCount.setVisibility(View.GONE); + cvh.mChannelHolder.setVisibility(View.GONE); + cvh.itemView.setVisibility(View.GONE); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } - final User user = node.getUser(); - UserViewHolder uvh = (UserViewHolder) viewHolder; - uvh.mUserName.setText(""); - uvh.mUserTalkHighlight.setVisibility(View.INVISIBLE); - try { - updateChannels(); // FIXME: very inefficient. - } catch (RemoteException e) { - e.printStackTrace(); - } + } else if(node.isUser() && !node.getParent().getChannel().getName().equals(nameOfChannel)){ - } - else if (node.isChannel()) { - final Channel channel = node.getChannel(); - ChannelViewHolder cvh = (ChannelViewHolder) viewHolder; - cvh.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mChannelClickListener != null) { - mChannelClickListener.onChannelClick(channel); - } + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); } - }); - - final boolean expandUsable = channel.getSubchannels().size() > 0 || - channel.getSubchannelUserCount() > 0; - cvh.mChannelExpandToggle.setImageResource(node.isExpanded() ? - R.drawable.ic_action_expanded : R.drawable.ic_action_collapsed); - cvh.mChannelExpandToggle.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - mExpandedChannels.put(channel.getId(), !node.isExpanded()); - try { - updateChannels(); // FIXME: very inefficient. - } catch (RemoteException e) { - e.printStackTrace(); + UserViewHolder uvh = (UserViewHolder) viewHolder; + uvh.mUserName.setText(""); + uvh.mUserName.setVisibility(View.GONE); + uvh.mUserTalkHighlight.setVisibility(View.GONE); + uvh.mPicofMic.setVisibility(View.GONE); + uvh.mUserHolder.setVisibility(View.GONE); + uvh.itemView.setVisibility(View.GONE); + + // Pad the view depending on channel's nested level. + DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); + float margin = (node.getDepth() + 1) * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics); + uvh.mUserHolder.setPadding((int) margin,0,uvh.mUserHolder.getPaddingRight(),0); + + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + } + else if (node.isChannel() ) { + final Channel channel = node.getChannel(); + ChannelViewHolder cvh = (ChannelViewHolder) viewHolder; + cvh.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mChannelClickListener != null) { + mChannelClickListener.onChannelClick(channel); + } } - notifyDataSetChanged(); + }); + + final boolean expandUsable = channel.getSubchannels().size() > 0 || + channel.getSubchannelUserCount() > 0; + cvh.mChannelExpandToggle.setImageResource(node.isExpanded() ? + R.drawable.ic_action_expanded : R.drawable.ic_action_collapsed); + cvh.mChannelExpandToggle.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + mExpandedChannels.put(channel.getId(), !node.isExpanded()); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + notifyDataSetChanged(); + } + }); + // Dim channel expand toggle when no subchannels exist + cvh.mChannelExpandToggle.setEnabled(expandUsable); + cvh.mChannelExpandToggle.setVisibility(expandUsable ? View.VISIBLE : View.INVISIBLE); + + cvh.mChannelName.setText(channel.getName()); + + int userCount = channel.getSubchannelUserCount(); + if(node.getChannel().getName().equals("QR-PushToTalk Server")) + cvh.mChannelUserCount.setText(""); + else{ + cvh.mChannelUserCount.setText(String.format("%d", userCount)); } - }); - // Dim channel expand toggle when no subchannels exist - cvh.mChannelExpandToggle.setEnabled(expandUsable); - cvh.mChannelExpandToggle.setVisibility(expandUsable ? View.VISIBLE : View.INVISIBLE); - cvh.mChannelName.setText(channel.getName()); + // Pad the view depending on channel's nested level. + DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); + float margin = node.getDepth() * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics); + cvh.mChannelHolder.setPadding((int) margin, + cvh.mChannelHolder.getPaddingTop(), + cvh.mChannelHolder.getPaddingRight(), + cvh.mChannelHolder.getPaddingBottom()); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + } else if (node.isUser()) { + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + final User user = node.getUser(); + UserViewHolder uvh = (UserViewHolder) viewHolder; + uvh.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mUserClickListener != null) { + mUserClickListener.onUserClick(user); + } + } + }); + + uvh.mUserName.setText(user.getName()); + try { + uvh.mUserName.setTypeface(null, user.getSession() == mService.getSession() ? Typeface.BOLD : Typeface.NORMAL); + } catch (RemoteException e) { + e.printStackTrace(); + } - int userCount = channel.getSubchannelUserCount(); - if(node.getChannel().getName().equals("QR-PushToTalk Server")) + uvh.mUserTalkHighlight.setImageDrawable(getTalkStateDrawable(user)); + + // Pad the view depending on channel's nested level. + DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); + float margin = (node.getDepth() + 1) * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics); + uvh.mUserHolder.setPadding((int) margin, + uvh.mUserHolder.getPaddingTop(), + uvh.mUserHolder.getPaddingRight(), + uvh.mUserHolder.getPaddingBottom()); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + } + }else{ + if(node.isChannel() && !node.getChannel().getName().equals("Demo Channel") && !node.getChannel().getName().equals("QR-PushToTalk Server")){ + ChannelViewHolder cvh = (ChannelViewHolder) viewHolder; + cvh.mChannelExpandToggle.setVisibility(View.GONE); + cvh.mChannelName.setText(""); + cvh.mChannelName.setVisibility(View.GONE); cvh.mChannelUserCount.setText(""); - else{ - cvh.mChannelUserCount.setText(String.format("%d", userCount)); + cvh.mChannelUserCount.setVisibility(View.GONE); + cvh.mChannelHolder.setVisibility(View.GONE); + cvh.itemView.setVisibility(View.GONE); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + + } else if(node.isUser() && !node.getParent().getChannel().getName().equals("Demo Channel")){ + UserViewHolder uvh = (UserViewHolder) viewHolder; + uvh.mUserName.setText(""); + uvh.mUserName.setVisibility(View.GONE); + uvh.mUserTalkHighlight.setVisibility(View.GONE); + uvh.mPicofMic.setVisibility(View.GONE); + uvh.mUserHolder.setVisibility(View.GONE); + uvh.itemView.setVisibility(View.GONE); + + // Pad the view depending on channel's nested level. + DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); + float margin = (node.getDepth() + 1) * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics); + uvh.mUserHolder.setPadding((int) margin, + uvh.mUserHolder.getPaddingTop(), + uvh.mUserHolder.getPaddingRight(), + uvh.mUserHolder.getPaddingBottom()); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } } + else if (node.isChannel()) { + final Channel channel = node.getChannel(); + ChannelViewHolder cvh = (ChannelViewHolder) viewHolder; + cvh.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mChannelClickListener != null) { + mChannelClickListener.onChannelClick(channel); + } + } + }); + + final boolean expandUsable = channel.getSubchannels().size() > 0 || + channel.getSubchannelUserCount() > 0; + cvh.mChannelExpandToggle.setImageResource(node.isExpanded() ? + R.drawable.ic_action_expanded : R.drawable.ic_action_collapsed); + cvh.mChannelExpandToggle.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + mExpandedChannels.put(channel.getId(), !node.isExpanded()); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + notifyDataSetChanged(); + } + }); + // Dim channel expand toggle when no subchannels exist + cvh.mChannelExpandToggle.setEnabled(expandUsable); + cvh.mChannelExpandToggle.setVisibility(expandUsable ? View.VISIBLE : View.INVISIBLE); + + cvh.mChannelName.setText(channel.getName()); + + int userCount = channel.getSubchannelUserCount(); + if(node.getChannel().getName().equals("QR-PushToTalk Server")) + cvh.mChannelUserCount.setText(""); + else{ + cvh.mChannelUserCount.setText(String.format("%d", userCount)); + } - // Pad the view depending on channel's nested level. - DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); - float margin = node.getDepth() * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics); - cvh.mChannelHolder.setPadding((int) margin, - cvh.mChannelHolder.getPaddingTop(), - cvh.mChannelHolder.getPaddingRight(), - cvh.mChannelHolder.getPaddingBottom()); - } else if (node.isUser() ) { - final User user = node.getUser(); - UserViewHolder uvh = (UserViewHolder) viewHolder; - uvh.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mUserClickListener != null) { - mUserClickListener.onUserClick(user); + // Pad the view depending on channel's nested level. + DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); + float margin = node.getDepth() * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics); + cvh.mChannelHolder.setPadding((int) margin, + cvh.mChannelHolder.getPaddingTop(), + cvh.mChannelHolder.getPaddingRight(), + cvh.mChannelHolder.getPaddingBottom()); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } + } else if (node.isUser() ) { + final User user = node.getUser(); + UserViewHolder uvh = (UserViewHolder) viewHolder; + uvh.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mUserClickListener != null) { + mUserClickListener.onUserClick(user); + } } + }); + + uvh.mUserName.setText(user.getName()); + try { + uvh.mUserName.setTypeface(null, user.getSession() == mService.getSession() ? Typeface.BOLD : Typeface.NORMAL); + } catch (RemoteException e) { + e.printStackTrace(); } - }); - uvh.mUserName.setText(user.getName()); - try { - uvh.mUserName.setTypeface(null, user.getSession() == mService.getSession() ? Typeface.BOLD : Typeface.NORMAL); - } catch (RemoteException e) { - e.printStackTrace(); + uvh.mUserTalkHighlight.setImageDrawable(getTalkStateDrawable(user)); + + // Pad the view depending on channel's nested level. + DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); + float margin = (node.getDepth() + 1) * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics); + uvh.mUserHolder.setPadding((int) margin, + uvh.mUserHolder.getPaddingTop(), + uvh.mUserHolder.getPaddingRight(), + uvh.mUserHolder.getPaddingBottom()); + try { + updateChannels(); // FIXME: very inefficient. + } catch (RemoteException e) { + e.printStackTrace(); + } } + } - uvh.mUserTalkHighlight.setImageDrawable(getTalkStateDrawable(user)); - // Pad the view depending on channel's nested level. - DisplayMetrics metrics = mContext.getResources().getDisplayMetrics(); - float margin = (node.getDepth() + 1) * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics); - uvh.mUserHolder.setPadding((int) margin, - uvh.mUserHolder.getPaddingTop(), - uvh.mUserHolder.getPaddingRight(), - uvh.mUserHolder.getPaddingBottom()); - } } @Override @@ -383,11 +550,13 @@ public void setService(IJumbleService service) throws RemoteException { private static class UserViewHolder extends RecyclerView.ViewHolder { public LinearLayout mUserHolder; public TextView mUserName; + public FrameLayout mPicofMic; // public ImageView mUserAvatar; public ImageView mUserTalkHighlight; public UserViewHolder(View itemView) { super(itemView); + mPicofMic = (FrameLayout) itemView.findViewById(R.id.eikonitsa); mUserHolder = (LinearLayout) itemView.findViewById(R.id.user_row_title); mUserTalkHighlight = (ImageView) itemView.findViewById(R.id.user_row_talk_highlight); diff --git a/app/src/main/java/com/terracom/qrpttbeta/servers/ServerEditFragment.java b/app/src/main/java/com/terracom/qrpttbeta/servers/ServerEditFragment.java index d3ceacd5..ce625b6f 100755 --- a/app/src/main/java/com/terracom/qrpttbeta/servers/ServerEditFragment.java +++ b/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; @@ -106,7 +48,7 @@ public class ServerEditFragment extends DialogFragment { public String resultFromWebService = "Tipotadenmphkeakoma"; 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); + }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); } -} \ No newline at end of file +} + diff --git a/app/src/main/res/layout/channel_user_row.xml b/app/src/main/res/layout/channel_user_row.xml index a18be00c..3f0a9a70 100755 --- a/app/src/main/res/layout/channel_user_row.xml +++ b/app/src/main/res/layout/channel_user_row.xml @@ -25,8 +25,9 @@ android:background="?attr/selectableItemBackground"> + android:id="@+id/eikonitsa" + android:layout_width="28dp" + android:layout_height="28dp">