Added Certificte pinnig for realm.mongodb.com

app/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -47,8 +48,8 @@
         </activity>
         <activity
             android:name=".ui.createreport.CreateReportActivity"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
 
         <receiver android:name=".app.OnDutyAlarmReminder" />
 

app/src/main/java/org/wildaid/ofish/ui/base/ViewModelFactory.kt

@@ -47,7 +47,7 @@ class ViewModelFactory constructor(
                 SplashViewModel(repository)
             // Login
             isAssignableFrom(LoginViewModel::class.java) ->
-                LoginViewModel(repository)
+                LoginViewModel(repository, application)
             // Home
             isAssignableFrom(HomeActivityViewModel::class.java) ->
                 HomeActivityViewModel(repository, application)

app/src/main/java/org/wildaid/ofish/ui/basicinformation/BasicInformationViewModel.kt

@@ -10,7 +10,7 @@ import org.wildaid.ofish.util.LONGITUDE
 import org.wildaid.ofish.util.convert
 import java.util.*
 
-class BasicInformationViewModel : ViewModel() {
+    class BasicInformationViewModel : ViewModel() {
     val reportLiveData = MutableLiveData<Report>()
     val buttonId = MutableLiveData<Event<Int>>()
     val latitude = MutableLiveData<String>()

app/src/main/java/org/wildaid/ofish/ui/login/LoginViewModel.kt

@@ -1,12 +1,17 @@
 package org.wildaid.ofish.ui.login
 
+import android.app.Application
 import android.util.Log
+import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
 import org.wildaid.ofish.Event
+import org.wildaid.ofish.R
 import org.wildaid.ofish.data.Repository
+import org.wildaid.ofish.util.getString
 
-class LoginViewModel(val repository: Repository) : ViewModel() {
+
+class LoginViewModel(val repository: Repository, application: Application) :
+    AndroidViewModel(application) {
     val loginLiveData = MutableLiveData<LoginResult>()
     val progressLiveData = MutableLiveData<Event<Boolean>>()
 
@@ -20,11 +25,10 @@ class LoginViewModel(val repository: Repository) : ViewModel() {
             loginError = {
                 Log.d("Login", "Cannot log in. Error ${it?.errorMessage}")
                 progressLiveData.value = Event(false)
-                loginLiveData.value = LoginResult.LoginError(it?.errorMessage)
+                loginLiveData.value = LoginResult.LoginError(getString(R.string.login_error))
             }
         )
 
-
         progressLiveData.value = Event(true)
     }
 

app/src/main/res/values/strings.xml

@@ -196,6 +196,7 @@
     <string name="boarding_submitted">Boarding Submitted!</string>
     <string name="boarding_canceled">Boarding Canceled</string>
     <string name="saving_error">An error occurred while saving</string>
+    <string name="login_error">An error occurred while signing in</string>
     <string name="continue_with_empty_fields">Continue with empty fields?</string>
     <string name="continue_action">Continue</string>
     <string name="chose_image_source">Choose image source</string>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">realm.mongodb.com</domain>
+        <pin-set>
+            <pin digest="SHA-256">AE4X6tTSNIhAgDGTlSmbrLvYTpTFEUAQQ7JjOiqgwG8=</pin>
+            <pin digest="SHA-256">5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=</pin>
+        </pin-set>
+    </domain-config>
+</network-security-config>

app/src/test/java/org/wildaid/ofish/ui/login/LoginViewModelTest.kt

@@ -1,6 +1,7 @@
 package org.wildaid.ofish.ui.login
 
 import android.os.Build
+import androidx.test.core.app.ApplicationProvider
 import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import io.realm.mongodb.AppException
@@ -25,7 +26,7 @@ class LoginViewModelTest {
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
-        loginVM = LoginViewModel(mockedRepository)
+        loginVM = LoginViewModel(mockedRepository, ApplicationProvider.getApplicationContext())
     }
 
     @Test