Commit 9a5f4dca authored by Adrien Béraud's avatar Adrien Béraud Committed by Sébastien Blin
Browse files

rename lrc package to net.jami

Change-Id: I205233100c754e3c663bb5f22a8f36e18ec69ca8
parent ec7747f0
......@@ -85,7 +85,7 @@ make .gas
# Generate JNI interface
JNIDIR=$DAEMON_DIR/bin/jni
cd $JNIDIR
PACKAGEDIR=$ANDROID_APP_DIR/libringclient/src/main/java/cx/ring/daemon $JNIDIR/make-swig.sh
PACKAGEDIR=$ANDROID_APP_DIR/libringclient/src/main/java/net/jami/daemon $JNIDIR/make-swig.sh
# Setup cross-compilation build environemnt
export AR=$TOOLCHAIN/bin/llvm-ar
......
......@@ -29,6 +29,6 @@ tests/bin
/app/build/
/androidtv/build/
/libringclient/build/
/libringclient/src/main/java/cx/ring/daemon/*
/libringclient/src/main/java/net/jami/daemon/*
/build/
**/google-services.json
......@@ -15,8 +15,8 @@
public static final ** CREATOR;
}
-keep,includedescriptorclasses class cx.ring.** { *; }
-keepclassmembers class cx.ring.** { *; }
-keep,includedescriptorclasses class net.jami.daemon.** { *; }
-keepclassmembers class net.jami.daemon.** { *; }
# ORMLite
-keep class com.j256.**
......
......@@ -39,7 +39,7 @@ import cx.ring.R;
import cx.ring.client.HomeActivity;
import cx.ring.databinding.FragAboutBinding;
import cx.ring.mvp.BaseSupportFragment;
import cx.ring.mvp.RootPresenter;
import net.jami.mvp.RootPresenter;
public class AboutFragment extends BaseSupportFragment<RootPresenter> {
......
......@@ -23,7 +23,7 @@ import android.graphics.Bitmap;
import java.io.Serializable;
import cx.ring.mvp.AccountCreationModel;
import net.jami.mvp.AccountCreationModel;
import cx.ring.utils.BitmapUtils;
import ezvcard.VCard;
import ezvcard.property.FormattedName;
......
......@@ -22,9 +22,9 @@ package cx.ring.account;
import javax.inject.Inject;
import javax.inject.Named;
import cx.ring.model.Account;
import cx.ring.mvp.RootPresenter;
import cx.ring.services.AccountService;
import net.jami.model.Account;
import net.jami.mvp.RootPresenter;
import net.jami.services.AccountService;
import io.reactivex.Scheduler;
public class AccountEditionPresenter extends RootPresenter<AccountEditionView> {
......
......@@ -45,11 +45,14 @@ import cx.ring.application.JamiApplication;
import cx.ring.client.HomeActivity;
import cx.ring.fragments.AccountMigrationFragment;
import cx.ring.fragments.SIPAccountCreationFragment;
import cx.ring.model.Account;
import cx.ring.model.AccountConfig;
import net.jami.account.AccountWizardPresenter;
import net.jami.account.AccountWizardView;
import net.jami.model.Account;
import net.jami.model.AccountConfig;
import cx.ring.mvp.BaseActivity;
import cx.ring.mvp.AccountCreationModel;
import cx.ring.utils.VCardUtils;
import net.jami.mvp.AccountCreationModel;
import net.jami.utils.VCardUtils;
import ezvcard.VCard;
import io.reactivex.Single;
import io.reactivex.schedulers.Schedulers;
......
......@@ -33,6 +33,9 @@ import androidx.fragment.app.Fragment;
import com.google.android.material.snackbar.Snackbar;
import net.jami.account.HomeAccountCreationPresenter;
import net.jami.account.HomeAccountCreationView;
import cx.ring.R;
import cx.ring.application.JamiApplication;
import cx.ring.databinding.FragAccHomeCreateBinding;
......
......@@ -33,7 +33,10 @@ import androidx.annotation.Nullable;
import cx.ring.application.JamiApplication;
import cx.ring.databinding.FragAccJamiConnectBinding;
import cx.ring.mvp.AccountCreationModel;
import net.jami.account.JamiAccountConnectPresenter;
import net.jami.account.JamiConnectAccountView;
import net.jami.mvp.AccountCreationModel;
import cx.ring.mvp.BaseSupportFragment;
public class JamiAccountConnectFragment extends BaseSupportFragment<JamiAccountConnectPresenter> implements JamiConnectAccountView {
......@@ -63,7 +66,7 @@ public class JamiAccountConnectFragment extends BaseSupportFragment<JamiAccountC
}
@Override
protected void initPresenter(JamiAccountConnectPresenter presenter) {
protected void initPresenter(net.jami.account.JamiAccountConnectPresenter presenter) {
presenter.init(model);
}
......
......@@ -36,7 +36,8 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import cx.ring.databinding.FragAccJamiCreateBinding;
import cx.ring.mvp.AccountCreationModel;
import net.jami.mvp.AccountCreationModel;
import cx.ring.views.WizardViewPager;
public class JamiAccountCreationFragment extends Fragment {
......
......@@ -36,7 +36,10 @@ import androidx.annotation.Nullable;
import cx.ring.R;
import cx.ring.application.JamiApplication;
import cx.ring.databinding.FragAccJamiPasswordBinding;
import cx.ring.mvp.AccountCreationModel;
import net.jami.account.JamiAccountCreationPresenter;
import net.jami.account.JamiAccountCreationView;
import net.jami.mvp.AccountCreationModel;
import cx.ring.mvp.BaseSupportFragment;
public class JamiAccountPasswordFragment extends BaseSupportFragment<JamiAccountCreationPresenter>
......
......@@ -71,14 +71,17 @@ import cx.ring.fragments.GeneralAccountFragment;
import cx.ring.fragments.LinkDeviceFragment;
import cx.ring.fragments.MediaPreferenceFragment;
import cx.ring.fragments.QRCodeFragment;
import cx.ring.model.Account;
import net.jami.account.JamiAccountSummaryPresenter;
import net.jami.account.JamiAccountSummaryView;
import net.jami.model.Account;
import cx.ring.mvp.BaseSupportFragment;
import cx.ring.settings.AccountFragment;
import cx.ring.settings.SettingsFragment;
import cx.ring.utils.AndroidFileUtils;
import cx.ring.utils.BitmapUtils;
import cx.ring.utils.ContentUriHandler;
import cx.ring.utils.StringUtils;
import net.jami.utils.StringUtils;
import cx.ring.views.AvatarDrawable;
import cx.ring.views.SwitchButton;
import io.reactivex.Single;
......
......@@ -21,7 +21,6 @@ package cx.ring.account;
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.Editable;
import android.text.InputFilter;
......@@ -42,7 +41,10 @@ import com.google.android.material.textfield.TextInputLayout;
import cx.ring.R;
import cx.ring.application.JamiApplication;
import cx.ring.databinding.FragAccJamiUsernameBinding;
import cx.ring.mvp.AccountCreationModel;
import net.jami.account.JamiAccountCreationPresenter;
import net.jami.account.JamiAccountCreationView;
import net.jami.mvp.AccountCreationModel;
import cx.ring.mvp.BaseSupportFragment;
import cx.ring.utils.RegisteredNameFilter;
......
......@@ -19,16 +19,12 @@
*/
package cx.ring.account;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.NonNull;
......@@ -38,11 +34,9 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import cx.ring.R;
import cx.ring.application.JamiApplication;
import cx.ring.databinding.FragAccJamiLinkBinding;
import cx.ring.mvp.BaseSupportFragment;
import cx.ring.mvp.AccountCreationModel;
import net.jami.mvp.AccountCreationModel;
public class JamiLinkAccountFragment extends BaseSupportFragment {
......
......@@ -36,7 +36,10 @@ import androidx.annotation.Nullable;
import cx.ring.R;
import cx.ring.application.JamiApplication;
import cx.ring.databinding.FragAccJamiLinkPasswordBinding;
import cx.ring.mvp.AccountCreationModel;
import net.jami.account.JamiLinkAccountPresenter;
import net.jami.account.JamiLinkAccountView;
import net.jami.mvp.AccountCreationModel;
import cx.ring.mvp.BaseSupportFragment;
public class JamiLinkAccountPasswordFragment extends BaseSupportFragment<JamiLinkAccountPresenter>
......@@ -105,7 +108,7 @@ public class JamiLinkAccountPasswordFragment extends BaseSupportFragment<JamiLin
}
@Override
protected void initPresenter(JamiLinkAccountPresenter presenter) {
protected void initPresenter(net.jami.account.JamiLinkAccountPresenter presenter) {
presenter.init(model);
}
......
......@@ -47,8 +47,11 @@ import java.io.IOException;
import cx.ring.R;
import cx.ring.application.JamiApplication;
import cx.ring.databinding.FragAccProfileCreateBinding;
import cx.ring.model.Account;
import cx.ring.mvp.AccountCreationModel;
import net.jami.account.ProfileCreationPresenter;
import net.jami.account.ProfileCreationView;
import net.jami.model.Account;
import net.jami.mvp.AccountCreationModel;
import cx.ring.mvp.BaseSupportFragment;
import cx.ring.utils.AndroidFileUtils;
import cx.ring.utils.ContentUriHandler;
......
......@@ -39,7 +39,7 @@ import androidx.fragment.app.DialogFragment;
import cx.ring.R;
import cx.ring.application.JamiApplication;
import cx.ring.databinding.FragRegisterNameBinding;
import cx.ring.services.AccountService;
import net.jami.services.AccountService;
import cx.ring.utils.RegisteredNameFilter;
import cx.ring.utils.RegisteredNameTextWatcher;
import io.reactivex.Scheduler;
......
......@@ -14,8 +14,8 @@ import java.util.List;
import cx.ring.contacts.AvatarFactory;
import cx.ring.databinding.ItemConferenceParticipantBinding;
import cx.ring.fragments.CallFragment;
import cx.ring.model.CallContact;
import cx.ring.model.SipCall;
import net.jami.model.CallContact;
import net.jami.model.SipCall;
import cx.ring.views.ParticipantView;
public class ConfParticipantAdapter extends RecyclerView.Adapter<ParticipantView> {
......
......@@ -75,24 +75,24 @@ import java.util.concurrent.TimeUnit;
import cx.ring.R;
import cx.ring.client.MediaViewerActivity;
import cx.ring.conversation.ConversationPresenter;
import net.jami.conversation.ConversationPresenter;
import cx.ring.fragments.ConversationFragment;
import cx.ring.model.Account;
import cx.ring.model.CallContact;
import cx.ring.model.ContactEvent;
import cx.ring.model.DataTransfer;
import cx.ring.model.Interaction;
import cx.ring.model.Interaction.InteractionStatus;
import cx.ring.model.Interaction.InteractionType;
import cx.ring.model.SipCall;
import cx.ring.model.TextMessage;
import net.jami.model.Account;
import net.jami.model.CallContact;
import net.jami.model.ContactEvent;
import net.jami.model.DataTransfer;
import net.jami.model.Interaction;
import net.jami.model.Interaction.InteractionStatus;
import net.jami.model.Interaction.InteractionType;
import net.jami.model.SipCall;
import net.jami.model.TextMessage;
import cx.ring.service.DRingService;
import cx.ring.utils.AndroidFileUtils;
import cx.ring.utils.ContentUriHandler;
import cx.ring.utils.GlideApp;
import cx.ring.utils.GlideOptions;
import cx.ring.utils.ResourceMapper;
import cx.ring.utils.StringUtils;
import net.jami.utils.StringUtils;
import cx.ring.views.ConversationViewHolder;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
......
......@@ -32,8 +32,8 @@ import android.widget.TextView;
import java.util.ArrayList;
import cx.ring.R;
import cx.ring.model.CallContact;
import cx.ring.model.Phone;
import net.jami.model.CallContact;
import net.jami.model.Phone;
public class NumberAdapter extends BaseAdapter {
final private Context mContext;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment