sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made muc password dialog hide the password (password field)

This commit is contained in:
iNPUTmice 2014-09-04 11:46:13 +02:00
parent 7a3bc5dc45
commit 9817251ed5
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -138,7 +138,7 @@ public class ConversationFragment extends Fragment {
if (password==null) { if (password==null) {
password = ""; password = "";
} }
activity.quickEdit(password, new OnValueEdited() { activity.quickPasswordEdit(password, new OnValueEdited() {
@Override @Override
public void onValueEdited(String value) { public void onValueEdited(String value) {

37
src/eu/siacs/conversations/ui/XmppActivity.java
View File

@ -33,6 +33,7 @@ import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.text.InputType;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
@ -56,7 +57,7 @@ public abstract class XmppActivity extends Activity {
protected int mPrimaryColor; protected int mPrimaryColor;
private DisplayMetrics metrics; private DisplayMetrics metrics;
protected interface OnValueEdited { protected interface OnValueEdited {
public void onValueEdited(String value); public void onValueEdited(String value);
} }
@ -297,16 +298,22 @@ public abstract class XmppActivity extends Activity {
builder.create().show(); builder.create().show();
} }
protected void quickEdit(final String previousValue, protected void quickEdit(String previousValue, OnValueEdited callback) {
final OnValueEdited callback) { quickEdit(previousValue, callback, false);
}
protected void quickPasswordEdit(String previousValue,
OnValueEdited callback) {
quickEdit(previousValue, callback, true);
}
private void quickEdit(final String previousValue,
final OnValueEdited callback, boolean password) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = (View) getLayoutInflater() View view = (View) getLayoutInflater()
.inflate(R.layout.quickedit, null); .inflate(R.layout.quickedit, null);
final EditText editor = (EditText) view.findViewById(R.id.editor); final EditText editor = (EditText) view.findViewById(R.id.editor);
editor.setText(previousValue); OnClickListener mClickListener = new OnClickListener() {
builder.setView(view);
builder.setNegativeButton(R.string.cancel, null);
builder.setPositiveButton(R.string.edit, new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
@ -315,7 +322,19 @@ public abstract class XmppActivity extends Activity {
callback.onValueEdited(value); callback.onValueEdited(value);
} }
} }
}); };
if (password) {
editor.setInputType(InputType.TYPE_CLASS_TEXT
| InputType.TYPE_TEXT_VARIATION_PASSWORD);
editor.setHint(R.string.password);
builder.setPositiveButton(R.string.accept, mClickListener);
} else {
builder.setPositiveButton(R.string.edit, mClickListener);
}
editor.requestFocus();
editor.setText(previousValue);
builder.setView(view);
builder.setNegativeButton(R.string.cancel, null);
builder.create().show(); builder.create().show();
} }
@ -403,7 +422,7 @@ public abstract class XmppActivity extends Activity {
public int getPrimaryColor() { public int getPrimaryColor() {
return this.mPrimaryColor; return this.mPrimaryColor;
} }
class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> { class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
private final WeakReference<ImageView> imageViewReference; private final WeakReference<ImageView> imageViewReference;
private Message message = null; private Message message = null;