Fix #86 and cleanups

Signed-off-by: Mario Danic <mario@lovelyhq.com>

app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

@@ -53,6 +53,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.events.MediaStreamEvent;
 import com.nextcloud.talk.events.PeerConnectionEvent;
 import com.nextcloud.talk.events.SessionDescriptionSendEvent;
+import com.nextcloud.talk.models.database.UserEntity;
 import com.nextcloud.talk.models.json.call.CallOverall;
 import com.nextcloud.talk.models.json.generic.GenericOverall;
 import com.nextcloud.talk.models.json.rooms.Room;
@@ -66,7 +67,6 @@ import com.nextcloud.talk.models.json.signaling.Signaling;
 import com.nextcloud.talk.models.json.signaling.SignalingOverall;
 import com.nextcloud.talk.models.json.signaling.settings.IceServer;
 import com.nextcloud.talk.models.json.signaling.settings.SignalingSettingsOverall;
-import com.nextcloud.talk.persistence.entities.UserEntity;
 import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.animations.PulseAnimation;
 import com.nextcloud.talk.utils.bundle.BundleKeys;

app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java

@@ -35,10 +35,10 @@ import com.bumptech.glide.load.model.LazyHeaders;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.utils.ApiUtils;
-import com.nextcloud.talk.models.json.participants.Participant;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.models.json.participants.Participant;
+import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.glide.GlideApp;
 
 import org.apache.commons.lang3.StringUtils;

app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java

@@ -33,11 +33,11 @@ import com.bumptech.glide.load.model.LazyHeaders;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.utils.ApiUtils;
-import com.nextcloud.talk.models.json.rooms.Room;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.events.MoreMenuClickEvent;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.models.json.rooms.Room;
+import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.glide.GlideApp;
 
 import org.apache.commons.lang3.StringUtils;

app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java

@@ -30,10 +30,10 @@ import com.bumptech.glide.load.model.LazyHeaders;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.utils.ApiUtils;
-import com.nextcloud.talk.models.json.participants.Participant;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.models.json.participants.Participant;
+import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.glide.GlideApp;
 
 import org.apache.commons.lang3.StringUtils;

app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java

@@ -55,16 +55,16 @@ import com.nextcloud.talk.R;
 import com.nextcloud.talk.activities.CallActivity;
 import com.nextcloud.talk.adapters.items.CallItem;
 import com.nextcloud.talk.api.NcApi;
-import com.nextcloud.talk.utils.ApiUtils;
-import com.nextcloud.talk.models.json.participants.Participant;
-import com.nextcloud.talk.models.json.rooms.Room;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
 import com.nextcloud.talk.controllers.bottomsheet.CallMenuController;
 import com.nextcloud.talk.controllers.bottomsheet.EntryMenuController;
 import com.nextcloud.talk.events.BottomSheetLockEvent;
 import com.nextcloud.talk.events.MoreMenuClickEvent;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.models.json.participants.Participant;
+import com.nextcloud.talk.models.json.rooms.Room;
+import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.bundle.BundleKeys;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 

app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java

@@ -54,14 +54,15 @@ import com.nextcloud.talk.R;
 import com.nextcloud.talk.activities.CallActivity;
 import com.nextcloud.talk.adapters.items.UserItem;
 import com.nextcloud.talk.api.NcApi;
-import com.nextcloud.talk.utils.ApiUtils;
-import com.nextcloud.talk.models.json.participants.Participant;
-import com.nextcloud.talk.models.json.rooms.RoomOverall;
-import com.nextcloud.talk.models.json.sharees.Sharee;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
 import com.nextcloud.talk.models.RetrofitBucket;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.models.json.participants.Participant;
+import com.nextcloud.talk.models.json.rooms.RoomOverall;
+import com.nextcloud.talk.models.json.sharees.Sharee;
+import com.nextcloud.talk.utils.ApiUtils;
+import com.nextcloud.talk.utils.bundle.BundleKeys;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 
 import org.parceler.Parcels;

app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java

@@ -43,11 +43,11 @@ import com.evernote.android.job.JobRequest;
 import com.nextcloud.talk.BuildConfig;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.api.NcApi;
-import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
 import com.nextcloud.talk.jobs.AccountRemovalJob;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.ApplicationWideMessageHolder;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 import com.nextcloud.talk.utils.glide.GlideApp;

app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java

@@ -38,11 +38,11 @@ import com.bluelinelabs.conductor.RouterTransaction;
 import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.adapters.items.AdvancedUserItem;
-import com.nextcloud.talk.models.json.participants.Participant;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
 import com.nextcloud.talk.models.ImportAccount;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.models.json.participants.Participant;
 import com.nextcloud.talk.utils.AccountUtils;
 import com.nextcloud.talk.utils.bundle.BundleKeys;
 import com.nextcloud.talk.utils.database.user.UserUtils;

app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java

@@ -48,7 +48,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
 import com.nextcloud.talk.events.CertificateEvent;
 import com.nextcloud.talk.models.LoginData;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
 import com.nextcloud.talk.utils.ApplicationWideMessageHolder;
 import com.nextcloud.talk.utils.bundle.BundleKeys;
 import com.nextcloud.talk.utils.database.user.UserUtils;

app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java

@@ -35,11 +35,11 @@ import android.widget.Button;
 
 import com.bluelinelabs.conductor.RouterTransaction;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.models.json.rooms.Room;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
 import com.nextcloud.talk.events.BottomSheetLockEvent;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.models.json.rooms.Room;
 import com.nextcloud.talk.utils.ApplicationWideMessageHolder;
 import com.nextcloud.talk.utils.ShareUtils;
 import com.nextcloud.talk.utils.bundle.BundleKeys;

app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java

@@ -38,9 +38,9 @@ import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.base.BaseController;
 import com.nextcloud.talk.events.BottomSheetLockEvent;
+import com.nextcloud.talk.models.database.UserEntity;
 import com.nextcloud.talk.models.json.call.CallOverall;
 import com.nextcloud.talk.models.json.rooms.Room;
-import com.nextcloud.talk.persistence.entities.UserEntity;
 import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.ApplicationWideMessageHolder;
 import com.nextcloud.talk.utils.DisplayUtils;

app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java

@@ -24,7 +24,7 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.persistence.entities.Models;
+import com.nextcloud.talk.models.database.Models;
 import com.nextcloud.talk.utils.preferences.AppPreferences;
 
 import net.orange_box.storebox.StoreBox;

app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalJob.java

@@ -28,11 +28,11 @@ import android.util.Log;
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.evernote.android.job.Job;
 import com.nextcloud.talk.api.NcApi;
-import com.nextcloud.talk.utils.ApiUtils;
+import com.nextcloud.talk.application.NextcloudTalkApplication;
+import com.nextcloud.talk.models.database.UserEntity;
 import com.nextcloud.talk.models.json.generic.GenericOverall;
 import com.nextcloud.talk.models.json.push.PushConfigurationState;
-import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 
 import java.io.IOException;

app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java

@@ -20,7 +20,8 @@
 
 package com.nextcloud.talk.models;
 
-import com.nextcloud.talk.persistence.entities.UserEntity;
+
+import com.nextcloud.talk.models.database.UserEntity;
 
 import org.parceler.Parcel;
 

app/src/main/java/com/nextcloud/talk/utils/AccountUtils.java

@@ -32,7 +32,7 @@ import android.util.Log;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.models.ImportAccount;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/nextcloud/talk/utils/PushUtils.java

@@ -28,10 +28,10 @@ import android.util.Log;
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.api.NcApi;
-import com.nextcloud.talk.models.json.push.PushConfigurationState;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.models.SignatureVerification;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
+import com.nextcloud.talk.models.json.push.PushConfigurationState;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 import com.nextcloud.talk.utils.preferences.AppPreferences;
 

app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java

@@ -33,8 +33,8 @@ import android.text.TextUtils;
 
 import com.kennyc.bottomsheet.adapters.AppAdapter;
 import com.nextcloud.talk.R;
+import com.nextcloud.talk.models.database.UserEntity;
 import com.nextcloud.talk.models.json.rooms.Room;
-import com.nextcloud.talk.persistence.entities.UserEntity;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 
 import java.util.ArrayList;

app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java

@@ -24,7 +24,7 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.nextcloud.talk.models.database.User;
-import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.models.database.UserEntity;
 
 import java.util.List;
 

app/src/main/res/drawable/ic_group_white_24px.xml

@@ -5,6 +5,6 @@
         android:pathData="M0,0l24,0l0,24l-24,0z"
         android:strokeColor="#00000000" android:strokeWidth="1"/>
     <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M15.273,10.909C16.631,10.909 17.719,9.813 17.719,8.455C17.719,7.096 16.631,6 15.273,6C13.915,6 12.818,7.096 12.818,8.455C12.818,9.813 13.915,10.909 15.273,10.909ZM8.727,10.909C10.085,10.909 11.174,9.813 11.174,8.455C11.174,7.096 10.085,6 8.727,6C7.369,6 6.273,7.096 6.273,8.455C6.273,9.813 7.369,10.909 8.727,10.909ZM8.727,12.545C6.821,12.545 3,13.503 3,15.409L3,17.455L14.455,17.455L14.455,15.409C14.455,13.503 10.634,12.545 8.727,12.545ZM15.273,12.545C15.035,12.545 14.765,12.562 14.479,12.586C15.428,13.274 16.091,14.198 16.091,15.409L16.091,17.455L21,17.455L21,15.409C21,13.503 17.179,12.545 15.273,12.545Z"
+        android:pathData="M13.444,4C11.385,4 9.906,5.686 9.906,7.302C9.906,8.953 10.024,10.132 10.849,11.429C11.113,11.771 11.421,11.842 11.675,12.137C11.834,12.727 11.958,13.316 11.793,13.906C11.278,14.086 10.79,14.298 10.295,14.496C9.693,14.174 8.998,13.906 8.396,13.67C8.314,13.34 8.373,13.096 8.455,12.786C8.597,12.638 8.726,12.573 8.88,12.432C9.316,11.901 9.34,11.005 9.34,10.368C9.34,9.425 8.49,8.717 7.571,8.717C6.545,8.717 5.802,9.566 5.802,10.368L5.778,10.368C5.778,11.194 5.837,11.783 6.25,12.432C6.368,12.609 6.535,12.638 6.662,12.786C6.742,13.08 6.805,13.375 6.721,13.67C5.967,13.933 5.254,14.26 4.599,14.614C4.103,14.967 4.324,14.828 4.009,15.97C3.863,16.559 5.542,16.831 6.745,16.925C6.686,17.249 6.604,17.68 6.368,18.505C5.99,19.979 11.501,20.51 13.444,20.51C16.31,20.51 20.889,19.972 20.496,18.505C19.883,16.217 20.251,16.489 19.341,15.793C18.055,15.022 16.449,14.417 15.095,13.906C14.918,13.249 15.048,12.762 15.213,12.137C15.49,11.842 15.802,11.713 16.062,11.429C16.876,10.387 16.982,8.571 16.982,7.302C16.982,5.432 15.295,4 13.444,4L13.444,4Z"
         android:strokeColor="#00000000" android:strokeWidth="1"/>
 </vector>

app/src/main/res/drawable/ic_link_white_24px.xml

@@ -5,6 +5,6 @@
         android:pathData="M0,0l24,0l0,24l-24,0z"
         android:strokeColor="#00000000" android:strokeWidth="1"/>
     <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M3.9,12C3.9,10.29 5.29,8.9 7,8.9L11,8.9L11,7L7,7C4.24,7 2,9.24 2,12C2,14.76 4.24,17 7,17L11,17L11,15.1L7,15.1C5.29,15.1 3.9,13.71 3.9,12ZM8,13L16,13L16,11L8,11L8,13ZM17,7L13,7L13,8.9L17,8.9C18.71,8.9 20.1,10.29 20.1,12C20.1,13.71 18.71,15.1 17,15.1L13,15.1L13,17L17,17C19.76,17 22,14.76 22,12C22,9.24 19.76,7 17,7Z"
+        android:pathData="M13.772,5.125L9.886,9.014C9.022,9.878 8.618,10.991 8.679,12.016C8.74,13.041 9.208,13.951 9.886,14.628L11.611,12.899C10.918,12.206 10.946,11.409 11.613,10.742L15.499,6.855C16.141,6.213 17.027,6.216 17.664,6.853C18.253,7.531 18.308,8.365 17.659,9.014L16.657,10.016C17.335,10.975 17.445,11.685 17.382,12.746L19.386,10.742C20.898,9.23 20.898,6.632 19.386,5.121C17.877,3.611 15.304,3.641 13.772,5.125L13.772,5.125ZM14.636,9.871L12.909,11.603L12.914,11.603C13.586,12.275 13.533,13.14 12.909,13.765L9.022,17.651C8.172,18.375 7.436,18.227 6.861,17.651C6.095,16.886 6.25,16.102 6.861,15.492L7.899,14.457C7.22,13.5 7.107,12.789 7.169,11.73L5.134,13.765C3.62,15.279 3.624,17.869 5.134,19.379C6.643,20.888 9.241,20.888 10.75,19.379L14.637,15.492C15.502,14.626 15.907,13.515 15.847,12.488C15.788,11.462 15.319,10.55 14.639,9.873L14.636,9.871Z"
         android:strokeColor="#00000000" android:strokeWidth="1"/>
 </vector>