Commit 0579585b authored by Bastien Le Querrec's avatar Bastien Le Querrec

use generic class names

parent 3ea4f508
......@@ -167,7 +167,7 @@
android:windowSoftInputMode="stateAlwaysVisible"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".PushContactSelectionActivity"
<activity android:name=".GroupContactSelectionActivity"
android:label="@string/AndroidManifest__select_contacts"
android:windowSoftInputMode="stateHidden"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
......
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<org.smssecure.smssecure.components.PushRecipientsPanel android:id="@+id/recipients"
<org.smssecure.smssecure.components.GroupRecipientsPanel android:id="@+id/recipients"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="15dp"
......
......@@ -39,9 +39,9 @@ import java.util.List;
* @author Moxie Marlinspike
*
*/
public class PushContactSelectionActivity extends ContactSelectionActivity {
public class GroupContactSelectionActivity extends ContactSelectionActivity {
private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
private final static String TAG = GroupContactSelectionActivity.class.getSimpleName();
@Override
protected void onCreate(Bundle icicle, @NonNull MasterSecret masterSecret) {
......
......@@ -32,7 +32,7 @@ import android.view.View;
import android.widget.ListView;
import android.widget.Toast;
import org.smssecure.smssecure.components.PushRecipientsPanel;
import org.smssecure.smssecure.components.GroupRecipientsPanel;
import org.smssecure.smssecure.contacts.RecipientsEditor;
import org.smssecure.smssecure.crypto.MasterSecret;
import org.smssecure.smssecure.database.DatabaseFactory;
......@@ -77,7 +77,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity {
public static final int AVATAR_SIZE = 210;
private ListView lv;
private PushRecipientsPanel recipientsPanel;
private GroupRecipientsPanel recipientsPanel;
private Recipient groupRecipient = null;
private long groupThread = -1;
......@@ -129,7 +129,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity {
private void initializeResources() {
lv = (ListView) findViewById(R.id.selected_contacts_list);
recipientsPanel = (PushRecipientsPanel) findViewById(R.id.recipients);
recipientsPanel = (GroupRecipientsPanel) findViewById(R.id.recipients);
SelectedRecipientsAdapter adapter = new SelectedRecipientsAdapter(this, android.R.id.text1, new ArrayList<SelectedRecipientsAdapter.RecipientWrapper>());
adapter.setOnRecipientDeletedListener(new SelectedRecipientsAdapter.OnRecipientDeletedListener() {
......@@ -140,7 +140,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity {
});
lv.setAdapter(adapter);
recipientsPanel.setPanelChangeListener(new PushRecipientsPanel.RecipientsPanelChangedListener() {
recipientsPanel.setPanelChangeListener(new GroupRecipientsPanel.RecipientsPanelChangedListener() {
@Override
public void onRecipientsPanelUpdate(Recipients recipients) {
Log.i(TAG, "onRecipientsPanelUpdate received.");
......@@ -223,7 +223,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity {
private class AddRecipientButtonListener implements View.OnClickListener {
@Override
public void onClick(View v) {
Intent intent = new Intent(GroupCreateActivity.this, PushContactSelectionActivity.class);
Intent intent = new Intent(GroupCreateActivity.this, GroupContactSelectionActivity.class);
startActivityForResult(intent, PICK_CONTACT);
}
}
......
......@@ -50,8 +50,8 @@ import java.util.Set;
*
* @author Moxie Marlinspike
*/
public class PushRecipientsPanel extends RelativeLayout implements RecipientsModifiedListener {
private final String TAG = PushRecipientsPanel.class.getSimpleName();
public class GroupRecipientsPanel extends RelativeLayout implements RecipientsModifiedListener {
private final String TAG = GroupRecipientsPanel.class.getSimpleName();
private RecipientsPanelChangedListener panelChangeListener;
private RecipientsEditor recipientsText;
......@@ -59,17 +59,17 @@ public class PushRecipientsPanel extends RelativeLayout implements RecipientsMod
private static final int RECIPIENTS_MAX_LENGTH = 312;
public PushRecipientsPanel(Context context) {
public GroupRecipientsPanel(Context context) {
super(context);
initialize();
}
public PushRecipientsPanel(Context context, AttributeSet attrs) {
public GroupRecipientsPanel(Context context, AttributeSet attrs) {
super(context, attrs);
initialize();
}
public PushRecipientsPanel(Context context, AttributeSet attrs, int defStyle) {
public GroupRecipientsPanel(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
initialize();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment