diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index fd0a8de14..e40e97b36 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java index 99391ec14..cdff7e5c2 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java index d6d6365f6..4a56a244b 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java index 19ef859da..9a148a506 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java index 10cef221c..9bc16cb5a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 65e616b12..2a42f047e 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index 26bccfe8e..dce6f67a9 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java index e8e60b6ba..843b57619 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java index cdf62d368..fb9466516 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java index 0b7e585c6..5f790c4c7 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java index 06d42dd50..ce4334ef0 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java index 85a2c14cf..61d8cb3a0 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalJob.java b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalJob.java index 6c5de7251..1368b661a 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalJob.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java b/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java index 7b1dc340b..9ed6f28c1 100644 --- a/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/utils/AccountUtils.java b/app/src/main/java/com/nextcloud/talk/utils/AccountUtils.java index e19c6a4fe..96df29120 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/AccountUtils.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java index 6410b5278..1d73c03d3 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java index 10d85c084..7a864ad52 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java index 7c258c26b..4405f5590 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java +++ b/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; diff --git a/app/src/main/res/drawable/ic_group_white_24px.xml b/app/src/main/res/drawable/ic_group_white_24px.xml index 1d616a66a..cffc6c2c8 100644 --- a/app/src/main/res/drawable/ic_group_white_24px.xml +++ b/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"/> diff --git a/app/src/main/res/drawable/ic_link_white_24px.xml b/app/src/main/res/drawable/ic_link_white_24px.xml index e0df6e1b5..7c9fc8b02 100644 --- a/app/src/main/res/drawable/ic_link_white_24px.xml +++ b/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"/>