From cc86f4c3f6919de60363b5ec46dd4136c5d38d8b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 16 Oct 2017 15:32:39 +0200
Subject: [PATCH] Fixed factory getDialPlans()

---
 coreapi/factory.c          | 10 +++++-----
 include/linphone/factory.h | 14 +++++++-------
 wrappers/java/migration.sh |  2 ++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/coreapi/factory.c b/coreapi/factory.c
index 5dab6b014..089dfca9e 100644
--- a/coreapi/factory.c
+++ b/coreapi/factory.c
@@ -323,14 +323,14 @@ LinphoneVideoActivationPolicy *linphone_factory_create_video_activation_policy(L
 	return linphone_video_activation_policy_new();
 }
 
+const bctbx_list_t * linphone_factory_get_dial_plans(const LinphoneFactory *factory) {
+	return linphone_dial_plan_get_all_list();
+}
+
 void *linphone_factory_get_user_data(const LinphoneFactory *factory) {
 	return factory->user_data;
 }
 
 void linphone_factory_set_user_data(LinphoneFactory *factory, void *data) {
 	factory->user_data = data;
-}
-
-const bctbx_list_t * linphone_factory_get_dial_plans(LinphoneFactory *factory) {
-	return linphone_dial_plan_get_all_list();
-}
+}
\ No newline at end of file
diff --git a/include/linphone/factory.h b/include/linphone/factory.h
index 6020db46a..351567478 100644
--- a/include/linphone/factory.h
+++ b/include/linphone/factory.h
@@ -262,6 +262,13 @@ LINPHONE_PUBLIC LinphoneTransports *linphone_factory_create_transports(LinphoneF
  */
 LINPHONE_PUBLIC LinphoneVideoActivationPolicy *linphone_factory_create_video_activation_policy(LinphoneFactory *factory);
 
+/**
+ * Returns a bctbx_list_t of all DialPlans
+ * @param[in] factory the LinphoneFactory object
+ * @return \bctbx_list{LinphoneDialPlan} a list of DialPlan
+ */
+LINPHONE_PUBLIC const bctbx_list_t * linphone_factory_get_dial_plans(const LinphoneFactory *factory);
+
 /**
  * Gets the user data in the LinphoneFactory object
  * @param[in] factory the LinphoneFactory
@@ -276,13 +283,6 @@ LINPHONE_PUBLIC void *linphone_factory_get_user_data(const LinphoneFactory *fact
 */
 LINPHONE_PUBLIC void linphone_factory_set_user_data(LinphoneFactory *factory, void *data);
 
-/***
- * Returns a bctbx_list_t of all DialPlans
- * @param[in] factory the LinphoneFactory object
- * @return \bctbx_list{DialPlan} a list of DialPlan
- */
-LINPHONE_PUBLIC const bctbx_list_t * linphone_factory_get_dial_plans(LinphoneFactory *factory);
-
 /**
  * @}
  */
diff --git a/wrappers/java/migration.sh b/wrappers/java/migration.sh
index c2e889a81..b046e46c3 100644
--- a/wrappers/java/migration.sh
+++ b/wrappers/java/migration.sh
@@ -226,6 +226,8 @@ eval "$SED_START 's/content.getData() == null/content.getSize() == 0/'g $SED_END
 eval "$SED_START 's/lc.downloadOpenH264Enabled()/OpenH264DownloadHelper.isOpenH264DownloadEnabled()/g' $SED_END"
 eval "$SED_START 's/enableDownloadOpenH264(/OpenH264DownloadHelper.enableDownloadOpenH264(/g' $SED_END"
 eval "$SED_START 's/mLc.destroy()/mLc = null/g' $SED_END"
+eval "$SED_START 's/getAllDialPlan()/getDialPlans()/g' $SED_END"
+eval "$SED_START 's/getCountryName()/getCountry()/g' $SED_END"
 
 #Changes in library required
 #Tunnel