Hopefully fixed one crash for beta

Author: fruzyna

.idea/misc.xml

@@ -3,10 +3,14 @@ package com.munchmates.android.Activities
 import android.content.Intent
 import android.support.v7.app.AppCompatActivity
 import com.munchmates.android.App
+import com.munchmates.android.Prefs
 
 abstract class BaseMMActivity: AppCompatActivity() {
 
     override fun onResume() {
+        if(Prefs.instance != null) {
+            Prefs.setInstance(this)
+        }
         if(App.plans.isEmpty()) {
             val intent = Intent(this, MMActivity::class.java)
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)

app/src/main/java/com/munchmates/android/Activities/BaseMMActivity.kt

@@ -29,6 +29,10 @@ class LoginActivity : AppCompatActivity(), View.OnClickListener {
         login_button_forgot.setOnClickListener(this)
         title = "MunchMates Login"
 
+        if(Prefs.instance != null) {
+            Prefs.setInstance(this)
+        }
+
         val email = Prefs.instance.getStr(Prefs.EMAIL_PREF)
         val password = Prefs.instance.getStr(Prefs.PASSWORD_PREF)
         if(email != "" && password != "") {