narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed #410 by removing that config option

Browse source
This commit is contained in:
iNPUTmice 2014-09-02 16:00:03 +02:00
parent 0ae852a633
commit 97b52abaf9
9 changed files with 14 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
res/xml/preferences.xml
View file

@ -60,14 +60,6 @@
android:summary="@string/pref_notification_grace_period_summary"
android:defaultValue="true"/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_ui_options">
<CheckBoxPreference
android:key="use_subject_in_muc"
android:title="@string/pref_conference_name"
android:summary="@string/pref_conference_name_summary"
android:defaultValue="true"/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_advanced_options">
<CheckBoxPreference

5
src/eu/siacs/conversations/entities/Conversation.java
View file

@ -141,9 +141,8 @@ public class Conversation extends AbstractEntity {
this.messages = msgs;
}
public String getName(boolean useSubject) {
if ((getMode() == MODE_MULTI) && (getMucOptions().getSubject() != null)
&& useSubject) {
public String getName() {
if (getMode() == MODE_MULTI && getMucOptions().getSubject() != null) {
return getMucOptions().getSubject();
} else if (getMode() == MODE_MULTI && bookmark != null
&& bookmark.getName() != null) {

4
src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View file

@ -109,7 +109,7 @@ public class ConferenceDetailsActivity extends XmppActivity {
break;
case R.id.action_edit_subject:
if (conversation != null) {
quickEdit(conversation.getName(true), new OnValueEdited() {
quickEdit(conversation.getName(), new OnValueEdited() {
@Override
public void onValueEdited(String value) {
@ -200,7 +200,7 @@ public class ConferenceDetailsActivity extends XmppActivity {
private void populateView() {
mYourPhoto.setImageBitmap(conversation.getAccount().getImage(this, 48));
setTitle(conversation.getName(true));
setTitle(conversation.getName());
mFullJid.setText(conversation.getContactJid().split("/")[0]);
mYourNick.setText(conversation.getMucOptions().getActualNick());
mRoleAffiliaton = (TextView) findViewById(R.id.muc_role);

20
src/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -13,7 +13,6 @@ import eu.siacs.conversations.utils.ExceptionHelper;
import eu.siacs.conversations.utils.UIHelper;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.app.ActionBar;
import android.app.AlertDialog;
@ -23,7 +22,6 @@ import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.IntentSender.SendIntentException;
import android.content.Intent;
import android.content.SharedPreferences;
import android.support.v4.widget.SlidingPaneLayout;
import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener;
import android.view.KeyEvent;
@ -65,8 +63,6 @@ public class ConversationActivity extends XmppActivity {
private ListView listView;
private boolean paneShouldBeOpen = true;
private boolean useSubject = true;
private boolean showLastseen = false;
private ArrayAdapter<Conversation> listAdapter;
private OnConversationUpdate onConvChanged = new OnConversationUpdate() {
@ -182,8 +178,7 @@ public class ConversationActivity extends XmppActivity {
if (ab != null) {
ab.setDisplayHomeAsUpEnabled(true);
ab.setHomeButtonEnabled(true);
ab.setTitle(getSelectedConversation().getName(
useSubject));
ab.setTitle(getSelectedConversation().getName());
}
invalidateOptionsMenu();
if (!getSelectedConversation().isRead()) {
@ -562,10 +557,6 @@ public class ConversationActivity extends XmppActivity {
@Override
public void onStart() {
super.onStart();
SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(this);
this.useSubject = preferences.getBoolean("use_subject_in_muc", true);
this.showLastseen = preferences.getBoolean("show_last_seen", false);
if (this.xmppConnectionServiceBound) {
this.onBackendConnected();
}
@ -741,15 +732,6 @@ public class ConversationActivity extends XmppActivity {
listView.invalidateViews();
}
public boolean showLastseen() {
if (getSelectedConversation() == null) {
return false;
} else {
return this.showLastseen
&& getSelectedConversation().getMode() == Conversation.MODE_SINGLE;
}
}
public void runIntent(PendingIntent pi, int requestCode) {
try {
this.startIntentSenderForResult(pi.getIntentSender(), requestCode,

8
src/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -26,10 +26,8 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentSender;
import android.content.SharedPreferences;
import android.content.IntentSender.SendIntentException;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.text.Editable;
import android.text.Selection;
import android.view.Gravity;
@ -67,7 +65,6 @@ public class ConversationFragment extends Fragment {
private TextView snackbarMessage;
private TextView snackbarAction;
private boolean useSubject = true;
private boolean messagesLoaded = false;
private IntentSender askForPassphraseIntent = null;
@ -301,9 +298,6 @@ public class ConversationFragment extends Fragment {
public void onStart() {
super.onStart();
this.activity = (ConversationActivity) getActivity();
SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(activity);
this.useSubject = preferences.getBoolean("use_subject_in_muc", true);
if (activity.xmppConnectionServiceBound) {
this.onBackendConnected();
}
@ -344,7 +338,7 @@ public class ConversationFragment extends Fragment {
activity.getActionBar().setDisplayHomeAsUpEnabled(true);
activity.getActionBar().setHomeButtonEnabled(true);
activity.getActionBar().setTitle(
conversation.getName(useSubject));
conversation.getName());
activity.invalidateOptionsMenu();
}
}

2
src/eu/siacs/conversations/ui/XmppActivity.java
View file

@ -384,7 +384,7 @@ public abstract class XmppActivity extends Activity {
xmppConnectionService.invite(conversation, contactJid);
}
Log.d(Config.LOGTAG, "inviting " + contactJid + " to "
+ conversation.getName(true));
+ conversation.getName());
}
}

2
src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
View file

@ -51,7 +51,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
}
TextView convName = (TextView) view
.findViewById(R.id.conversation_name);
convName.setText(conv.getName(true));
convName.setText(conv.getName());
TextView convLastMsg = (TextView) view
.findViewById(R.id.conversation_lastmsg);
ImageView imagePreview = (ImageView) view

2
src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -377,7 +377,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
@Override
public void onClick(View v) {
String name = item.getConversation()
.getName(true);
.getName();
String read = getContext()
.getString(
R.string.contact_has_read_up_to_this_point,

11
src/eu/siacs/conversations/utils/UIHelper.java
View file

@ -215,7 +215,7 @@ public class UIHelper {
List<User> members = conversation.getMucOptions().getUsers();
if (members.size() == 0) {
return getUnknownContactPicture(
new String[] { conversation.getName(false) }, size,
new String[] { conversation.getName() }, size,
bgColor, fgColor);
}
ArrayList<String> names = new ArrayList<String>();
@ -332,7 +332,6 @@ public class UIHelper {
SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(context);
boolean useSubject = preferences.getBoolean("use_subject_in_muc", true);
boolean showNofifications = preferences.getBoolean("show_notification",
true);
boolean vibrate = preferences.getBoolean("vibrate_on_notification",
@ -381,7 +380,7 @@ public class UIHelper {
Conversation conversation = unread.get(0);
targetUuid = conversation.getUuid();
mBuilder.setLargeIcon(conversation.getImage(context, 64));
mBuilder.setContentTitle(conversation.getName(useSubject));
mBuilder.setContentTitle(conversation.getName());
if (notify) {
mBuilder.setTicker(conversation.getLatestMessage()
.getReadableBody(context));
@ -413,12 +412,12 @@ public class UIHelper {
for (int i = 0; i < unread.size(); ++i) {
targetUuid = unread.get(i).getUuid();
if (i < unread.size() - 1) {
names.append(unread.get(i).getName(useSubject) + ", ");
names.append(unread.get(i).getName() + ", ");
} else {
names.append(unread.get(i).getName(useSubject));
names.append(unread.get(i).getName());
}
style.addLine(Html.fromHtml("<b>"
+ unread.get(i).getName(useSubject)
+ unread.get(i).getName()
+ "</b> "
+ unread.get(i).getLatestMessage()
.getReadableBody(context)));