Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Silence
Silence-Android
Commits
0579585b
Commit
0579585b
authored
Feb 16, 2016
by
Bastien Le Querrec
Browse files
use generic class names
parent
3ea4f508
Changes
5
Hide whitespace changes
Inline
Side-by-side
AndroidManifest.xml
View file @
0579585b
...
...
@@ -167,7 +167,7 @@
android:windowSoftInputMode=
"stateAlwaysVisible"
android:configChanges=
"touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
/>
<activity
android:name=
".
Push
ContactSelectionActivity"
<activity
android:name=
".
Group
ContactSelectionActivity"
android:label=
"@string/AndroidManifest__select_contacts"
android:windowSoftInputMode=
"stateHidden"
android:configChanges=
"touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
/>
...
...
res/layout/group_create_activity.xml
View file @
0579585b
...
...
@@ -6,7 +6,7 @@
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<org.smssecure.smssecure.components.
Push
RecipientsPanel
android:id=
"@+id/recipients"
<org.smssecure.smssecure.components.
Group
RecipientsPanel
android:id=
"@+id/recipients"
android:layout_width=
"fill_parent"
android:layout_height=
"wrap_content"
android:paddingLeft=
"15dp"
...
...
src/org/smssecure/smssecure/
Push
ContactSelectionActivity.java
→
src/org/smssecure/smssecure/
Group
ContactSelectionActivity.java
View file @
0579585b
...
...
@@ -39,9 +39,9 @@ import java.util.List;
* @author Moxie Marlinspike
*
*/
public
class
Push
ContactSelectionActivity
extends
ContactSelectionActivity
{
public
class
Group
ContactSelectionActivity
extends
ContactSelectionActivity
{
private
final
static
String
TAG
=
Push
ContactSelectionActivity
.
class
.
getSimpleName
();
private
final
static
String
TAG
=
Group
ContactSelectionActivity
.
class
.
getSimpleName
();
@Override
protected
void
onCreate
(
Bundle
icicle
,
@NonNull
MasterSecret
masterSecret
)
{
...
...
src/org/smssecure/smssecure/GroupCreateActivity.java
View file @
0579585b
...
...
@@ -32,7 +32,7 @@ import android.view.View;
import
android.widget.ListView
;
import
android.widget.Toast
;
import
org.smssecure.smssecure.components.
Push
RecipientsPanel
;
import
org.smssecure.smssecure.components.
Group
RecipientsPanel
;
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
Push
RecipientsPanel
recipientsPanel
;
private
Group
RecipientsPanel
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
=
(
Push
RecipientsPanel
)
findViewById
(
R
.
id
.
recipients
);
recipientsPanel
=
(
Group
RecipientsPanel
)
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
Push
RecipientsPanel
.
RecipientsPanelChangedListener
()
{
recipientsPanel
.
setPanelChangeListener
(
new
Group
RecipientsPanel
.
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
,
Push
ContactSelectionActivity
.
class
);
Intent
intent
=
new
Intent
(
GroupCreateActivity
.
this
,
Group
ContactSelectionActivity
.
class
);
startActivityForResult
(
intent
,
PICK_CONTACT
);
}
}
...
...
src/org/smssecure/smssecure/components/
Push
RecipientsPanel.java
→
src/org/smssecure/smssecure/components/
Group
RecipientsPanel.java
View file @
0579585b
...
...
@@ -50,8 +50,8 @@ import java.util.Set;
*
* @author Moxie Marlinspike
*/
public
class
Push
RecipientsPanel
extends
RelativeLayout
implements
RecipientsModifiedListener
{
private
final
String
TAG
=
Push
RecipientsPanel
.
class
.
getSimpleName
();
public
class
Group
RecipientsPanel
extends
RelativeLayout
implements
RecipientsModifiedListener
{
private
final
String
TAG
=
Group
RecipientsPanel
.
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
Push
RecipientsPanel
(
Context
context
)
{
public
Group
RecipientsPanel
(
Context
context
)
{
super
(
context
);
initialize
();
}
public
Push
RecipientsPanel
(
Context
context
,
AttributeSet
attrs
)
{
public
Group
RecipientsPanel
(
Context
context
,
AttributeSet
attrs
)
{
super
(
context
,
attrs
);
initialize
();
}
public
Push
RecipientsPanel
(
Context
context
,
AttributeSet
attrs
,
int
defStyle
)
{
public
Group
RecipientsPanel
(
Context
context
,
AttributeSet
attrs
,
int
defStyle
)
{
super
(
context
,
attrs
,
defStyle
);
initialize
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment