fix connection check for custom api urls and allow connection to http…

data/src/main/java/io/forus/me/android/data/net/MeServiceFactory.java

@@ -51,22 +51,15 @@ public <T> T createRetrofitService(final Class<T> clazz, final String endPoint)
     }
 
     public <T> T createRetrofitService(final Class<T> clazz, final String endPoint, final String customAccessToken) throws Exception{
-
         okhttp3.OkHttpClient.Builder httpClient = new okhttp3.OkHttpClient.Builder();
 
         MeHttpLoggingInterceptor logging = new MeHttpLoggingInterceptor(HttpLoggingInterceptor.Logger.DEFAULT);
         logging.setLevel(HttpLoggingInterceptor.Level.BODY);
         logging.setLogAccessToken(false);
         httpClient.addInterceptor(logging);
         httpClient.addInterceptor(chain -> {
-
             Request original = chain.request();
-
-            HttpUrl url = original.url()
-                    .newBuilder()
-                    .build();
-
-
+            HttpUrl url = original.url().newBuilder().build();
 
             String userAgent = getUserAgent();
             Log.d("forus","userAgent="+userAgent);
@@ -134,7 +127,6 @@ private String getUserAgent(){
             e.printStackTrace();
         }
 
-
         return String.format(Locale.US,
                 "%s/%s (Android %s; %s; %s %s; %s)",
                 appName,
@@ -145,8 +137,4 @@ private String getUserAgent(){
                 Build.DEVICE,
                 Locale.getDefault().getLanguage());
     }
-
-
-
-
 }

data/src/main/java/io/forus/me/android/data/net/common/CommonService.kt

@@ -1,8 +1,5 @@
 package io.forus.me.android.data.net.common
 
-import io.forus.me.android.data.entity.common.Success
-import io.forus.me.android.data.entity.records.request.*
-import io.forus.me.android.data.entity.records.response.*
 import io.reactivex.Observable
 import okhttp3.ResponseBody
 import retrofit2.http.*
@@ -11,12 +8,6 @@ import retrofit2.http.*
  * Created by maestrovs on 03.05.2020
  */
 interface CommonService {
-
-
-
     @GET("api/v1/status")
     fun status() : Observable<ResponseBody>
-
-
-
 }

data/src/main/java/io/forus/me/android/data/repository/common/CommonRepository.kt

@@ -4,14 +4,8 @@ import io.forus.me.android.data.repository.common.datasource.CommonDataSource
 import io.forus.me.android.domain.repository.common.CommonRepository
 import io.reactivex.Observable
 
-
 class CommonRepository(private val commonDataSource: CommonDataSource) : CommonRepository {
-
-
     override fun status(): Observable<Boolean> {
-        return commonDataSource.status()
-                .map {
-                    it
-                }
+        return commonDataSource.status().map { it }
     }
 }

data/src/main/java/io/forus/me/android/data/repository/common/datasource/CommonDataSource.kt

@@ -1,9 +1,7 @@
 package io.forus.me.android.data.repository.common.datasource
 
-import com.gigawatt.android.data.net.sign.models.request.SignUp
 import io.reactivex.Observable
 
 interface CommonDataSource {
-
     fun status(): Observable<Boolean>
 }

data/src/main/java/io/forus/me/android/data/repository/common/datasource/CommonRemoteDataSource.kt

@@ -4,14 +4,13 @@ import io.forus.me.android.data.net.common.CommonService
 import io.forus.me.android.data.repository.datasource.RemoteDataSource
 import io.reactivex.Observable
 
-class CommonRemoteDataSource(f: () -> CommonService) : CommonDataSource, RemoteDataSource<CommonService>(f) {
+class CommonRemoteDataSource(f: () -> CommonService) : CommonDataSource,
+    RemoteDataSource<CommonService>(f) {
     override fun status(): Observable<Boolean> {
-        return service.status()
-                .map {
-                    val result = it.string();
-                    result == "1"||result.isEmpty()
-
-                }
+        return service.status().map {
+            val json = it.string()
+            json.contains("\"success\":true")
+        }
     }
 }
 

presentation/src/dev/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:usesCleartextTraffic="true" />
+</manifest>

presentation/src/main/java/io/forus/me/android/presentation/api_config/check_api_status/CheckApiPresenter.kt

@@ -5,35 +5,26 @@ import io.forus.me.android.data.net.MeServiceFactory
 import io.forus.me.android.data.net.common.CommonService
 import io.forus.me.android.data.repository.common.CommonRepository
 import io.forus.me.android.data.repository.common.datasource.CommonRemoteDataSource
-import io.forus.me.android.presentation.api_config.ApiConfig
-import io.forus.me.android.presentation.internal.Injection
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import javax.inject.Inject
 
 class CheckApiPresenter(val context: Context) {
-
-
     fun checkApi(apiString: String, success: (Boolean) -> Unit, error: (Throwable) -> Unit) {
-
         try {
-
             val commonRemoteDataSource = CommonRemoteDataSource { MeServiceFactory.getInstance().createRetrofitService(CommonService::class.java, apiString) }
-
             val commonRepository = CommonRepository(commonRemoteDataSource)
 
             commonRepository.status()
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .map<Boolean> {
-                        success(it)
-                        it
-                    }
-                    .onErrorReturn {
-                        error(it)
-                        false
-                    }.subscribe()
-
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .map { result ->
+                    success(result)
+                    result
+                }
+                .onErrorReturn { throwable ->
+                    error(throwable)
+                    false
+                }.subscribe()
         } catch (e: Exception) {
             error(e)
         }

presentation/src/main/java/io/forus/me/android/presentation/api_config/dialogs/TestApiErrorDialog.kt

@@ -2,20 +2,20 @@ package io.forus.me.android.presentation.api_config.dialogs
 
 import android.content.Context
 import com.afollestad.materialdialogs.MaterialDialog
-import io.forus.me.android.presentation.R
-
-
-class TestApiErrorDialog(private val context: Context, private val message: String,
-                         private val cancelListener: () -> Unit){
 
+class TestApiErrorDialog(
+    context: Context,
+    message: String,
+    private val cancelListener: () -> Unit
+) {
     private val dialog: MaterialDialog = MaterialDialog.Builder(context)
-            .title("Error test API server")
-            .content(message)
-            .negativeText("Cancel")
-            .cancelListener { cancelListener.invoke() }
-            .build()
+        .title("Error test API server")
+        .content(message)
+        .negativeText("Cancel")
+        .cancelListener { cancelListener.invoke() }
+        .build()
 
-    fun show(){
+    fun show() {
         dialog.show()
     }
 }

presentation/src/main/java/io/forus/me/android/presentation/api_config/dialogs/TestApiSuccessDialog.kt

@@ -2,20 +2,20 @@ package io.forus.me.android.presentation.api_config.dialogs
 
 import android.content.Context
 import com.afollestad.materialdialogs.MaterialDialog
-import io.forus.me.android.presentation.R
-
-
-class TestApiSuccessDialog(private val context: Context, private val message: String,
-                           private val positiveCallback: () -> Unit){
 
+class TestApiSuccessDialog(
+    context: Context,
+    message: String,
+    private val positiveCallback: () -> Unit
+) {
     private val dialog: MaterialDialog = MaterialDialog.Builder(context)
-            .title("Success test API server")
-            .content(message)
-            .positiveText("OK")
-            .onPositive { dialog, which -> positiveCallback.invoke() }
-            .build()
+        .title("Success test API server")
+        .content(message)
+        .positiveText("OK")
+        .onPositive { dialog, which -> positiveCallback.invoke() }
+        .build()
 
-    fun show(){
+    fun show() {
         dialog.show()
     }
 }

presentation/src/main/java/io/forus/me/android/presentation/view/screens/account/pair_device/PairDeviceActivity.kt

@@ -5,19 +5,13 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import io.forus.me.android.presentation.R
-
-import io.forus.me.android.presentation.view.activity.BaseActivity
 import io.forus.me.android.presentation.view.activity.CommonActivity
 
 /**
  * Activity Pair Device.
  */
 class PairDeviceActivity : CommonActivity() {
-
-
     companion object {
-
-
         fun getCallingIntent(context: Context): Intent {
             return Intent(context, PairDeviceActivity::class.java)
         }