mirror of
https://codeberg.org/Mercury-IM/Mercury-IM
synced 2024-06-16 08:34:53 +02:00
Package structure refactoring
This commit is contained in:
parent
892080fb02
commit
8092140fa0
|
@ -10,7 +10,7 @@
|
|||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
||||
<application
|
||||
android:name=".MercuryImApplication"
|
||||
android:name=".android.MercuryImApplication"
|
||||
android:allowBackup="true"
|
||||
android:icon="@drawable/ic_mercury_icon"
|
||||
android:label="@string/app_name"
|
||||
|
@ -18,10 +18,10 @@
|
|||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.Mercury">
|
||||
<activity
|
||||
android:name=".ui.chat.ChatActivity"
|
||||
android:name=".android.ui.chat.ChatActivity"
|
||||
android:label="Chat"/>
|
||||
<activity
|
||||
android:name=".ui.MainActivity"
|
||||
android:name=".android.ui.MainActivity"
|
||||
android:label="@string/app_name">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
@ -30,11 +30,11 @@
|
|||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".ui.settings.SettingsActivity"
|
||||
android:name=".android.ui.settings.SettingsActivity"
|
||||
android:label="@string/title_activity_settings" />
|
||||
<activity android:name=".ui.roster.contacts.detail.ContactDetailActivity" />
|
||||
<activity android:name=".android.ui.roster.contacts.detail.ContactDetailActivity" />
|
||||
|
||||
<service android:name=".service.MercuryConnectionService" />
|
||||
<service android:name=".android.service.MercuryConnectionService" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
|
@ -1,8 +1,9 @@
|
|||
package org.mercury_im.messenger;
|
||||
package org.mercury_im.messenger.android;
|
||||
|
||||
import android.app.Activity;
|
||||
|
||||
import org.mercury_im.messenger.util.AbstractActivityLifecycleCallbacks;
|
||||
import org.mercury_im.messenger.core.ClientStateListener;
|
||||
import org.mercury_im.messenger.android.util.AbstractActivityLifecycleCallbacks;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
|
@ -1,16 +1,17 @@
|
|||
package org.mercury_im.messenger;
|
||||
package org.mercury_im.messenger.android;
|
||||
|
||||
import android.app.Application;
|
||||
import android.content.Intent;
|
||||
import android.os.Build;
|
||||
|
||||
import org.mercury_im.messenger.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.di.component.AppComponent;
|
||||
import org.mercury_im.messenger.di.component.DaggerAppComponent;
|
||||
import org.mercury_im.messenger.di.module.AppModule;
|
||||
import org.mercury_im.messenger.android.di.component.DaggerAppComponent;
|
||||
import org.mercury_im.messenger.core.Messenger;
|
||||
import org.mercury_im.messenger.core.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.android.di.component.AppComponent;
|
||||
import org.mercury_im.messenger.android.di.module.AppModule;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.service.MercuryConnectionService;
|
||||
import org.mercury_im.messenger.xmpp.CsiManager;
|
||||
import org.mercury_im.messenger.android.service.MercuryConnectionService;
|
||||
import org.mercury_im.messenger.core.xmpp.CsiManager;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger;
|
||||
package org.mercury_im.messenger.android;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.app.NotificationChannel;
|
||||
|
@ -11,8 +11,9 @@ import android.os.Build;
|
|||
import androidx.core.app.NotificationCompat;
|
||||
import androidx.core.app.NotificationManagerCompat;
|
||||
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
||||
import org.mercury_im.messenger.ui.chat.ChatActivity;
|
||||
import org.mercury_im.messenger.android.ui.chat.ChatActivity;
|
||||
|
||||
import java.util.UUID;
|
||||
|
|
@ -1,25 +1,25 @@
|
|||
package org.mercury_im.messenger.di.component;
|
||||
package org.mercury_im.messenger.android.di.component;
|
||||
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.data.di.RepositoryModule;
|
||||
import org.mercury_im.messenger.di.module.AndroidPersistenceModule;
|
||||
import org.mercury_im.messenger.di.module.AppModule;
|
||||
import org.mercury_im.messenger.di.module.ViewModelModule;
|
||||
import org.mercury_im.messenger.service.MercuryConnectionService;
|
||||
import org.mercury_im.messenger.store.MercuryEntityCapsStore;
|
||||
import org.mercury_im.messenger.ui.MainActivity;
|
||||
import org.mercury_im.messenger.ui.account.AndroidAccountsViewModel;
|
||||
import org.mercury_im.messenger.ui.account.AndroidLoginViewModel;
|
||||
import org.mercury_im.messenger.ui.chat.ChatActivity;
|
||||
import org.mercury_im.messenger.ui.chat.ChatInputFragment;
|
||||
import org.mercury_im.messenger.ui.chat.ChatInputViewModel;
|
||||
import org.mercury_im.messenger.ui.chat.ChatViewModel;
|
||||
import org.mercury_im.messenger.ui.chatlist.ChatListViewModel;
|
||||
import org.mercury_im.messenger.ui.roster.contacts.ContactListViewModel;
|
||||
import org.mercury_im.messenger.ui.roster.contacts.detail.ContactDetailActivity;
|
||||
import org.mercury_im.messenger.ui.roster.contacts.detail.ContactDetailViewModel;
|
||||
import org.mercury_im.messenger.viewmodel.accounts.AccountsViewModel;
|
||||
import org.mercury_im.messenger.viewmodel.accounts.LoginViewModel;
|
||||
import org.mercury_im.messenger.android.di.module.AndroidPersistenceModule;
|
||||
import org.mercury_im.messenger.android.di.module.AppModule;
|
||||
import org.mercury_im.messenger.core.di.module.ViewModelModule;
|
||||
import org.mercury_im.messenger.android.service.MercuryConnectionService;
|
||||
import org.mercury_im.messenger.core.store.MercuryEntityCapsStore;
|
||||
import org.mercury_im.messenger.android.ui.MainActivity;
|
||||
import org.mercury_im.messenger.android.ui.account.AndroidAccountsViewModel;
|
||||
import org.mercury_im.messenger.android.ui.account.AndroidLoginViewModel;
|
||||
import org.mercury_im.messenger.android.ui.chat.ChatActivity;
|
||||
import org.mercury_im.messenger.android.ui.chat.ChatInputFragment;
|
||||
import org.mercury_im.messenger.android.ui.chat.ChatInputViewModel;
|
||||
import org.mercury_im.messenger.android.ui.chat.ChatViewModel;
|
||||
import org.mercury_im.messenger.android.ui.chatlist.ChatListViewModel;
|
||||
import org.mercury_im.messenger.android.ui.roster.contacts.ContactListViewModel;
|
||||
import org.mercury_im.messenger.android.ui.roster.contacts.detail.ContactDetailActivity;
|
||||
import org.mercury_im.messenger.android.ui.roster.contacts.detail.ContactDetailViewModel;
|
||||
import org.mercury_im.messenger.core.viewmodel.accounts.AccountsViewModel;
|
||||
import org.mercury_im.messenger.core.viewmodel.accounts.LoginViewModel;
|
||||
|
||||
import javax.inject.Singleton;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
* The Component specifies which classes can be injected from the module.
|
||||
*/
|
||||
package org.mercury_im.messenger.di.component;
|
||||
package org.mercury_im.messenger.android.di.component;
|
|
@ -1,9 +1,9 @@
|
|||
package org.mercury_im.messenger.di.module;
|
||||
package org.mercury_im.messenger.android.di.module;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
import org.mercury_im.messenger.data.model.Models;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.BuildConfig;
|
||||
|
||||
import javax.inject.Named;
|
|
@ -1,9 +1,9 @@
|
|||
package org.mercury_im.messenger.di.module;
|
||||
package org.mercury_im.messenger.android.di.module;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
import org.jivesoftware.smackx.ping.android.ServerPingWithAlarmManager;
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
|
||||
import javax.inject.Singleton;
|
||||
|
|
@ -6,4 +6,4 @@
|
|||
*
|
||||
* @see <a href="https://android.jlelse.eu/the-simplest-dagger2-dependency-injection-sample-80a0eb60e33b">The Simples Dagger2 Dependency Injection Sample App</a>
|
||||
*/
|
||||
package org.mercury_im.messenger.di.module;
|
||||
package org.mercury_im.messenger.android.di.module;
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.service;
|
||||
package org.mercury_im.messenger.android;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.service;
|
||||
package org.mercury_im.messenger.android.service;
|
||||
|
||||
import android.app.Notification;
|
||||
import android.app.PendingIntent;
|
||||
|
@ -12,10 +12,10 @@ import androidx.core.app.NotificationCompat;
|
|||
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smackx.ping.android.ServerPingWithAlarmManager;
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.Notifications;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.Notifications;
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.ui.MainActivity;
|
||||
import org.mercury_im.messenger.android.ui.MainActivity;
|
||||
|
||||
/**
|
||||
* Started, Bound Service, which is responsible for managing {@link XMPPConnection XMPPConnections}
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger;
|
||||
package org.mercury_im.messenger.android.service;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui;
|
||||
package org.mercury_im.messenger.android.ui;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
|
@ -13,14 +13,14 @@ import androidx.fragment.app.FragmentTransaction;
|
|||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||
import com.google.android.material.navigation.NavigationView;
|
||||
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.ui.chatlist.ChatListFragment;
|
||||
import org.mercury_im.messenger.ui.account.AccountsFragment;
|
||||
import org.mercury_im.messenger.ui.roster.RosterFragment;
|
||||
import org.mercury_im.messenger.ui.settings.SettingsActivity;
|
||||
import org.mercury_im.messenger.android.ui.chatlist.ChatListFragment;
|
||||
import org.mercury_im.messenger.android.ui.account.AccountsFragment;
|
||||
import org.mercury_im.messenger.android.ui.roster.RosterFragment;
|
||||
import org.mercury_im.messenger.android.ui.settings.SettingsActivity;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package org.mercury_im.messenger.ui;
|
||||
package org.mercury_im.messenger.android.ui;
|
||||
|
||||
import org.mercury_im.messenger.viewmodel.MercuryViewModel;
|
||||
import org.mercury_im.messenger.core.viewmodel.MercuryViewModel;
|
||||
|
||||
import io.reactivex.disposables.Disposable;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.account;
|
||||
package org.mercury_im.messenger.android.ui.account;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.account;
|
||||
package org.mercury_im.messenger.android.ui.account;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
@ -13,11 +13,11 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||
import org.jetbrains.annotations.NotNull;
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.ui.avatar.AvatarDrawable;
|
||||
import org.mercury_im.messenger.ui.account.AccountsFragment.OnAccountListItemClickListener;
|
||||
import org.mercury_im.messenger.util.AbstractDiffCallback;
|
||||
import org.mercury_im.messenger.xmpp.MercuryConnection;
|
||||
import org.mercury_im.messenger.xmpp.state.ConnectionState;
|
||||
import org.mercury_im.messenger.android.ui.avatar.AvatarDrawable;
|
||||
import org.mercury_im.messenger.android.ui.account.AccountsFragment.OnAccountListItemClickListener;
|
||||
import org.mercury_im.messenger.android.util.AbstractDiffCallback;
|
||||
import org.mercury_im.messenger.core.xmpp.MercuryConnection;
|
||||
import org.mercury_im.messenger.core.xmpp.state.ConnectionState;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.account;
|
||||
package org.mercury_im.messenger.android.ui.account;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
|
@ -18,7 +18,7 @@ import androidx.appcompat.app.AppCompatDialogFragment;
|
|||
import com.google.android.material.textfield.TextInputEditText;
|
||||
import com.google.android.material.textfield.TextInputLayout;
|
||||
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.R;
|
||||
|
||||
import butterknife.BindView;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.account;
|
||||
package org.mercury_im.messenger.android.ui.account;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
|
@ -7,11 +7,11 @@ import androidx.lifecycle.AndroidViewModel;
|
|||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.ui.MercuryAndroidViewModel;
|
||||
import org.mercury_im.messenger.viewmodel.accounts.AccountsViewModel;
|
||||
import org.mercury_im.messenger.xmpp.state.ConnectionPoolState;
|
||||
import org.mercury_im.messenger.android.ui.MercuryAndroidViewModel;
|
||||
import org.mercury_im.messenger.core.viewmodel.accounts.AccountsViewModel;
|
||||
import org.mercury_im.messenger.core.xmpp.state.ConnectionPoolState;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.account;
|
||||
package org.mercury_im.messenger.android.ui.account;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
|
@ -6,14 +6,14 @@ import androidx.lifecycle.AndroidViewModel;
|
|||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.account.error.PasswordError;
|
||||
import org.mercury_im.messenger.account.error.UsernameError;
|
||||
import org.mercury_im.messenger.ui.MercuryAndroidViewModel;
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.util.TextChangedListener;
|
||||
import org.mercury_im.messenger.viewmodel.accounts.LoginViewModel;
|
||||
import org.mercury_im.messenger.core.account.error.PasswordError;
|
||||
import org.mercury_im.messenger.core.account.error.UsernameError;
|
||||
import org.mercury_im.messenger.android.ui.MercuryAndroidViewModel;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
import org.mercury_im.messenger.android.util.TextChangedListener;
|
||||
import org.mercury_im.messenger.core.viewmodel.accounts.LoginViewModel;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.android.ui.account;
|
|
@ -13,7 +13,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.mercury_im.messenger.ui.avatar;
|
||||
package org.mercury_im.messenger.android.ui.avatar;
|
||||
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Color;
|
||||
|
@ -22,7 +22,7 @@ import android.graphics.Rect;
|
|||
import android.graphics.Typeface;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
|
||||
import org.mercury_im.messenger.util.ColorUtil;
|
||||
import org.mercury_im.messenger.android.util.ColorUtil;
|
||||
|
||||
/**
|
||||
* Generates a round colored drawable with white initials.
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.chat;
|
||||
package org.mercury_im.messenger.android.ui.chat;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
|
@ -18,17 +18,16 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||
|
||||
import org.jxmpp.jid.EntityBareJid;
|
||||
import org.jxmpp.jid.impl.JidCreate;
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
import org.mercury_im.messenger.ui.roster.contacts.detail.ContactDetailActivity;
|
||||
import org.mercury_im.messenger.android.ui.roster.contacts.detail.ContactDetailActivity;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import io.reactivex.disposables.CompositeDisposable;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
|
||||
public class ChatActivity extends AppCompatActivity
|
||||
implements ChatInputFragment.OnChatInputActionListener, SearchView.OnQueryTextListener {
|
|
@ -1,9 +1,8 @@
|
|||
package org.mercury_im.messenger.ui.chat;
|
||||
package org.mercury_im.messenger.android.ui.chat;
|
||||
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.chat;
|
||||
package org.mercury_im.messenger.android.ui.chat;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
|
@ -1,15 +1,15 @@
|
|||
package org.mercury_im.messenger.ui.chat;
|
||||
package org.mercury_im.messenger.android.ui.chat;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import org.jxmpp.jid.EntityBareJid;
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.Messenger;
|
||||
import org.mercury_im.messenger.data.repository.DirectChatRepository;
|
||||
import org.mercury_im.messenger.data.repository.MessageRepository;
|
||||
import org.mercury_im.messenger.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.core.Messenger;
|
||||
import org.mercury_im.messenger.core.data.repository.DirectChatRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.MessageRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
import org.mercury_im.messenger.entity.message.Message;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.chat;
|
||||
package org.mercury_im.messenger.android.ui.chat;
|
||||
|
||||
import android.util.SparseBooleanArray;
|
||||
import android.view.LayoutInflater;
|
||||
|
@ -11,8 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.entity.message.Message;
|
||||
import org.mercury_im.messenger.entity.message.content.TextPayload;
|
||||
import org.mercury_im.messenger.ui.util.MessageBackgroundDrawable;
|
||||
import org.mercury_im.messenger.android.ui.util.MessageBackgroundDrawable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
|
@ -0,0 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.android.ui.chat;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.chatlist;
|
||||
package org.mercury_im.messenger.android.ui.chatlist;
|
||||
|
||||
|
||||
import android.os.Bundle;
|
||||
|
@ -16,7 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||
|
||||
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
|
||||
|
||||
import org.mercury_im.messenger.Messenger;
|
||||
import org.mercury_im.messenger.core.Messenger;
|
||||
import org.mercury_im.messenger.R;
|
||||
|
||||
import butterknife.BindView;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.chatlist;
|
||||
package org.mercury_im.messenger.android.ui.chatlist;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
@ -18,11 +18,9 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||
import org.jivesoftware.smack.util.Objects;
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
||||
import org.mercury_im.messenger.ui.avatar.AvatarDrawable;
|
||||
import org.mercury_im.messenger.ui.chat.ChatActivity;
|
||||
import org.mercury_im.messenger.ui.roster.contacts.detail.ContactDetailActivity;
|
||||
import org.mercury_im.messenger.ui.util.AbstractRecyclerViewAdapter;
|
||||
import org.mercury_im.messenger.util.ColorUtil;
|
||||
import org.mercury_im.messenger.android.ui.avatar.AvatarDrawable;
|
||||
import org.mercury_im.messenger.android.ui.chat.ChatActivity;
|
||||
import org.mercury_im.messenger.android.ui.util.AbstractRecyclerViewAdapter;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
|
@ -1,11 +1,11 @@
|
|||
package org.mercury_im.messenger.ui.chatlist;
|
||||
package org.mercury_im.messenger.android.ui.chatlist;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.data.repository.DirectChatRepository;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.core.data.repository.DirectChatRepository;
|
||||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
||||
|
||||
import java.util.ArrayList;
|
|
@ -0,0 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.android.ui.chatlist;
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.ui.chat;
|
||||
package org.mercury_im.messenger.android.ui;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster;
|
||||
package org.mercury_im.messenger.android.ui.roster;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
|
@ -15,8 +15,8 @@ import androidx.viewpager.widget.ViewPager;
|
|||
import com.google.android.material.tabs.TabLayout;
|
||||
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.ui.roster.bookmarks.BookmarkListFragment;
|
||||
import org.mercury_im.messenger.ui.roster.contacts.ContactListFragment;
|
||||
import org.mercury_im.messenger.android.ui.roster.bookmarks.BookmarkListFragment;
|
||||
import org.mercury_im.messenger.android.ui.roster.contacts.ContactListFragment;
|
||||
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.bookmarks;
|
||||
package org.mercury_im.messenger.android.ui.roster.bookmarks;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.contacts;
|
||||
package org.mercury_im.messenger.android.ui.roster.contacts;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
|
@ -23,10 +23,10 @@ import com.google.android.material.textfield.TextInputLayout;
|
|||
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jxmpp.stringprep.XmppStringprepException;
|
||||
import org.mercury_im.messenger.Messenger;
|
||||
import org.mercury_im.messenger.core.Messenger;
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.exception.ContactAlreadyAddedException;
|
||||
import org.mercury_im.messenger.core.exception.ContactAlreadyAddedException;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.contacts;
|
||||
package org.mercury_im.messenger.android.ui.roster.contacts;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
@ -7,7 +7,6 @@ import android.view.LayoutInflater;
|
|||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
@ -16,8 +15,6 @@ import com.google.android.material.floatingactionbutton.ExtendedFloatingActionBu
|
|||
|
||||
import org.mercury_im.messenger.R;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.contacts;
|
||||
package org.mercury_im.messenger.android.ui.roster.contacts;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
|
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
|
|||
import androidx.lifecycle.AndroidViewModel;
|
||||
import androidx.lifecycle.LiveData;
|
||||
|
||||
import org.mercury_im.messenger.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
|
||||
import javax.inject.Inject;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.contacts;
|
||||
package org.mercury_im.messenger.android.ui.roster.contacts;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
@ -13,11 +13,9 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
import org.mercury_im.messenger.ui.avatar.AvatarDrawable;
|
||||
import org.mercury_im.messenger.ui.chat.ChatActivity;
|
||||
import org.mercury_im.messenger.ui.roster.contacts.detail.ContactDetailActivity;
|
||||
import org.mercury_im.messenger.ui.util.AbstractRecyclerViewAdapter;
|
||||
import org.mercury_im.messenger.util.ColorUtil;
|
||||
import org.mercury_im.messenger.android.ui.avatar.AvatarDrawable;
|
||||
import org.mercury_im.messenger.android.ui.roster.contacts.detail.ContactDetailActivity;
|
||||
import org.mercury_im.messenger.android.ui.util.AbstractRecyclerViewAdapter;
|
||||
|
||||
import java.util.Objects;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.contacts;
|
||||
package org.mercury_im.messenger.android.ui.roster.contacts;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
@ -6,8 +6,8 @@ import androidx.lifecycle.LiveData;
|
|||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.Messenger;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.core.Messenger;
|
||||
import org.mercury_im.messenger.data.repository.XmppAccountRepository;
|
||||
import org.mercury_im.messenger.data.repository.XmppPeerRepository;
|
||||
import org.mercury_im.messenger.entity.Account;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.contacts.detail;
|
||||
package org.mercury_im.messenger.android.ui.roster.contacts.detail;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.widget.FrameLayout;
|
||||
|
@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
|
|||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.R;
|
||||
|
||||
import java.util.UUID;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.contacts.detail;
|
||||
package org.mercury_im.messenger.android.ui.roster.contacts.detail;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.Context;
|
||||
|
@ -23,10 +23,10 @@ import com.google.android.material.chip.Chip;
|
|||
import com.google.android.material.chip.ChipGroup;
|
||||
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
|
||||
|
||||
import org.mercury_im.messenger.Messenger;
|
||||
import org.mercury_im.messenger.core.Messenger;
|
||||
import org.mercury_im.messenger.R;
|
||||
import org.mercury_im.messenger.ui.chat.ChatActivity;
|
||||
import org.mercury_im.messenger.util.ColorUtil;
|
||||
import org.mercury_im.messenger.android.ui.chat.ChatActivity;
|
||||
import org.mercury_im.messenger.android.util.ColorUtil;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.roster.contacts.detail;
|
||||
package org.mercury_im.messenger.android.ui.roster.contacts.detail;
|
||||
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.util.Log;
|
||||
|
@ -7,7 +7,6 @@ import androidx.lifecycle.LiveData;
|
|||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import org.jivesoftware.smack.PresenceListener;
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.Presence;
|
||||
|
@ -18,18 +17,17 @@ import org.jivesoftware.smack.roster.RosterGroup;
|
|||
import org.jxmpp.jid.BareJid;
|
||||
import org.jxmpp.jid.Jid;
|
||||
import org.jxmpp.jid.impl.JidCreate;
|
||||
import org.mercury_im.messenger.MercuryImApplication;
|
||||
import org.mercury_im.messenger.Messenger;
|
||||
import org.mercury_im.messenger.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.android.MercuryImApplication;
|
||||
import org.mercury_im.messenger.core.Messenger;
|
||||
import org.mercury_im.messenger.core.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
import org.mercury_im.messenger.ui.avatar.AvatarDrawable;
|
||||
import org.mercury_im.messenger.util.CombinedPresenceListener;
|
||||
import org.mercury_im.messenger.android.ui.avatar.AvatarDrawable;
|
||||
import org.mercury_im.messenger.core.util.CombinedPresenceListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.android.ui.roster;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.settings;
|
||||
package org.mercury_im.messenger.android.ui.settings;
|
||||
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Bundle;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.settings;
|
||||
package org.mercury_im.messenger.android.ui.settings;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.Context;
|
|
@ -0,0 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.android.ui.settings;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.util;
|
||||
package org.mercury_im.messenger.android.ui.util;
|
||||
|
||||
import androidx.recyclerview.widget.DiffUtil;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.ui.util;
|
||||
package org.mercury_im.messenger.android.ui.util;
|
||||
|
||||
import org.mercury_im.messenger.R;
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.android.ui.util;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.util;
|
||||
package org.mercury_im.messenger.android.util;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Application;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.util;
|
||||
package org.mercury_im.messenger.android.util;
|
||||
|
||||
import androidx.recyclerview.widget.DiffUtil;
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.mercury_im.messenger.util;
|
||||
package org.mercury_im.messenger.android.util;
|
||||
|
||||
import androidx.annotation.ColorInt;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.util;
|
||||
package org.mercury_im.messenger.android.util;
|
||||
|
||||
import android.text.Editable;
|
||||
import android.text.TextWatcher;
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.ui.account;
|
||||
package org.mercury_im.messenger.android.util;
|
|
@ -1,4 +0,0 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.ui.chatlist;
|
|
@ -1,4 +0,0 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.ui;
|
|
@ -1,4 +0,0 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.ui.roster;
|
|
@ -1,4 +0,0 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.ui.settings;
|
|
@ -1,4 +0,0 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.ui.util;
|
|
@ -1,4 +0,0 @@
|
|||
/**
|
||||
* Some Javadoc information about the package.
|
||||
*/
|
||||
package org.mercury_im.messenger.util;
|
|
@ -5,7 +5,7 @@
|
|||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ui.chat.ChatActivity">
|
||||
tools:context=".android.ui.chat.ChatActivity">
|
||||
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
android:id="@+id/appbar_layout"
|
||||
|
@ -36,7 +36,7 @@
|
|||
|
||||
<fragment
|
||||
android:id="@+id/fragment_compose"
|
||||
android:name="org.mercury_im.messenger.ui.chat.ChatInputFragment"
|
||||
android:name="org.mercury_im.messenger.android.ui.chat.ChatInputFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ui.MainActivity">
|
||||
tools:context=".android.ui.MainActivity">
|
||||
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
android:id="@+id/appbar_layout"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginRight="16dp"
|
||||
app:layoutManager="LinearLayoutManager"
|
||||
tools:context="org.mercury_im.messenger.ui.account.AccountsFragment"
|
||||
tools:context=".android.ui.account.AccountsFragment"
|
||||
tools:listitem="@layout/list_item_account" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:scrollbars="vertical"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||
tools:context=".ui.roster.contacts.ContactListFragment"
|
||||
tools:context=".android.ui.roster.contacts.ContactListFragment"
|
||||
tools:listitem="@layout/list_item_chat" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
android:scrollbars="vertical"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||
tools:listitem="@layout/list_item_chat"
|
||||
tools:context=".ui.chatlist.ChatListFragment"/>
|
||||
tools:context=".android.ui.chatlist.ChatListFragment"/>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
|
||||
style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
android:scrollbars="vertical"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||
tools:listitem="@layout/list_item_contact"
|
||||
tools:context=".ui.roster.contacts.ContactListFragment"/>
|
||||
tools:context=".android.ui.roster.contacts.ContactListFragment"/>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
|
||||
style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context="org.mercury_im.messenger.ui.chat.ChatActivity">
|
||||
tools:context=".android.ui.chat.ChatActivity">
|
||||
|
||||
<item android:id="@+id/action_search"
|
||||
android:orderInCategory="0"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context="org.mercury_im.messenger.ui.MainActivity">
|
||||
tools:context=".android.ui.MainActivity">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_search"
|
||||
|
|
|
@ -3,17 +3,17 @@
|
|||
<!-- These settings headers are only used on tablets. -->
|
||||
|
||||
<header
|
||||
android:fragment="org.mercury_im.messenger.ui.settings.SettingsActivity$GeneralPreferenceFragment"
|
||||
android:fragment="org.mercury_im.messenger.android.ui.settings.SettingsActivity$GeneralPreferenceFragment"
|
||||
android:icon="@drawable/ic_info_black_24dp"
|
||||
android:title="@string/pref_header_general" />
|
||||
|
||||
<header
|
||||
android:fragment="org.mercury_im.messenger.ui.settings.SettingsActivity$NotificationPreferenceFragment"
|
||||
android:fragment="org.mercury_im.messenger.android.ui.settings.SettingsActivity$NotificationPreferenceFragment"
|
||||
android:icon="@drawable/ic_notifications_black_24dp"
|
||||
android:title="@string/pref_header_notifications" />
|
||||
|
||||
<header
|
||||
android:fragment="org.mercury_im.messenger.ui.settings.SettingsActivity$DataSyncPreferenceFragment"
|
||||
android:fragment="org.mercury_im.messenger.android.ui.settings.SettingsActivity$DataSyncPreferenceFragment"
|
||||
android:icon="@drawable/ic_sync_black_24dp"
|
||||
android:title="@string/pref_header_data_sync" />
|
||||
|
||||
|
|
|
@ -1,12 +1,6 @@
|
|||
package org.mercury_im.messenger;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mercury_im.messenger.core.connection.ConnectionState;
|
||||
|
||||
import io.reactivex.observers.TestObserver;
|
||||
import io.reactivex.schedulers.TestScheduler;
|
||||
import io.reactivex.subjects.BehaviorSubject;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
|
@ -24,12 +18,6 @@ public class ExampleUnitTest {
|
|||
|
||||
@Test
|
||||
public void test() {
|
||||
TestScheduler testScheduler = new TestScheduler();
|
||||
BehaviorSubject<ConnectionState> state = BehaviorSubject.createDefault(ConnectionState.DISCONNECTED);
|
||||
TestObserver<ConnectionState> observable = state.test();
|
||||
assertEquals(ConnectionState.DISCONNECTED, state.getValue());
|
||||
state.onNext(ConnectionState.CONNECTING);
|
||||
assertEquals(ConnectionState.CONNECTING, state.getValue());
|
||||
observable.assertValues(ConnectionState.DISCONNECTED, ConnectionState.CONNECTING).dispose();
|
||||
|
||||
}
|
||||
}
|
|
@ -6,20 +6,20 @@ import org.mercury_im.messenger.data.mapping.EntityCapsMapping;
|
|||
import org.mercury_im.messenger.data.mapping.GroupChatMapping;
|
||||
import org.mercury_im.messenger.data.mapping.MessageMapping;
|
||||
import org.mercury_im.messenger.data.mapping.PeerMapping;
|
||||
import org.mercury_im.messenger.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.data.repository.EntityCapsRepository;
|
||||
import org.mercury_im.messenger.data.repository.GroupChatRepository;
|
||||
import org.mercury_im.messenger.data.repository.MessageRepository;
|
||||
import org.mercury_im.messenger.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.data.repository.DirectChatRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.EntityCapsRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.GroupChatRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.MessageRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.DirectChatRepository;
|
||||
import org.mercury_im.messenger.data.repository.XmppEntityCapsRepository;
|
||||
import org.mercury_im.messenger.data.repository.Repositories;
|
||||
import org.mercury_im.messenger.core.data.repository.Repositories;
|
||||
import org.mercury_im.messenger.data.repository.XmppAccountRepository;
|
||||
import org.mercury_im.messenger.data.repository.XmppDirectChatRepository;
|
||||
import org.mercury_im.messenger.data.repository.XmppGroupChatRepository;
|
||||
import org.mercury_im.messenger.data.repository.XmppMessageRepository;
|
||||
import org.mercury_im.messenger.data.repository.XmppPeerRepository;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import javax.inject.Named;
|
||||
import javax.inject.Singleton;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package org.mercury_im.messenger.data.mapping;
|
||||
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
|
||||
import lombok.NonNull;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package org.mercury_im.messenger.data.mapping;
|
||||
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
|
||||
/**
|
||||
* Interface that defines a mapping between entities and database models.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import javax.inject.Named;
|
||||
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.core.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.data.mapping.AccountMapping;
|
||||
import org.mercury_im.messenger.data.model.AccountModel;
|
||||
import org.mercury_im.messenger.data.repository.dao.AccountDao;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.core.data.repository.DirectChatRepository;
|
||||
import org.mercury_im.messenger.data.mapping.DirectChatMapping;
|
||||
import org.mercury_im.messenger.data.model.DirectChatModel;
|
||||
import org.mercury_im.messenger.data.repository.dao.DirectChatDao;
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.core.data.repository.EntityCapsRepository;
|
||||
import org.mercury_im.messenger.data.mapping.EntityCapsMapping;
|
||||
import org.mercury_im.messenger.data.model.EntityCapsModel;
|
||||
import org.mercury_im.messenger.entity.caps.EntityCapsRecord;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
@ -16,8 +17,6 @@ import io.reactivex.Maybe;
|
|||
import io.reactivex.Observable;
|
||||
import io.reactivex.Scheduler;
|
||||
import io.requery.Persistable;
|
||||
import io.requery.query.Expression;
|
||||
import io.requery.query.ResultDelegate;
|
||||
import io.requery.reactivex.ReactiveEntityStore;
|
||||
import io.requery.reactivex.ReactiveResult;
|
||||
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.core.data.repository.GroupChatRepository;
|
||||
import org.mercury_im.messenger.data.mapping.GroupChatMapping;
|
||||
import org.mercury_im.messenger.data.model.GroupChatModel;
|
||||
import org.mercury_im.messenger.data.repository.dao.GroupChatDao;
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.entity.chat.GroupChat;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.core.data.repository.MessageRepository;
|
||||
import org.mercury_im.messenger.data.mapping.DirectChatMapping;
|
||||
import org.mercury_im.messenger.data.mapping.GroupChatMapping;
|
||||
import org.mercury_im.messenger.data.mapping.MessageMapping;
|
||||
|
@ -14,7 +15,7 @@ import org.mercury_im.messenger.data.repository.dao.MessageDao;
|
|||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
||||
import org.mercury_im.messenger.entity.chat.GroupChat;
|
||||
import org.mercury_im.messenger.entity.message.Message;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.core.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.core.data.repository.PeerRepository;
|
||||
import org.mercury_im.messenger.data.mapping.PeerMapping;
|
||||
import org.mercury_im.messenger.data.model.PeerModel;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
import org.mercury_im.messenger.entity.contact.SubscriptionDirection;
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
|
@ -22,8 +22,6 @@ import io.reactivex.Observable;
|
|||
import io.reactivex.Scheduler;
|
||||
import io.reactivex.Single;
|
||||
import io.requery.Persistable;
|
||||
import io.requery.query.Expression;
|
||||
import io.requery.query.LogicalCondition;
|
||||
import io.requery.query.ResultDelegate;
|
||||
import io.requery.reactivex.ReactiveEntityStore;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package org.mercury_im.messenger.data.di;
|
||||
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import javax.inject.Named;
|
||||
import javax.inject.Singleton;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger;
|
||||
package org.mercury_im.messenger.core;
|
||||
|
||||
public interface ClientStateListener {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package org.mercury_im.messenger;
|
||||
package org.mercury_im.messenger.core;
|
||||
|
||||
import org.mercury_im.messenger.listener.IncomingDirectMessageListener;
|
||||
import org.mercury_im.messenger.core.listener.IncomingDirectMessageListener;
|
||||
import org.mercury_im.messenger.entity.chat.Chat;
|
||||
import org.mercury_im.messenger.entity.message.Message;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger;
|
||||
package org.mercury_im.messenger.core;
|
||||
|
||||
import org.jivesoftware.smack.SmackConfiguration;
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
|
@ -9,12 +9,12 @@ import org.jivesoftware.smack.roster.RosterEntry;
|
|||
import org.jxmpp.jid.EntityBareJid;
|
||||
import org.jxmpp.jid.impl.JidCreate;
|
||||
import org.jxmpp.stringprep.XmppStringprepException;
|
||||
import org.mercury_im.messenger.data.repository.Repositories;
|
||||
import org.mercury_im.messenger.core.data.repository.Repositories;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
import org.mercury_im.messenger.exception.ConnectionNotFoundException;
|
||||
import org.mercury_im.messenger.exception.ContactAlreadyAddedException;
|
||||
import org.mercury_im.messenger.xmpp.MercuryConnection;
|
||||
import org.mercury_im.messenger.xmpp.MercuryConnectionManager;
|
||||
import org.mercury_im.messenger.core.exception.ConnectionNotFoundException;
|
||||
import org.mercury_im.messenger.core.exception.ContactAlreadyAddedException;
|
||||
import org.mercury_im.messenger.core.xmpp.MercuryConnection;
|
||||
import org.mercury_im.messenger.core.xmpp.MercuryConnectionManager;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Level;
|
|
@ -1,6 +1,6 @@
|
|||
package org.mercury_im.messenger;
|
||||
package org.mercury_im.messenger.core;
|
||||
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import javax.inject.Named;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.account.error;
|
||||
package org.mercury_im.messenger.core.account.error;
|
||||
|
||||
public enum PasswordError {
|
||||
emptyPassword,
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.account.error;
|
||||
package org.mercury_im.messenger.core.account.error;
|
||||
|
||||
public enum UsernameError {
|
||||
emptyUsername,
|
|
@ -1,7 +1,7 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
package org.mercury_im.messenger.core.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
|
@ -1,6 +1,6 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
package org.mercury_im.messenger.core.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
package org.mercury_im.messenger.core.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.entity.caps.EntityCapsRecord;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
package org.mercury_im.messenger.core.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.entity.chat.GroupChat;
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
package org.mercury_im.messenger.core.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
||||
import org.mercury_im.messenger.entity.chat.GroupChat;
|
|
@ -1,7 +1,6 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
package org.mercury_im.messenger.core.data.repository;
|
||||
|
||||
import org.mercury_im.messenger.store.MercuryRosterStore;
|
||||
import org.mercury_im.messenger.util.Optional;
|
||||
import org.mercury_im.messenger.core.util.Optional;
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.entity.contact.Peer;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.data.repository;
|
||||
package org.mercury_im.messenger.core.data.repository;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import javax.inject.Singleton;
|
|
@ -1,10 +1,10 @@
|
|||
package org.mercury_im.messenger.di.module;
|
||||
package org.mercury_im.messenger.core.di.module;
|
||||
|
||||
import org.mercury_im.messenger.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.viewmodel.accounts.AccountsViewModel;
|
||||
import org.mercury_im.messenger.viewmodel.accounts.LoginViewModel;
|
||||
import org.mercury_im.messenger.xmpp.MercuryConnectionManager;
|
||||
import org.mercury_im.messenger.core.data.repository.AccountRepository;
|
||||
import org.mercury_im.messenger.core.util.ThreadUtils;
|
||||
import org.mercury_im.messenger.core.viewmodel.accounts.AccountsViewModel;
|
||||
import org.mercury_im.messenger.core.viewmodel.accounts.LoginViewModel;
|
||||
import org.mercury_im.messenger.core.xmpp.MercuryConnectionManager;
|
||||
|
||||
import javax.inject.Named;
|
||||
import javax.inject.Singleton;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.exception;
|
||||
package org.mercury_im.messenger.core.exception;
|
||||
|
||||
import java.util.UUID;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.exception;
|
||||
package org.mercury_im.messenger.core.exception;
|
||||
|
||||
import org.jxmpp.jid.Jid;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.exception;
|
||||
package org.mercury_im.messenger.core.exception;
|
||||
|
||||
public class IllegalUsernameException extends RuntimeException {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.listener;
|
||||
package org.mercury_im.messenger.core.listener;
|
||||
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.entity.chat.DirectChat;
|
|
@ -1,4 +1,4 @@
|
|||
package org.mercury_im.messenger.listener;
|
||||
package org.mercury_im.messenger.core.listener;
|
||||
|
||||
import org.mercury_im.messenger.entity.Account;
|
||||
import org.mercury_im.messenger.entity.chat.GroupChat;
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue