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
3ee5a99c
Commit
3ee5a99c
authored
Dec 11, 2015
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
ui: show activity when accepting call
Tuleap: #178 Change-Id: I3c3c65ad965644c00ce80b3edaef4b7aa1a66a14
parent
6c4cedba
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ring-android/app/src/main/java/cx/ring/model/Conference.java
+7
-3
7 additions, 3 deletions
ring-android/app/src/main/java/cx/ring/model/Conference.java
ring-android/app/src/main/java/cx/ring/service/LocalService.java
+3
-0
3 additions, 0 deletions
...droid/app/src/main/java/cx/ring/service/LocalService.java
with
10 additions
and
3 deletions
ring-android/app/src/main/java/cx/ring/model/Conference.java
+
7
−
3
View file @
3ee5a99c
...
@@ -251,6 +251,12 @@ public class Conference {
...
@@ -251,6 +251,12 @@ public class Conference {
messages
.
add
(
sipMessage
);
messages
.
add
(
sipMessage
);
}
}
public
Intent
getViewIntent
(
Context
ctx
)
{
final
Uri
conf_uri
=
Uri
.
withAppendedPath
(
CONTENT_URI
,
getId
());
return
new
Intent
(
Intent
.
ACTION_VIEW
).
setData
(
conf_uri
).
setClass
(
ctx
,
CallActivity
.
class
);
}
public
void
showCallNotification
(
Context
ctx
)
public
void
showCallNotification
(
Context
ctx
)
{
{
NotificationManagerCompat
notificationManager
=
NotificationManagerCompat
.
from
(
ctx
);
NotificationManagerCompat
notificationManager
=
NotificationManagerCompat
.
from
(
ctx
);
...
@@ -260,11 +266,9 @@ public class Conference {
...
@@ -260,11 +266,9 @@ public class Conference {
return
;
return
;
SipCall
call
=
getParticipants
().
get
(
0
);
SipCall
call
=
getParticipants
().
get
(
0
);
CallContact
contact
=
call
.
getContact
();
CallContact
contact
=
call
.
getContact
();
final
Uri
conf_uri
=
Uri
.
withAppendedPath
(
CONTENT_URI
,
getId
());
final
Uri
call_uri
=
Uri
.
withAppendedPath
(
SipCall
.
CONTENT_URI
,
call
.
getCallId
());
final
Uri
call_uri
=
Uri
.
withAppendedPath
(
SipCall
.
CONTENT_URI
,
call
.
getCallId
());
PendingIntent
goto_intent
=
PendingIntent
.
getActivity
(
ctx
,
new
Random
().
nextInt
(),
PendingIntent
goto_intent
=
PendingIntent
.
getActivity
(
ctx
,
new
Random
().
nextInt
(),
new
Intent
(
Intent
.
ACTION_VIEW
).
setData
(
conf_uri
).
setClass
(
ctx
,
CallActivity
.
class
),
getViewIntent
(
ctx
),
PendingIntent
.
FLAG_ONE_SHOT
);
PendingIntent
.
FLAG_ONE_SHOT
);
NotificationCompat
.
Builder
noti
=
new
NotificationCompat
.
Builder
(
ctx
);
NotificationCompat
.
Builder
noti
=
new
NotificationCompat
.
Builder
(
ctx
);
if
(
isOnGoing
())
{
if
(
isOnGoing
())
{
...
...
This diff is collapsed.
Click to expand it.
ring-android/app/src/main/java/cx/ring/service/LocalService.java
+
3
−
0
View file @
3ee5a99c
...
@@ -1140,6 +1140,9 @@ public class LocalService extends Service implements SharedPreferences.OnSharedP
...
@@ -1140,6 +1140,9 @@ public class LocalService extends Service implements SharedPreferences.OnSharedP
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
updateAudioState
();
updateAudioState
();
Conference
conf
=
getConference
(
call_id
);
if
(!
conf
.
mVisible
)
startActivity
(
conf
.
getViewIntent
(
LocalService
.
this
).
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
));
break
;
break
;
}
}
case
ACTION_CALL_REFUSE:
{
case
ACTION_CALL_REFUSE:
{
...
...
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