accounts: remove iax type
Change-Id: I2158f1184ac41c3c9461981765389b4a8e2416a9
Tuleap: #813
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
index 0bd529e..1a78022 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
@@ -53,7 +53,6 @@
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,
diff --git a/ring-android/app/src/main/jni/Android.mk b/ring-android/app/src/main/jni/Android.mk
index 10621da..069ea9e 100644
--- a/ring-android/app/src/main/jni/Android.mk
+++ b/ring-android/app/src/main/jni/Android.mk
@@ -122,7 +122,7 @@
LOCAL_LDLIBS += -lhogweed \
-lspeexdsp -lvorbisfile -lyaml-cpp -ljsoncpp \
- -lFLAC -liax -lnettle \
+ -lFLAC -lnettle \
-logg \
-lpcre -lsamplerate -luuid \
-lsndfile -lvorbis \
diff --git a/ring-android/app/src/main/jni/configurationmanager.i b/ring-android/app/src/main/jni/configurationmanager.i
index cc6a5b3..59b485b 100644
--- a/ring-android/app/src/main/jni/configurationmanager.i
+++ b/ring-android/app/src/main/jni/configurationmanager.i
@@ -106,7 +106,6 @@
std::string getAudioManager();
bool setAudioManager(const std::string& api);
-int32_t isIax2Enabled();
std::string getRecordPath();
void setRecordPath(const std::string& recPath);
bool getIsAlwaysRecording();
diff --git a/ring-android/app/src/main/jni/managerimpl.i b/ring-android/app/src/main/jni/managerimpl.i
index 9c75674..d24a425 100644
--- a/ring-android/app/src/main/jni/managerimpl.i
+++ b/ring-android/app/src/main/jni/managerimpl.i
@@ -32,7 +32,7 @@
void fini(void);
/**
- * Poll for SIP/IAX events
+ * Poll for events
*/
void pollEvents(void);
diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml
index 191c9bf..d5d9a9a 100644
--- a/ring-android/app/src/main/res/values/strings_account.xml
+++ b/ring-android/app/src/main/res/values/strings_account.xml
@@ -39,7 +39,6 @@
<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>