Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'checkStyle' of adiaholic/Mercury-IM into master

This commit is contained in:
Paul Schaub 2019-09-13 11:13:15 +02:00 committed by Gitea
parent f74d074a0e 705c7c2ec0
commit 09e632e1d7
32 changed files with 127 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java
View File

@ -7,9 +7,7 @@ import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import org.jivesoftware.smackx.csi.ClientStateIndicationManager;
import org.mercury_im.messenger.core.centers.ConnectionCenter;
import org.mercury_im.messenger.core.connection.MercuryConfiguration;
import org.mercury_im.messenger.di.component.AppComponent;

4
app/src/main/java/org/mercury_im/messenger/di/component/AppComponent.java
View File

@ -1,5 +1,7 @@
package org.mercury_im.messenger.di.component;
import dagger.Component;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.core.stores.PlainMessageStore;
import org.mercury_im.messenger.di.module.AppModule;
@ -19,8 +21,6 @@ import org.mercury_im.messenger.ui.roster.RosterViewModel;
import javax.inject.Singleton;
import dagger.Component;
/**
* Main Application Component that binds together all the modules needed for the Android
* application.

6
app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java
View File

@ -2,14 +2,14 @@ package org.mercury_im.messenger.di.module;
import android.app.Application;
import dagger.Module;
import dagger.Provides;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.core.di.CenterModule;
import javax.inject.Singleton;
import dagger.Module;
import dagger.Provides;
@Module(includes = CenterModule.class)
public class AppModule {

4
app/src/main/java/org/mercury_im/messenger/service/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.service;

6
app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java
View File

@ -10,6 +10,9 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.FragmentTransaction;
import butterknife.BindView;
import butterknife.ButterKnife;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.navigation.NavigationView;
@ -26,9 +29,6 @@ import org.mercury_im.messenger.ui.settings.SettingsActivity;
import javax.inject.Inject;
import butterknife.BindView;
import butterknife.ButterKnife;
public class MainActivity extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener,
AccountsFragment.OnAccountListItemClickListener {

21
app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java
View File

@ -14,23 +14,26 @@ import androidx.lifecycle.ViewModelProviders;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.chat2.ChatManager;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.impl.JidCreate;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.R;
import org.mercury_im.messenger.core.centers.ConnectionCenter;
import org.mercury_im.messenger.persistence.repository.ChatRepository;
import javax.inject.Inject;
import java.util.logging.Level;
import java.util.logging.Logger;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.Scheduler;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;
import javax.inject.Inject;
public class ChatActivity extends AppCompatActivity
implements ChatInputFragment.OnChatInputActionListener, SearchView.OnQueryTextListener {
@ -192,9 +195,9 @@ public class ChatActivity extends AppCompatActivity
ChatManager.getInstanceFor(connectionCenter.getConnection(accountId).getConnection())
.chatWith(jid).send(msg);
} catch (SmackException.NotConnectedException e) {
e.printStackTrace();
Logger.getAnonymousLogger().log(Level.SEVERE,"NotConnectedException : \n" + e.getStackTrace().toString());
} catch (InterruptedException e) {
e.printStackTrace();
Logger.getAnonymousLogger().log(Level.SEVERE,"InterruptedException" + e.getStackTrace().toString());
}
}
}.start();

16
app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java
View File

@ -1,28 +1,26 @@
package org.mercury_im.messenger.ui.chat;
import androidx.lifecycle.ViewModelProviders;
import static org.mercury_im.messenger.MercuryImApplication.TAG;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.Toast;
import org.mercury_im.messenger.R;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import static org.mercury_im.messenger.MercuryImApplication.TAG;
import org.mercury_im.messenger.R;
public class ChatInputFragment extends Fragment implements View.OnClickListener {
@ -69,7 +67,7 @@ public class ChatInputFragment extends Fragment implements View.OnClickListener
* @param viewModel ViewModel
*/
private void observeViewModel(ChatInputViewModel viewModel) {
//viewModel.getDraft().observe(ChatInputFragment.this, draft -> textInput.setText(draft));
// viewModel.getDraft().observe(ChatInputFragment.this, draft -> textInput.setText(draft));
}
/**

1
app/src/main/java/org/mercury_im/messenger/ui/chat/ChatRecyclerViewAdapter.java
View File

@ -1,6 +1,5 @@
package org.mercury_im.messenger.ui.chat;
import android.text.util.Linkify;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

13
app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java
View File

@ -4,6 +4,12 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import io.reactivex.Completable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import org.jxmpp.jid.EntityBareJid;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.core.centers.ConnectionCenter;
@ -19,13 +25,6 @@ import java.util.List;
import javax.inject.Inject;
import io.reactivex.Completable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.functions.Action;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
public class ChatViewModel extends ViewModel {
private final CompositeDisposable disposable = new CompositeDisposable();

4
app/src/main/java/org/mercury_im/messenger/ui/chat/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.ui.chat;

6
app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java
View File

@ -1,5 +1,7 @@
package org.mercury_im.messenger.ui.chatlist;
import static org.mercury_im.messenger.MercuryImApplication.TAG;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
@ -13,12 +15,10 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;
import androidx.recyclerview.widget.RecyclerView;
import org.mercury_im.messenger.R;
import butterknife.BindView;
import butterknife.ButterKnife;
import static org.mercury_im.messenger.MercuryImApplication.TAG;
import org.mercury_im.messenger.R;
public class ChatListFragment extends Fragment {

10
app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java
View File

@ -8,14 +8,14 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import org.mercury_im.messenger.R;
import org.mercury_im.messenger.persistence.pojo.Chat;
import org.mercury_im.messenger.ui.util.AbstractRecyclerViewAdapter;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.hdodenhof.circleimageview.CircleImageView;
import org.mercury_im.messenger.R;
import org.mercury_im.messenger.persistence.pojo.Chat;
import org.mercury_im.messenger.ui.util.AbstractRecyclerViewAdapter;
public class ChatListRecyclerViewAdapter
extends AbstractRecyclerViewAdapter<Chat, ChatListRecyclerViewAdapter.ChatHolder> {
@ -60,7 +60,7 @@ public class ChatListRecyclerViewAdapter
private static class ChatMessageDiffCallback extends AbstractDiffCallback<Chat> {
public ChatMessageDiffCallback(boolean detectMoves) {
ChatMessageDiffCallback(boolean detectMoves) {
super(detectMoves);
}

21
app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java
View File

@ -4,22 +4,21 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.persistence.model.ChatModel;
import org.mercury_im.messenger.persistence.model.MessageModel;
import org.mercury_im.messenger.persistence.repository.ChatRepository;
import org.mercury_im.messenger.persistence.repository.MessageRepository;
import org.mercury_im.messenger.persistence.pojo.Chat;
import java.util.List;
import javax.inject.Inject;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.persistence.model.MessageModel;
import org.mercury_im.messenger.persistence.pojo.Chat;
import org.mercury_im.messenger.persistence.repository.ChatRepository;
import org.mercury_im.messenger.persistence.repository.MessageRepository;
import java.util.List;
import javax.inject.Inject;
public class ChatListViewModel extends ViewModel {
@Inject

4
app/src/main/java/org/mercury_im/messenger/ui/chatlist/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.ui.chatlist;

4
app/src/main/java/org/mercury_im/messenger/ui/login/AccountsActivity.java
View File

@ -8,6 +8,8 @@ import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import io.reactivex.schedulers.Schedulers;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.R;
import org.mercury_im.messenger.persistence.model.AccountModel;
@ -15,8 +17,6 @@ import org.mercury_im.messenger.persistence.repository.AccountRepository;
import javax.inject.Inject;
import io.reactivex.schedulers.Schedulers;
public class AccountsActivity extends AppCompatActivity
implements AccountsFragment.OnAccountListItemClickListener {

4
app/src/main/java/org/mercury_im/messenger/ui/login/AccountsRecyclerViewAdapter.java
View File

@ -10,6 +10,8 @@ import android.widget.TextView;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView;
import de.hdodenhof.circleimageview.CircleImageView;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.R;
import org.mercury_im.messenger.persistence.model.AccountModel;
@ -19,8 +21,6 @@ import org.mercury_im.messenger.util.AbstractDiffCallback;
import java.util.ArrayList;
import java.util.List;
import de.hdodenhof.circleimageview.CircleImageView;
public class AccountsRecyclerViewAdapter extends RecyclerView.Adapter<AccountsRecyclerViewAdapter.ViewHolder> {
private final List<AccountModel> mValues;

10
app/src/main/java/org/mercury_im/messenger/ui/login/AccountsViewModel.java
View File

@ -4,6 +4,11 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.core.centers.ConnectionCenter;
import org.mercury_im.messenger.persistence.model.AccountModel;
@ -13,11 +18,6 @@ import java.util.List;
import javax.inject.Inject;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
public class AccountsViewModel extends ViewModel {
@Inject

6
app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java
View File

@ -9,9 +9,11 @@ import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
import butterknife.BindView;
import butterknife.ButterKnife;
import com.google.android.material.textfield.TextInputEditText;
import org.mercury_im.messenger.MercuryImApplication;
@ -19,8 +21,6 @@ import org.mercury_im.messenger.R;
import org.mercury_im.messenger.persistence.model.AccountModel;
import org.mercury_im.messenger.util.TextChangedListener;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* A login screen that offers login via email/password.

15
app/src/main/java/org/mercury_im/messenger/ui/login/LoginViewModel.java
View File

@ -1,5 +1,7 @@
package org.mercury_im.messenger.ui.login;
import static org.mercury_im.messenger.core.connection.MercuryConnection.TAG;
import android.text.TextUtils;
import android.util.Log;
@ -8,6 +10,11 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.observers.DisposableSingleObserver;
import io.reactivex.schedulers.Schedulers;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.impl.JidCreate;
import org.mercury_im.messenger.MercuryImApplication;
@ -18,14 +25,6 @@ import org.mercury_im.messenger.persistence.room.model.RoomAccountModel;
import javax.inject.Inject;
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.observers.DisposableSingleObserver;
import io.reactivex.schedulers.Schedulers;
import static org.mercury_im.messenger.core.connection.MercuryConnection.TAG;
public class LoginViewModel extends ViewModel {
@Inject

4
app/src/main/java/org/mercury_im/messenger/ui/login/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.ui.login;

4
app/src/main/java/org/mercury_im/messenger/ui/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.ui;

8
app/src/main/java/org/mercury_im/messenger/ui/roster/RosterFragment.java
View File

@ -1,5 +1,7 @@
package org.mercury_im.messenger.ui.roster;
import static androidx.constraintlayout.widget.Constraints.TAG;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
@ -11,14 +13,10 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;
import androidx.recyclerview.widget.RecyclerView;
import org.mercury_im.messenger.R;
import java.util.ArrayList;
import butterknife.BindView;
import butterknife.ButterKnife;
import static androidx.constraintlayout.widget.Constraints.TAG;
import org.mercury_im.messenger.R;
/**
* A placeholder fragment containing a simple view.

16
app/src/main/java/org/mercury_im/messenger/ui/roster/RosterRecyclerViewAdapter.java
View File

@ -2,34 +2,28 @@ package org.mercury_im.messenger.ui.roster;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityOptionsCompat;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.hdodenhof.circleimageview.CircleImageView;
import org.jivesoftware.smackx.colors.ConsistentColor;
import org.jxmpp.jid.EntityBareJid;
import org.mercury_im.messenger.R;
import org.mercury_im.messenger.persistence.model.ContactModel;
import org.mercury_im.messenger.persistence.room.model.RoomContactModel;
import org.mercury_im.messenger.ui.chat.ChatActivity;
import org.mercury_im.messenger.ui.util.AbstractRecyclerViewAdapter;
import org.mercury_im.messenger.util.ColorUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.hdodenhof.circleimageview.CircleImageView;
public class RosterRecyclerViewAdapter
extends AbstractRecyclerViewAdapter<RoomContactModel, RosterRecyclerViewAdapter.RosterItemViewHolder> {
@ -91,7 +85,7 @@ public class RosterRecyclerViewAdapter
private static class ContactDiffCallback extends AbstractDiffCallback<RoomContactModel> {
public ContactDiffCallback() {
ContactDiffCallback() {
super(true);
}

9
app/src/main/java/org/mercury_im/messenger/ui/roster/RosterViewModel.java
View File

@ -6,6 +6,11 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import org.mercury_im.messenger.MercuryImApplication;
import org.mercury_im.messenger.persistence.model.ContactModel;
import org.mercury_im.messenger.persistence.repository.RosterRepository;
@ -15,10 +20,6 @@ import java.util.List;
import javax.inject.Inject;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
public class RosterViewModel extends ViewModel {

4
app/src/main/java/org/mercury_im/messenger/ui/roster/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.ui.roster;

7
app/src/main/java/org/mercury_im/messenger/ui/settings/AppCompatPreferenceActivity.java
View File

@ -3,14 +3,15 @@ package org.mercury_im.messenger.ui.settings;
import android.content.res.Configuration;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.LayoutRes;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.Toolbar;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls

3
app/src/main/java/org/mercury_im/messenger/ui/settings/SettingsActivity.java
View File

@ -12,13 +12,14 @@ import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import androidx.appcompat.app.ActionBar;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.preference.RingtonePreference;
import android.text.TextUtils;
import android.view.MenuItem;
import androidx.appcompat.app.ActionBar;
import org.mercury_im.messenger.R;
import java.util.List;

4
app/src/main/java/org/mercury_im/messenger/ui/settings/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.ui.settings;

2
app/src/main/java/org/mercury_im/messenger/ui/util/AbstractRecyclerViewAdapter.java
View File

@ -36,7 +36,7 @@ public abstract class AbstractRecyclerViewAdapter<M, VH extends RecyclerView.Vie
return models.size();
}
public static abstract class AbstractDiffCallback<I> extends DiffUtil.Callback {
public abstract static class AbstractDiffCallback<I> extends DiffUtil.Callback {
private List<I> oldData;
private List<I> newData;

4
app/src/main/java/org/mercury_im/messenger/ui/util/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.ui.util;

2
app/src/main/java/org/mercury_im/messenger/util/ColorUtil.java
View File

@ -149,7 +149,7 @@ public class ColorUtil {
* * Android developer reference: Color - Decoding</a>
*/
public static int blue(@ColorInt int color) {
return (color ) & 0xff;
return (color) & 0xff;
}
/**

4
app/src/main/java/org/mercury_im/messenger/util/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Some Javadoc information about the package.
*/
package org.mercury_im.messenger.util;