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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
1f3a3ab6
Commit
1f3a3ab6
authored
9 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
support opening ring URIs
Change-Id: Ie2b41d5071aaf4c3baf46d92afe93214030d43e7
parent
6408ad92
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ring-android/app/src/main/AndroidManifest.xml
+117
-25
117 additions, 25 deletions
ring-android/app/src/main/AndroidManifest.xml
ring-android/app/src/main/java/cx/ring/fragments/CallListFragment.java
+12
-0
12 additions, 0 deletions
...app/src/main/java/cx/ring/fragments/CallListFragment.java
with
129 additions
and
25 deletions
ring-android/app/src/main/AndroidManifest.xml
+
117
−
25
View file @
1f3a3ab6
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
<!--
Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
...
@@ -16,8 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...
@@ -16,8 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
along with this program. If not, see <http://www.gnu.org/licenses/>.
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
-->
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"cx.ring"
package=
"cx.ring"
...
@@ -42,7 +40,6 @@ along with this program; if not, write to the Free Software
...
@@ -42,7 +40,6 @@ along with this program; if not, write to the Free Software
<uses-permission
android:name=
"android.permission.PROCESS_OUTGOING_CALLS"
/>
<uses-permission
android:name=
"android.permission.PROCESS_OUTGOING_CALLS"
/>
<uses-permission
android:name=
"android.permission.CALL_PHONE"
/>
<uses-permission
android:name=
"android.permission.CALL_PHONE"
/>
<uses-permission
android:name=
"android.permission.RECEIVE_BOOT_COMPLETED"
/>
<uses-permission
android:name=
"android.permission.RECEIVE_BOOT_COMPLETED"
/>
<uses-permission
android:name=
"android.permission.READ_PHONE_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_WIFI_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_WIFI_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.READ_CONTACTS"
/>
<uses-permission
android:name=
"android.permission.READ_CONTACTS"
/>
...
@@ -50,14 +47,11 @@ along with this program; if not, write to the Free Software
...
@@ -50,14 +47,11 @@ along with this program; if not, write to the Free Software
<uses-permission
android:name=
"android.permission.BLUETOOTH"
/>
<uses-permission
android:name=
"android.permission.BLUETOOTH"
/>
<uses-permission
android:name=
"android.permission.VIBRATE"
/>
<uses-permission
android:name=
"android.permission.VIBRATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_COARSE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_COARSE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.READ_CALL_LOG"
/>
<uses-permission
android:name=
"android.permission.WRITE_CALL_LOG"
/>
<uses-permission
android:name=
"android.permission.WRITE_CALL_LOG"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.READ_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.READ_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<uses-permission
android:name=
"android.permission.READ_LOGS"
/>
<uses-permission
android:name=
"android.permission.USE_SIP"
/>
<uses-permission
android:name=
"android.permission.GET_TASKS"
/>
<uses-permission
android:name=
"android.permission.CHANGE_WIFI_STATE"
/>
<uses-feature
<uses-feature
android:name=
"android.hardware.wifi"
android:name=
"android.hardware.wifi"
...
@@ -77,9 +71,9 @@ along with this program; if not, write to the Free Software
...
@@ -77,9 +71,9 @@ along with this program; if not, write to the Free Software
<application
<application
android:allowBackup=
"true"
android:allowBackup=
"true"
android:supportsRtl=
"true"
android:icon=
"@drawable/ic_launcher"
android:icon=
"@drawable/ic_launcher"
android:label=
"@string/app_name"
>
android:label=
"@string/app_name"
android:supportsRtl=
"true"
>
<activity
<activity
android:name=
".client.HomeActivity"
android:name=
".client.HomeActivity"
android:label=
"@string/title_activity_sflphone_home"
android:label=
"@string/title_activity_sflphone_home"
...
@@ -88,8 +82,62 @@ along with this program; if not, write to the Free Software
...
@@ -88,8 +82,62 @@ along with this program; if not, write to the Free Software
android:windowSoftInputMode=
"adjustPan"
>
android:windowSoftInputMode=
"adjustPan"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.DIAL"
/>
<action
android:name=
"android.intent.action.VIEW"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:scheme=
"sip"
/>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.DIAL"
/>
<action
android:name=
"android.intent.action.VIEW"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:scheme=
"tel"
/>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.VIEW"
/>
<action
android:name=
"android.intent.action.DIAL"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:host=
"ring.cx"
android:pathPrefix=
"/id/"
android:scheme=
"https"
/>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.VIEW"
/>
<action
android:name=
"android.intent.action.DIAL"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:host=
"ring.cx"
android:pathPrefix=
"/id/"
android:scheme=
"http"
/>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.DIAL"
/>
<action
android:name=
"android.intent.action.VIEW"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:scheme=
"ring"
/>
</intent-filter>
</activity>
</activity>
<activity
<activity
android:name=
".client.AccountWizard"
android:name=
".client.AccountWizard"
...
@@ -104,16 +152,23 @@ along with this program; if not, write to the Free Software
...
@@ -104,16 +152,23 @@ along with this program; if not, write to the Free Software
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:screenOrientation=
"portrait"
android:screenOrientation=
"portrait"
android:theme=
"@style/AppThemeWithoutOverlayCompatNoShadow"
/>
android:theme=
"@style/AppThemeWithoutOverlayCompatNoShadow"
/>
<activity
<activity
android:name=
".client.NewConversationActivity"
android:theme=
"@style/AppThemeWithoutOverlay"
android:label=
"@string/app_name"
>
android:name=
".client.NewConversationActivity"
</activity>
android:label=
"@string/app_name"
android:theme=
"@style/AppThemeWithoutOverlay"
/>
<receiver
android:name=
".service.OutgoingCallHandler"
>
<receiver
android:name=
".service.OutgoingCallHandler"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.NEW_OUTGOING_CALL"
/>
<action
android:name=
"android.intent.action.NEW_OUTGOING_CALL"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
</intent-filter>
</intent-filter>
</receiver>
</receiver>
<receiver
android:name=
".service.BootReceiver"
>
<intent-filter>
<action
android:name=
"android.intent.action.BOOT_COMPLETED"
/>
</intent-filter>
</receiver>
<activity
<activity
android:name=
".client.CallActivity"
android:name=
".client.CallActivity"
...
@@ -121,17 +176,54 @@ along with this program; if not, write to the Free Software
...
@@ -121,17 +176,54 @@ along with this program; if not, write to the Free Software
android:screenOrientation=
"portrait"
android:screenOrientation=
"portrait"
android:theme=
"@style/AppThemeWithoutOverlayCompat"
android:theme=
"@style/AppThemeWithoutOverlayCompat"
android:windowSoftInputMode=
"adjustPan"
>
android:windowSoftInputMode=
"adjustPan"
>
<intent-filter>
<action
android:name=
"android.intent.action.CALL"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:scheme=
"sip"
/>
</intent-filter>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.CALL"
/>
<action
android:name=
"android.intent.action.CALL"
/>
<action
android:name=
"android.intent.action.DIAL"
/>
<action
android:name=
"android.intent.action.VIEW"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:scheme=
"tel"
/>
<data
android:scheme=
"tel"
/>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.CALL"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:host=
"ring.cx"
android:pathPrefix=
"/id/"
android:scheme=
"https"
/>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.CALL"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:host=
"ring.cx"
android:pathPrefix=
"/id/"
android:scheme=
"http"
/>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.CALL"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:scheme=
"ring"
/>
<data
android:scheme=
"ring"
/>
<data
android:scheme=
"sip"
/>
</intent-filter>
</intent-filter>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.CALL"
/>
<action
android:name=
"android.intent.action.CALL"
/>
<action
android:name=
"android.intent.action.DIAL"
/>
<action
android:name=
"android.intent.action.DIAL"
/>
...
@@ -149,14 +241,14 @@ along with this program; if not, write to the Free Software
...
@@ -149,14 +241,14 @@ along with this program; if not, write to the Free Software
android:parentActivityName=
".client.HomeActivity"
android:parentActivityName=
".client.HomeActivity"
android:screenOrientation=
"portrait"
android:screenOrientation=
"portrait"
android:theme=
"@style/AppThemeWithoutOverlayCompat"
android:theme=
"@style/AppThemeWithoutOverlayCompat"
android:windowSoftInputMode=
"adjustResize"
>
android:windowSoftInputMode=
"adjustResize"
/>
</activity>
<activity
<activity
android:name=
".client.SettingsActivity"
android:name=
".client.SettingsActivity"
android:label=
"@string/menu_item_settings"
android:label=
"@string/menu_item_settings"
android:theme=
"@style/AppThemeWithoutOverlayCompat"
>
android:theme=
"@style/AppThemeWithoutOverlayCompat"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MANAGE_NETWORK_USAGE"
/>
<action
android:name=
"android.intent.action.MANAGE_NETWORK_USAGE"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
</intent-filter>
</intent-filter>
</activity>
</activity>
...
...
This diff is collapsed.
Click to expand it.
ring-android/app/src/main/java/cx/ring/fragments/CallListFragment.java
+
12
−
0
View file @
1f3a3ab6
...
@@ -225,6 +225,18 @@ public class CallListFragment extends Fragment implements SearchView.OnQueryText
...
@@ -225,6 +225,18 @@ public class CallListFragment extends Fragment implements SearchView.OnQueryText
searchView
.
setQueryHint
(
getString
(
R
.
string
.
searchbar_hint
));
searchView
.
setQueryHint
(
getString
(
R
.
string
.
searchbar_hint
));
searchView
.
setLayoutParams
(
new
Toolbar
.
LayoutParams
(
Toolbar
.
LayoutParams
.
MATCH_PARENT
,
Toolbar
.
LayoutParams
.
MATCH_PARENT
));
searchView
.
setLayoutParams
(
new
Toolbar
.
LayoutParams
(
Toolbar
.
LayoutParams
.
MATCH_PARENT
,
Toolbar
.
LayoutParams
.
MATCH_PARENT
));
searchView
.
setImeOptions
(
EditorInfo
.
IME_ACTION_GO
);
searchView
.
setImeOptions
(
EditorInfo
.
IME_ACTION_GO
);
Intent
i
=
getActivity
().
getIntent
();
switch
(
i
.
getAction
())
{
case
Intent
.
ACTION_VIEW
:
case
Intent
.
ACTION_CALL
:
searchView
.
setQuery
(
i
.
getDataString
(),
true
);
break
;
case
Intent
.
ACTION_DIAL
:
searchMenuItem
.
expandActionView
();
searchView
.
setQuery
(
i
.
getDataString
(),
false
);
break
;
}
}
}
@Override
@Override
...
...
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