Commit 07ab9387 authored by Mygod's avatar Mygod

Prevent createProfile returns null

parent b6bfd5bf
...@@ -53,9 +53,9 @@ class ProfileManager(dbHelper: DBHelper) { ...@@ -53,9 +53,9 @@ class ProfileManager(dbHelper: DBHelper) {
def setProfileAddedListener(listener: Profile => Any) = this.profileAddedListener = listener def setProfileAddedListener(listener: Profile => Any) = this.profileAddedListener = listener
def createProfile(p: Profile = null): Profile = { def createProfile(p: Profile = null): Profile = {
val profile = if (p == null) new Profile else p
profile.id = 0
try { try {
val profile = if (p == null) new Profile else p
profile.id = 0
app.currentProfile match { app.currentProfile match {
case Some(oldProfile) => case Some(oldProfile) =>
// Copy Feature Settings from old profile // Copy Feature Settings from old profile
...@@ -72,13 +72,12 @@ class ProfileManager(dbHelper: DBHelper) { ...@@ -72,13 +72,12 @@ class ProfileManager(dbHelper: DBHelper) {
if (last != null && last.length == 1 && last(0) != null) profile.userOrder = last(0).toInt + 1 if (last != null && last.length == 1 && last(0) != null) profile.userOrder = last(0).toInt + 1
dbHelper.profileDao.createOrUpdate(profile) dbHelper.profileDao.createOrUpdate(profile)
if (profileAddedListener != null) profileAddedListener(profile) if (profileAddedListener != null) profileAddedListener(profile)
profile
} catch { } catch {
case ex: Exception => case ex: Exception =>
Log.e(TAG, "addProfile", ex) Log.e(TAG, "addProfile", ex)
app.track(ex) app.track(ex)
p
} }
profile
} }
def updateProfile(profile: Profile): Boolean = { def updateProfile(profile: Profile): Boolean = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment