Merge branch 'development' into youtube

shubhamkumar1739 · web-flow · commit b7bd91b997c0 · 2020-02-12T10:26:49.000+05:30
diff --git a/app/src/main/java/org/fossasia/susi/ai/data/GroupWiseSkillsModel.kt b/app/src/main/java/org/fossasia/susi/ai/data/GroupWiseSkillsModel.kt
@@ -13,11 +13,11 @@ import timber.log.Timber
  *
  * Created by arundhati24 on 16/07/2018.
  */
-class GroupWiseSkillsModel : IGroupWiseSkillsModel {
+class GroupWiseSkillsModel(val listener: IGroupWiseSkillsModel.OnFetchSkillsFinishedListener) : IGroupWiseSkillsModel {
 
     private lateinit var authResponseCallSkills: Call<ListSkillsResponse>
 
-    override fun fetchSkills(group: String, language: String, filter_name: String, filter_type: String, duration: String, listener: IGroupWiseSkillsModel.OnFetchSkillsFinishedListener) {
+    override fun fetchSkills(group: String, language: String, filter_name: String, filter_type: String, duration: String) {
         val queryObject = SkillsListQuery(group, language, "true", filter_name, filter_type, duration)
         authResponseCallSkills = ClientBuilder.fetchListSkillsCall(queryObject)
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/data/LoginModel.kt b/app/src/main/java/org/fossasia/susi/ai/data/LoginModel.kt
@@ -17,12 +17,12 @@ import timber.log.Timber
  * Created by chiragw15 on 4/7/17.
  */
 
-class LoginModel : ILoginModel {
+class LoginModel(val listener: ILoginModel.OnLoginFinishedListener) : ILoginModel {
 
     private lateinit var authResponseCall: Call<LoginResponse>
     private lateinit var userSettingResponseCall: Call<UserSetting>
 
-    override fun login(email: String, password: String, listener: ILoginModel.OnLoginFinishedListener) {
+    override fun login(email: String, password: String) {
 
         authResponseCall = ClientBuilder.susiApi
                 .login(email, password)
diff --git a/app/src/main/java/org/fossasia/susi/ai/data/SettingModel.kt b/app/src/main/java/org/fossasia/susi/ai/data/SettingModel.kt
@@ -13,11 +13,11 @@ import retrofit2.Response
 /**
  * Created by meeera on 14/7/17.
  */
-class SettingModel : ISettingModel {
+class SettingModel(val listener: ISettingModel.OnSettingFinishListener) : ISettingModel {
 
     private lateinit var settingResponseCall: Call<ChangeSettingResponse>
     private lateinit var resetPasswordResponseCall: Call<ResetPasswordResponse>
-    override fun sendSetting(key: String, value: String, count: Int, listener: ISettingModel.OnSettingFinishListener) {
+    override fun sendSetting(key: String, value: String, count: Int) {
         settingResponseCall = ClientBuilder.susiApi
                 .changeSettingResponse(key, value, count)
         settingResponseCall.enqueue(object : Callback<ChangeSettingResponse> {
@@ -31,7 +31,7 @@ class SettingModel : ISettingModel {
         })
     }
 
-    override fun resetPassword(password: String, newPassword: String, listener: ISettingModel.OnSettingFinishListener) {
+    override fun resetPassword(password: String, newPassword: String) {
         val email = PrefManager.getString(Constant.SAVE_EMAIL, null)
         resetPasswordResponseCall = ClientBuilder.susiApi
                 .resetPasswordResponse(email, password, newPassword)
diff --git a/app/src/main/java/org/fossasia/susi/ai/data/contract/IGroupWiseSkillsModel.kt b/app/src/main/java/org/fossasia/susi/ai/data/contract/IGroupWiseSkillsModel.kt
@@ -13,7 +13,7 @@ interface IGroupWiseSkillsModel {
         fun onSkillFetchFailure(t: Throwable)
     }
 
-    fun fetchSkills(group: String, language: String, filter_name: String, filter_type: String, duration: String, listener: OnFetchSkillsFinishedListener)
+    fun fetchSkills(group: String, language: String, filter_name: String, filter_type: String, duration: String)
 
     fun cancelFetch()
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/data/contract/ILoginModel.kt b/app/src/main/java/org/fossasia/susi/ai/data/contract/ILoginModel.kt
@@ -18,7 +18,7 @@ interface ILoginModel {
         fun onErrorSetting()
     }
 
-    fun login(email: String, password: String, listener: OnLoginFinishedListener)
+    fun login(email: String, password: String)
 
     fun cancelLogin()
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/data/contract/ISettingModel.kt b/app/src/main/java/org/fossasia/susi/ai/data/contract/ISettingModel.kt
@@ -15,7 +15,7 @@ interface ISettingModel {
         fun onFailure(throwable: Throwable)
     }
 
-    fun sendSetting(key: String, value: String, count: Int, listener: OnSettingFinishListener)
+    fun sendSetting(key: String, value: String, count: Int)
 
-    fun resetPassword(password: String, newPassword: String, listener: OnSettingFinishListener)
+    fun resetPassword(password: String, newPassword: String)
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/di/Modules.kt b/app/src/main/java/org/fossasia/susi/ai/di/Modules.kt
@@ -3,6 +3,16 @@ package org.fossasia.susi.ai.di
 import org.fossasia.susi.ai.chat.ChatPresenter
 import org.fossasia.susi.ai.chat.contract.IChatPresenter
 import org.fossasia.susi.ai.chat.contract.IChatView
+import org.fossasia.susi.ai.data.GroupWiseSkillsModel
+import org.fossasia.susi.ai.data.LoginModel
+import org.fossasia.susi.ai.data.SettingModel
+import org.fossasia.susi.ai.data.SignUpModel
+import org.fossasia.susi.ai.data.UtilModel
+import org.fossasia.susi.ai.data.contract.IGroupWiseSkillsModel
+import org.fossasia.susi.ai.data.contract.ILoginModel
+import org.fossasia.susi.ai.data.contract.ISettingModel
+import org.fossasia.susi.ai.data.db.DatabaseRepository
+import org.fossasia.susi.ai.data.db.contract.IDatabaseRepository
 import org.fossasia.susi.ai.device.connecteddevices.ConnectedDevicePresenter
 import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDevicePresenter
 import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDeviceView
@@ -21,6 +31,9 @@ import org.fossasia.susi.ai.skills.groupwiseskills.contract.IGroupWiseSkillsView
 import org.fossasia.susi.ai.skills.settings.SettingsPresenter
 import org.fossasia.susi.ai.skills.settings.contract.ISettingsPresenter
 import org.fossasia.susi.ai.skills.settings.contract.ISettingsView
+import org.fossasia.susi.ai.skills.skilldetails.SkillDetailsPresenter
+import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsPresenter
+import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsView
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.module.Module
 import org.koin.dsl.module
@@ -37,7 +50,23 @@ val modules: Module = module(override = true) {
 
     factory<ILoginPresenter> { (view: ILoginView) -> LoginPresenter(androidContext(), view) }
 
-    factory<ISignUpPresenter> { (view: ISignUpView) -> SignUpPresenter(androidContext(), view) }
+    factory<ISignUpPresenter> { (view: ISignUpView) -> SignUpPresenter(get(), UtilModel(androidContext()), get(), view) }
+
+    single {
+        DatabaseRepository() as IDatabaseRepository
+    }
+
+    single {
+        SignUpModel()
+    }
 
     factory<ISettingsPresenter> { (view: ISettingsView) -> SettingsPresenter(androidContext(), view) }
+
+    factory<ISkillDetailsPresenter> { (view: ISkillDetailsView) -> SkillDetailsPresenter(androidContext(), view) }
+
+    factory<IGroupWiseSkillsModel> { (view: IGroupWiseSkillsModel.OnFetchSkillsFinishedListener) -> GroupWiseSkillsModel(view) }
+
+    factory<ILoginModel> { (view: ILoginModel.OnLoginFinishedListener) -> LoginModel(view) }
+
+    factory<ISettingModel> { (view: ISettingModel.OnSettingFinishListener) -> SettingModel(view) }
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/CredentialHelper.kt b/app/src/main/java/org/fossasia/susi/ai/helper/CredentialHelper.kt
@@ -17,6 +17,8 @@ import timber.log.Timber
 object CredentialHelper {
 
     private val PASSWORD_PATTERN = Pattern.compile("^((?=.*\\d)(?=.*[A-Z])(?=.*[@#\$%])(?=.*\\W).{8,64})$")
+    private val VALID_EMAIL_ADDRESS_REGEX = Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE)
+    private val VALID_URL_REGEX = Pattern.compile("^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]")
 
     /**
      * Is email valid boolean.
@@ -28,7 +30,7 @@ object CredentialHelper {
     fun isEmailValid(mail: String): Boolean {
         Timber.d("isEmailValid: %s", mail)
         val email = mail.trim { it <= ' ' }
-        return !TextUtils.isEmpty(email) && Patterns.EMAIL_ADDRESS.matcher(email).matches()
+        return !TextUtils.isEmpty(email) && VALID_EMAIL_ADDRESS_REGEX.matcher(email).matches()
     }
 
     /**
@@ -64,7 +66,7 @@ object CredentialHelper {
      * @return the boolean
      */
     fun isURLValid(url: String): Boolean {
-        return Patterns.WEB_URL.matcher(url).matches()
+        return VALID_URL_REGEX.matcher(url).matches()
     }
 
     fun isURLValid(inputLayout: TextInputLayout, context: Context): Boolean {
diff --git a/app/src/main/java/org/fossasia/susi/ai/login/LoginPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/login/LoginPresenter.kt
@@ -11,7 +11,6 @@ import com.google.android.gms.tasks.OnCompleteListener
 import java.net.UnknownHostException
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.data.ForgotPasswordModel
-import org.fossasia.susi.ai.data.LoginModel
 import org.fossasia.susi.ai.data.UtilModel
 import org.fossasia.susi.ai.data.contract.IForgotPasswordModel
 import org.fossasia.susi.ai.data.contract.ILoginModel
@@ -27,6 +26,9 @@ import org.fossasia.susi.ai.rest.responses.susi.ForgotPasswordResponse
 import org.fossasia.susi.ai.rest.responses.susi.LoginResponse
 import org.fossasia.susi.ai.rest.responses.susi.Settings
 import org.fossasia.susi.ai.rest.responses.susi.UserSetting
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+import org.koin.core.parameter.parametersOf
 import retrofit2.Response
 import timber.log.Timber
 
@@ -38,9 +40,9 @@ import timber.log.Timber
 class LoginPresenter(context: Context, private val loginView: ILoginView) :
         ILoginPresenter,
         ILoginModel.OnLoginFinishedListener,
-        IForgotPasswordModel.OnFinishListener {
+        IForgotPasswordModel.OnFinishListener, KoinComponent {
 
-    private var loginModel: LoginModel = LoginModel()
+    private val loginModel: ILoginModel by inject { parametersOf(this) }
     private var utilModel: UtilModel = UtilModel(context)
     private var databaseRepository: IDatabaseRepository = DatabaseRepository()
     var forgotPasswordModel: ForgotPasswordModel = ForgotPasswordModel()
@@ -112,7 +114,7 @@ class LoginPresenter(context: Context, private val loginView: ILoginView) :
         this.email = email
         PrefManager.putString(Constant.EMAIL, this.email)
         loginView?.showProgress(true)
-        loginModel.login(email.trim { it <= ' ' }.toLowerCase(), password, this)
+        loginModel.login(email.trim { it <= ' ' }.toLowerCase(), password)
     }
 
     override fun cancelLogin() {
diff --git a/app/src/main/java/org/fossasia/susi/ai/signup/SignUpPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/signup/SignUpPresenter.kt
@@ -1,6 +1,5 @@
 package org.fossasia.susi.ai.signup
 
-import android.content.Context
 import android.graphics.Color
 import java.net.UnknownHostException
 import org.fossasia.susi.ai.R
@@ -9,7 +8,6 @@ import org.fossasia.susi.ai.data.SignUpModel
 import org.fossasia.susi.ai.data.UtilModel
 import org.fossasia.susi.ai.data.contract.IForgotPasswordModel
 import org.fossasia.susi.ai.data.contract.ISignUpModel
-import org.fossasia.susi.ai.data.db.DatabaseRepository
 import org.fossasia.susi.ai.data.db.contract.IDatabaseRepository
 import org.fossasia.susi.ai.helper.Constant
 import org.fossasia.susi.ai.helper.CredentialHelper
@@ -28,14 +26,11 @@ import retrofit2.Response
  * Created by mayanktripathi on 05/07/17.
  */
 
-class SignUpPresenter(context: Context, private val signUpView: ISignUpView) : ISignUpPresenter, ISignUpModel.OnSignUpFinishedListener, IForgotPasswordModel.OnFinishListener {
+class SignUpPresenter(private val signUpModel: SignUpModel, private val utilModel: UtilModel, private val databaseRepository: IDatabaseRepository, private val signUpView: ISignUpView) : ISignUpPresenter, ISignUpModel.OnSignUpFinishedListener, IForgotPasswordModel.OnFinishListener {
 
-    private var signUpModel: SignUpModel = SignUpModel()
-    private var utilModel: UtilModel = UtilModel(context)
     private var settingView: ISettingsView? = null
     lateinit var email: String
     var forgotPasswordModel: ForgotPasswordModel = ForgotPasswordModel()
-    private var databaseRepository: IDatabaseRepository = DatabaseRepository()
 
     override fun signUp(email: String, password: String, conpass: String, isSusiServerSelected: Boolean, url: String, isTermsAndConditionSelected: Boolean) {
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/GroupWiseSkillsPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/GroupWiseSkillsPresenter.kt
@@ -1,6 +1,5 @@
 package org.fossasia.susi.ai.skills.groupwiseskills
 
-import org.fossasia.susi.ai.data.GroupWiseSkillsModel
 import org.fossasia.susi.ai.data.contract.IGroupWiseSkillsModel
 import org.fossasia.susi.ai.dataclasses.GroupWiseSkills
 import org.fossasia.susi.ai.helper.Constant
@@ -12,6 +11,9 @@ import org.fossasia.susi.ai.skills.SkillsActivity.Companion.FILTER_NAME
 import org.fossasia.susi.ai.skills.SkillsActivity.Companion.FILTER_TYPE
 import org.fossasia.susi.ai.skills.groupwiseskills.contract.IGroupWiseSkillsPresenter
 import org.fossasia.susi.ai.skills.groupwiseskills.contract.IGroupWiseSkillsView
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+import org.koin.core.parameter.parametersOf
 import retrofit2.Response
 import timber.log.Timber
 
@@ -20,16 +22,16 @@ import timber.log.Timber
  * Created by arundhati24 on 16/07/2018.
  */
 class GroupWiseSkillsPresenter(private val groupWiseSkillsView: IGroupWiseSkillsView) : IGroupWiseSkillsPresenter,
-        IGroupWiseSkillsModel.OnFetchSkillsFinishedListener {
-    private var groupWiseSkillsModel: IGroupWiseSkillsModel = GroupWiseSkillsModel()
+        IGroupWiseSkillsModel.OnFetchSkillsFinishedListener, KoinComponent {
+    private val groupWiseSkillsModel: IGroupWiseSkillsModel by inject { parametersOf(this) }
     private var skills = GroupWiseSkills("", ArrayList())
 
     override fun onAttach(groupWiseSkillsView: IGroupWiseSkillsView) {
     }
 
     override fun getSkills(swipeToRefreshActive: Boolean, group: String) {
         groupWiseSkillsView?.visibilityProgressBar(!swipeToRefreshActive)
-        groupWiseSkillsModel.fetchSkills(group, PrefManager.getString(Constant.LANGUAGE, Constant.DEFAULT), FILTER_NAME, FILTER_TYPE, DURATION, this)
+        groupWiseSkillsModel.fetchSkills(group, PrefManager.getString(Constant.LANGUAGE, Constant.DEFAULT), FILTER_NAME, FILTER_TYPE, DURATION)
     }
 
     override fun onSkillFetchSuccess(response: Response<ListSkillsResponse>, group: String) {
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/settings/SettingsPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/settings/SettingsPresenter.kt
@@ -2,7 +2,6 @@ package org.fossasia.susi.ai.skills.settings
 
 import android.content.Context
 import org.fossasia.susi.ai.R
-import org.fossasia.susi.ai.data.SettingModel
 import org.fossasia.susi.ai.data.UtilModel
 import org.fossasia.susi.ai.data.contract.ISettingModel
 import org.fossasia.susi.ai.data.db.DatabaseRepository
@@ -13,6 +12,9 @@ import org.fossasia.susi.ai.rest.responses.susi.ChangeSettingResponse
 import org.fossasia.susi.ai.rest.responses.susi.ResetPasswordResponse
 import org.fossasia.susi.ai.skills.settings.contract.ISettingsPresenter
 import org.fossasia.susi.ai.skills.settings.contract.ISettingsView
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+import org.koin.core.parameter.parametersOf
 import retrofit2.Response
 
 /**
@@ -23,9 +25,9 @@ import retrofit2.Response
  */
 
 class SettingsPresenter(context: Context, private val settingView: ISettingsView?) :
-    ISettingsPresenter, ISettingModel.OnSettingFinishListener {
+    ISettingsPresenter, ISettingModel.OnSettingFinishListener, KoinComponent {
 
-    private var settingModel: SettingModel = SettingModel()
+    private val settingModel: ISettingModel by inject { parametersOf(this) }
     private var utilModel: UtilModel = UtilModel(context)
     private var databaseRepository: IDatabaseRepository = DatabaseRepository()
 
@@ -77,7 +79,7 @@ class SettingsPresenter(context: Context, private val settingView: ISettingsView
             settingView?.invalidCredentials(false, Constant.NEW_PASSWORD)
             return
         }
-        settingModel.resetPassword(password, newPassword, this)
+        settingModel.resetPassword(password, newPassword)
     }
 
     override fun onSuccess(response: Response<ChangeSettingResponse>) {
@@ -93,7 +95,7 @@ class SettingsPresenter(context: Context, private val settingView: ISettingsView
     }
 
     override fun sendSetting(key: String, value: String, count: Int) {
-        settingModel.sendSetting(key, value, count, this)
+        settingModel.sendSetting(key, value, count)
     }
 
     override fun checkForPassword(password: String, what: String) {
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsFragment.kt
@@ -44,10 +44,12 @@ import org.fossasia.susi.ai.skills.skilldetails.adapters.recycleradapters.Feedba
 import org.fossasia.susi.ai.skills.skilldetails.adapters.recycleradapters.SkillExamplesAdapter
 import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsPresenter
 import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsView
+import org.koin.android.ext.android.inject
+import org.koin.core.parameter.parametersOf
 
 class SkillDetailsFragment : Fragment(), ISkillDetailsView {
 
-    private lateinit var skillDetailsPresenter: ISkillDetailsPresenter
+    private val skillDetailsPresenter: ISkillDetailsPresenter by inject { parametersOf(this) }
     private lateinit var loginLogoutModulePresenter: ILoginLogoutModulePresenter
 
     private lateinit var skillData: SkillData
@@ -75,9 +77,7 @@ class SkillDetailsFragment : Fragment(), ISkillDetailsView {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        skillDetailsPresenter = SkillDetailsPresenter(this)
         loginLogoutModulePresenter = LoginLogoutModulePresenter(requireContext())
-        skillDetailsPresenter.onAttach(this)
         skillData = arguments?.getParcelable(
                 SKILL_KEY) as SkillData
         skillGroup = arguments?.getString(SKILL_GROUP).toString()
@@ -573,9 +573,4 @@ class SkillDetailsFragment : Fragment(), ISkillDetailsView {
     override fun updateSkillReportStatus(message: String) {
         Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
     }
-
-    override fun onDestroyView() {
-        skillDetailsPresenter.onDetach()
-        super.onDestroyView()
-    }
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsPresenter.kt
@@ -1,5 +1,6 @@
 package org.fossasia.susi.ai.skills.skilldetails
 
+import android.content.Context
 import java.net.UnknownHostException
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.data.SkillDetailsModel
@@ -25,18 +26,13 @@ import timber.log.Timber
  *
  * @author arundhati24
  */
-class SkillDetailsPresenter(skillDetailsFragment: SkillDetailsFragment) : ISkillDetailsPresenter,
+class SkillDetailsPresenter(context: Context, private val skillDetailsView: ISkillDetailsView?) : ISkillDetailsPresenter,
         ISkillDetailsModel.OnUpdateRatingsFinishedListener, ISkillDetailsModel.OnUpdateUserRatingFinishedListener,
         ISkillDetailsModel.OnUpdateFeedbackFinishedListener, ISkillDetailsModel.OnFetchFeedbackFinishedListener,
         ISkillDetailsModel.OnReportSendListener {
 
     private var skillDetailsModel: SkillDetailsModel = SkillDetailsModel()
-    private var skillDetailsView: ISkillDetailsView? = null
-    private val utilModel: UtilModel = UtilModel(skillDetailsFragment.requireContext())
-
-    override fun onAttach(skillDetailsView: ISkillDetailsView) {
-        this.skillDetailsView = skillDetailsView
-    }
+    private val utilModel: UtilModel = UtilModel(context)
 
     override fun updateRatings(map: Map<String, String>) {
         skillDetailsModel.fiveStarRateSkill(map, this)
@@ -164,8 +160,4 @@ class SkillDetailsPresenter(skillDetailsFragment: SkillDetailsFragment) : ISkill
             skillDetailsView?.updateSkillReportStatus(utilModel.getString(R.string.report_send_success))
         }
     }
-
-    override fun onDetach() {
-        skillDetailsView = null
-    }
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/contract/ISkillDetailsPresenter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/contract/ISkillDetailsPresenter.kt
diff --git a/app/src/test/java/org/fossasia/susi/ai/helper/CredentialHelperTest.kt b/app/src/test/java/org/fossasia/susi/ai/helper/CredentialHelperTest.kt
diff --git a/app/src/test/java/org/fossasia/susi/ai/signup/SignUpPresenterTest.kt b/app/src/test/java/org/fossasia/susi/ai/signup/SignUpPresenterTest.kt

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ interface IGroupWiseSkillsModel {`
`13`	`13`	`fun onSkillFetchFailure(t: Throwable)`
`14`	`14`	`}`
`15`	`15`
`16`		`- fun fetchSkills(group: String, language: String, filter_name: String, filter_type: String, duration: String, listener: OnFetchSkillsFinishedListener)`
	`16`	`+ fun fetchSkills(group: String, language: String, filter_name: String, filter_type: String, duration: String)`
`17`	`17`
`18`	`18`	`fun cancelFetch()`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ interface ILoginModel {`
`18`	`18`	`fun onErrorSetting()`
`19`	`19`	`}`
`20`	`20`
`21`		`- fun login(email: String, password: String, listener: OnLoginFinishedListener)`
	`21`	`+ fun login(email: String, password: String)`
`22`	`22`
`23`	`23`	`fun cancelLogin()`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ interface ISettingModel {`
`15`	`15`	`fun onFailure(throwable: Throwable)`
`16`	`16`	`}`
`17`	`17`
`18`		`- fun sendSetting(key: String, value: String, count: Int, listener: OnSettingFinishListener)`
	`18`	`+ fun sendSetting(key: String, value: String, count: Int)`
`19`	`19`
`20`		`- fun resetPassword(password: String, newPassword: String, listener: OnSettingFinishListener)`
	`20`	`+ fun resetPassword(password: String, newPassword: String)`
`21`	`21`	`}`