Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
32137dc4
Commit
32137dc4
authored
9 years ago
by
Adrien Béraud
Committed by
Guillaume Roguez
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
text messages: don't send if empty
Tuleap: #123 Change-Id: I70af840996fb6f7b78a863a90de39f10eedcb7b2
parent
39e42593
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
+10
-4
10 additions, 4 deletions
...pp/src/main/java/cx/ring/client/ConversationActivity.java
with
10 additions
and
4 deletions
ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
+
10
−
4
View file @
32137dc4
...
@@ -193,8 +193,11 @@ public class ConversationActivity extends AppCompatActivity {
...
@@ -193,8 +193,11 @@ public class ConversationActivity extends AppCompatActivity {
public
boolean
onEditorAction
(
TextView
v
,
int
actionId
,
KeyEvent
event
)
{
public
boolean
onEditorAction
(
TextView
v
,
int
actionId
,
KeyEvent
event
)
{
switch
(
actionId
)
{
switch
(
actionId
)
{
case
EditorInfo
.
IME_ACTION_SEND
:
case
EditorInfo
.
IME_ACTION_SEND
:
CharSequence
txt
=
msgEditTxt
.
getText
();
if
(
txt
.
length
()
>
0
)
{
onSendTextMessage
(
msgEditTxt
.
getText
().
toString
());
onSendTextMessage
(
msgEditTxt
.
getText
().
toString
());
msgEditTxt
.
setText
(
""
);
msgEditTxt
.
setText
(
""
);
}
return
true
;
return
true
;
}
}
return
false
;
return
false
;
...
@@ -204,9 +207,12 @@ public class ConversationActivity extends AppCompatActivity {
...
@@ -204,9 +207,12 @@ public class ConversationActivity extends AppCompatActivity {
msgSendBtn
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
msgSendBtn
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
onSendTextMessage
(
msgEditTxt
.
getText
().
toString
());
CharSequence
txt
=
msgEditTxt
.
getText
();
if
(
txt
.
length
()
>
0
)
{
onSendTextMessage
(
txt
.
toString
());
msgEditTxt
.
setText
(
""
);
msgEditTxt
.
setText
(
""
);
}
}
}
});
});
bottomPane
=
(
ViewGroup
)
findViewById
(
R
.
id
.
ongoingcall_pane
);
bottomPane
=
(
ViewGroup
)
findViewById
(
R
.
id
.
ongoingcall_pane
);
bottomPane
.
setVisibility
(
View
.
GONE
);
bottomPane
.
setVisibility
(
View
.
GONE
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment