Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-android
Commits
6dc5b71a
Commit
6dc5b71a
authored
Jun 30, 2016
by
Alexandre Lision
Browse files
accounts: remove iax type
Change-Id: I2158f1184ac41c3c9461981765389b4a8e2416a9 Tuleap:
#813
parent
e5361f41
Changes
5
Hide whitespace changes
Inline
Side-by-side
ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
View file @
6dc5b71a
...
...
@@ -53,7 +53,6 @@ public class AccountDetailBasic implements AccountDetail {
public
static
final
String
ACCOUNT_TYPE_RING
=
"RING"
;
public
static
final
String
ACCOUNT_TYPE_SIP
=
"SIP"
;
public
static
final
String
ACCOUNT_TYPE_IAX
=
"IAX"
;
private
static
final
Set
<
String
>
TWO_STATES
=
new
HashSet
<>(
Arrays
.
asList
(
CONFIG_ACCOUNT_ENABLE
,
...
...
ring-android/app/src/main/jni/Android.mk
View file @
6dc5b71a
...
...
@@ -122,7 +122,7 @@ endif
LOCAL_LDLIBS
+=
-lhogweed
\
-lspeexdsp
-lvorbisfile
-lyaml-cpp
-ljsoncpp
\
-lFLAC
-liax
-lnettle
\
-lFLAC
-lnettle
\
-logg
\
-lpcre
-lsamplerate
-luuid
\
-lsndfile
-lvorbis
\
...
...
ring-android/app/src/main/jni/configurationmanager.i
View file @
6dc5b71a
...
...
@@ -106,7 +106,6 @@ void muteRingtone(bool mute);
std
::
string
getAudioManager
()
;
bool
setAudioManager
(
const
std
::
string&
api
)
;
int32_t
isIax2Enabled
()
;
std
::
string
getRecordPath
()
;
void
setRecordPath
(
const
std
::
string&
recPath
)
;
bool
getIsAlwaysRecording
()
;
...
...
ring-android/app/src/main/jni/managerimpl.i
View file @
6dc5b71a
...
...
@@ -32,7 +32,7 @@ namespace DRing {
void
fini
(
void
)
;
/**
* Poll for
SIP/IAX
events
* Poll for events
*/
void
pollEvents
(
void
)
;
...
...
ring-android/app/src/main/res/values/strings_account.xml
View file @
6dc5b71a
...
...
@@ -39,7 +39,6 @@ along with this program; if not, write to the Free Software
<string-array
name=
"accountType"
>
<item>
RING
</item>
<item>
SIP
</item>
<item>
IAX
</item>
</string-array>
<string
name=
"help_ring_title"
>
Create a Ring account
</string>
<string
name=
"help_ring"
>
A Ring account allows you to reach people securely in peer to peer through a fully distributed network.
</string>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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