From 29ac68dc9d6435aea1a6a8dc7299de6fa5285b9b Mon Sep 17 00:00:00 2001 From: BoykoDmytro Date: Wed, 5 Jul 2017 15:54:16 +0300 Subject: [PATCH] refactor models --- .../ninja/mobile/data/models/mqtt/Auth.java | 37 +++++++++---------- .../data/models/mqtt/BaseModelMQQT.java | 2 +- .../mobile/data/models/mqtt/Contact.java | 24 ++++++++++++ .../mobile/data/models/mqtt/DeleteUser.java | 2 +- .../mobile/data/models/mqtt/InitModel.java | 33 ++++------------- .../com/ninja/mobile/data/models/mqtt/Io.java | 2 +- .../com/ninja/mobile/data/models/mqtt/Ok.java | 19 ++++++++++ .../ninja/mobile/data/models/mqtt/Person.java | 26 +++++++++++++ .../mobile/data/models/mqtt/Profile.java | 24 ++++++++++++ .../mobile/data/models/mqtt/ResendSms.java | 2 +- .../ninja/mobile/data/models/mqtt/Room.java | 23 ++++++++++++ .../ninja/mobile/data/models/mqtt/Roster.java | 28 ++++++++++++++ .../ninja/mobile/data/models/mqtt/Token.java | 2 +- .../ninja/mobile/data/models/mqtt/Verify.java | 2 +- .../mobile/data/models/right_models/Auth.java | 17 --------- .../data/models/right_models/Contact.java | 15 -------- .../mobile/data/models/right_models/Io.java | 11 ------ .../mobile/data/models/right_models/Ok.java | 10 ----- .../data/models/right_models/Person.java | 17 --------- .../data/models/right_models/Profile.java | 15 -------- .../mobile/data/models/right_models/Room.java | 14 ------- .../data/models/right_models/Roster.java | 19 ---------- .../models/{ => temp_models}/Account.java | 2 +- .../models/{ => temp_models}/Country.java | 8 ++-- .../data/models/{ => temp_models}/Person.java | 2 +- .../data/models/{ => temp_models}/Phone.java | 2 +- .../data/models/{ => temp_models}/Room.java | 2 +- .../data/models/{ => temp_models}/Roster.java | 2 +- .../data/models/{ => temp_models}/User.java | 13 +------ .../ninja/mobile/data/server/PahoService.java | 14 +++++-- .../ninja/mobile/intetfaces/APIManager.java | 2 +- .../mvp/presenters/EditProfilePresenter.java | 2 +- .../mvp/presenters/UserProfilePresenter.java | 2 +- .../mobile/mvp/view/EditProfileView.java | 2 +- .../mobile/mvp/view/UserProfileView.java | 2 +- .../ui/activities/EditProfileActivity.java | 2 +- .../activities/QRCodeGeneratorActivity.java | 4 +- .../profile/EditProfileFragment.java | 2 +- .../fragments/profile/MyProfileFragment.java | 6 +-- .../profile/UserProfileFragment.java | 4 +- 40 files changed, 208 insertions(+), 209 deletions(-) create mode 100644 app/src/main/java/com/ninja/mobile/data/models/mqtt/Contact.java create mode 100644 app/src/main/java/com/ninja/mobile/data/models/mqtt/Ok.java create mode 100644 app/src/main/java/com/ninja/mobile/data/models/mqtt/Person.java create mode 100644 app/src/main/java/com/ninja/mobile/data/models/mqtt/Profile.java create mode 100644 app/src/main/java/com/ninja/mobile/data/models/mqtt/Room.java create mode 100644 app/src/main/java/com/ninja/mobile/data/models/mqtt/Roster.java delete mode 100644 app/src/main/java/com/ninja/mobile/data/models/right_models/Auth.java delete mode 100644 app/src/main/java/com/ninja/mobile/data/models/right_models/Contact.java delete mode 100644 app/src/main/java/com/ninja/mobile/data/models/right_models/Io.java delete mode 100644 app/src/main/java/com/ninja/mobile/data/models/right_models/Ok.java delete mode 100644 app/src/main/java/com/ninja/mobile/data/models/right_models/Person.java delete mode 100644 app/src/main/java/com/ninja/mobile/data/models/right_models/Profile.java delete mode 100644 app/src/main/java/com/ninja/mobile/data/models/right_models/Room.java delete mode 100644 app/src/main/java/com/ninja/mobile/data/models/right_models/Roster.java rename app/src/main/java/com/ninja/mobile/data/models/{ => temp_models}/Account.java (97%) rename app/src/main/java/com/ninja/mobile/data/models/{ => temp_models}/Country.java (94%) rename app/src/main/java/com/ninja/mobile/data/models/{ => temp_models}/Person.java (97%) rename app/src/main/java/com/ninja/mobile/data/models/{ => temp_models}/Phone.java (94%) rename app/src/main/java/com/ninja/mobile/data/models/{ => temp_models}/Room.java (96%) rename app/src/main/java/com/ninja/mobile/data/models/{ => temp_models}/Roster.java (97%) rename app/src/main/java/com/ninja/mobile/data/models/{ => temp_models}/User.java (84%) diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Auth.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Auth.java index b0de22dfbf..3adf44a97d 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Auth.java +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Auth.java @@ -6,18 +6,15 @@ import com.ninja.mobile.data.server.bert.BertTuple; import java.util.List; public class Auth extends BaseModelMQQT { - private String Token; - private String UserId; - private String Phone; - private String DevKey; - private String Type; - private String SmsCode; - private String Attempts; - private String Services; - public void setPhone(String phone) { - Phone = phone; - } + public String token; + public String user_id; + public String phone; + public String dev_key; + public String type; + public String sms_code; + public long attempts; + public String services; @Override public Auth decode(BertTuple mqttMessage) { return null; @@ -25,15 +22,15 @@ public class Auth extends BaseModelMQQT { @Override public List encode() { List list = new BertTuple(); - list.add(Name); - list.add(Token); - list.add(UserId); - list.add(Phone); - list.add(DevKey); - list.add(Type); - list.add(SmsCode); - list.add(Attempts); - list.add(Services); + list.add(name); + list.add(token); + list.add(user_id); + list.add(phone); + list.add(dev_key); + list.add(type); + list.add(sms_code); + list.add(attempts); + list.add(services); return list; } } diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/BaseModelMQQT.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/BaseModelMQQT.java index 55f928cc60..d531b862ab 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/mqtt/BaseModelMQQT.java +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/BaseModelMQQT.java @@ -10,7 +10,7 @@ import com.ninja.mobile.data.server.bert.BertTuple; public abstract class BaseModelMQQT { - public BertAtom Name = new BertAtom(name()); + public BertAtom name = new BertAtom(name()); protected String name(){ return getClass().getSimpleName(); diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Contact.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Contact.java new file mode 100644 index 0000000000..3790518e40 --- /dev/null +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Contact.java @@ -0,0 +1,24 @@ +package com.ninja.mobile.data.models.mqtt; + +import com.ninja.mobile.data.server.bert.BertTuple; + +public class Contact extends BaseModelMQQT{ + + public long id; + public String phone; + public String names; + public String surnames; + public String status; + public long person_id; + + public Contact() { + } + + @Override public Contact decode(BertTuple bertTuple) { + return null; + } + + @Override public Object encode() { + return null; + } +} diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/DeleteUser.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/DeleteUser.java index 6e1f3c5824..ae75d86ac9 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/mqtt/DeleteUser.java +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/DeleteUser.java @@ -27,7 +27,7 @@ public class DeleteUser extends BaseModelMQQT { @Override public List encode() { BertTuple objects = new BertTuple(); - objects.add(Name); + objects.add(name); objects.add(phone); return objects; } diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/InitModel.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/InitModel.java index 2f960427a4..2f1e1e9de2 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/mqtt/InitModel.java +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/InitModel.java @@ -1,37 +1,18 @@ package com.ninja.mobile.data.models.mqtt; -import com.ninja.mobile.data.server.bert.BertDecoder; import com.ninja.mobile.data.server.bert.BertTuple; -import java.lang.reflect.Field; +public class InitModel extends BaseModelMQQT{ -public class InitModel { + public int vnode_max; - private int vnode_max; - - public InitModel(byte[] obj) { - } - - public int getVnodeMax() { - return vnode_max; + @Override public InitModel decode(BertTuple bertTuple) { + vnode_max = (int) bertTuple.get(1); + return this; } - public void decode(byte[] obj) { - try { - Object o = BertDecoder.setupDecoder().decodeAny(obj); - if (o instanceof BertTuple) { - BertTuple objects = (BertTuple) o; - Field[] declaredFields = getClass().getDeclaredFields(); - for (Field field : declaredFields) { - if (field.getName().equalsIgnoreCase(objects.get(0).toString())) { - field.setAccessible(true); - field.set(this, objects.get(1)); - } - } - } - } catch (Exception e) { - e.printStackTrace(); - } + @Override public Object encode() { + return null; } } diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Io.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Io.java index 595639a875..136bbfea72 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Io.java +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Io.java @@ -27,7 +27,7 @@ public class Io extends BaseModelMQQT{ @Override public List encode() { return new ArrayList(){ { - add(Name); + add(name); add(code); add(data); } diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Ok.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Ok.java new file mode 100644 index 0000000000..9eddae386d --- /dev/null +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Ok.java @@ -0,0 +1,19 @@ +package com.ninja.mobile.data.models.mqtt; + +import com.ninja.mobile.data.server.bert.BertTuple; + +public class Ok extends BaseModelMQQT{ + + public Object data; + + public Ok() { + } + + @Override public Ok decode(BertTuple bertTuple) { + return null; + } + + @Override public Object encode() { + return null; + } +} diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Person.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Person.java new file mode 100644 index 0000000000..ecaf808e4c --- /dev/null +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Person.java @@ -0,0 +1,26 @@ +package com.ninja.mobile.data.models.mqtt; + +import com.ninja.mobile.data.server.bert.BertTuple; + +import java.util.List; + +public class Person extends BaseModelMQQT{ + + public long id; + public String name; + public String surname; + public String username; + public List phonelist; + public String alias; + + public Person() { + } + + @Override public Person decode(BertTuple bertTuple) { + return null; + } + + @Override public Object encode() { + return null; + } +} diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Profile.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Profile.java new file mode 100644 index 0000000000..ac2970d5f3 --- /dev/null +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Profile.java @@ -0,0 +1,24 @@ +package com.ninja.mobile.data.models.mqtt; + +import com.ninja.mobile.data.server.bert.BertTuple; + +import java.util.List; + +public class Profile extends BaseModelMQQT{ + + public long id; + public String phone; + public List data; + public List accounts; + + public Profile() { + } + + @Override public Profile decode(BertTuple bertTuple) { + return null; + } + + @Override public Object encode() { + return null; + } +} diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/ResendSms.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/ResendSms.java index 51f05c6a25..4590c4d7ae 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/mqtt/ResendSms.java +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/ResendSms.java @@ -27,7 +27,7 @@ public class ResendSms extends BaseModelMQQT { @Override public List encode() { return new BertTuple() {{ - add(Name); + add(name); BertTuple objects = new BertTuple(); objects.addAll(token.encode()); add(objects); diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Room.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Room.java new file mode 100644 index 0000000000..ecdaedf4ee --- /dev/null +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Room.java @@ -0,0 +1,23 @@ +package com.ninja.mobile.data.models.mqtt; + +import com.ninja.mobile.data.server.bert.BertTuple; + +import java.util.List; + +public class Room extends BaseModelMQQT{ + + public List acl; + public String description; + public String room; + + public Room() { + } + + @Override public Room decode(BertTuple bertTuple) { + return null; + } + + @Override public Object encode() { + return null; + } +} diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Roster.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Roster.java new file mode 100644 index 0000000000..493c5f135e --- /dev/null +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Roster.java @@ -0,0 +1,28 @@ +package com.ninja.mobile.data.models.mqtt; + +import com.ninja.mobile.data.server.bert.BertTuple; + +import java.util.List; + +public class Roster extends BaseModelMQQT{ + + public long id; + public String names; + public String surnames; + public String user_id; + public long size; + public List userlist; + public List roomlist; + public String status; + + public Roster() { + } + + @Override public Roster decode(BertTuple bertTuple) { + return null; + } + + @Override public Object encode() { + return null; + } +} diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Token.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Token.java index 4e06e47d0b..b54bd92050 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Token.java +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Token.java @@ -28,7 +28,7 @@ public class Token extends BaseModelMQQT { @Override public List encode() { return new BertTuple() {{ - add(Name); + add(name); add(data); }}; } diff --git a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Verify.java b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Verify.java index b9df0e07da..cfd2a526ef 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/mqtt/Verify.java +++ b/app/src/main/java/com/ninja/mobile/data/models/mqtt/Verify.java @@ -29,7 +29,7 @@ public class Verify extends BaseModelMQQT { @Override public List encode() { return new ArrayList() { { - add(Name); + add(name); add(smsCode); } }; diff --git a/app/src/main/java/com/ninja/mobile/data/models/right_models/Auth.java b/app/src/main/java/com/ninja/mobile/data/models/right_models/Auth.java deleted file mode 100644 index 69a8ddb119..0000000000 --- a/app/src/main/java/com/ninja/mobile/data/models/right_models/Auth.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ninja.mobile.data.models.right_models; - -public class Auth { - - public String token; - public String user_id; - public String phone; - public String dev_key; - public String type; - public String sms_code; - public long attempts; - public String services; - - public Auth() { - } - -} diff --git a/app/src/main/java/com/ninja/mobile/data/models/right_models/Contact.java b/app/src/main/java/com/ninja/mobile/data/models/right_models/Contact.java deleted file mode 100644 index 34ce6b9601..0000000000 --- a/app/src/main/java/com/ninja/mobile/data/models/right_models/Contact.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ninja.mobile.data.models.right_models; - -public class Contact { - - public long id; - public String phone; - public String names; - public String surnames; - public String status; - public long person_id; - - public Contact() { - } - -} diff --git a/app/src/main/java/com/ninja/mobile/data/models/right_models/Io.java b/app/src/main/java/com/ninja/mobile/data/models/right_models/Io.java deleted file mode 100644 index 759ea18779..0000000000 --- a/app/src/main/java/com/ninja/mobile/data/models/right_models/Io.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ninja.mobile.data.models.right_models; - -public class Io { - - public Object code; - public Object data; - - public Io() { - } - -} diff --git a/app/src/main/java/com/ninja/mobile/data/models/right_models/Ok.java b/app/src/main/java/com/ninja/mobile/data/models/right_models/Ok.java deleted file mode 100644 index 92fa03a576..0000000000 --- a/app/src/main/java/com/ninja/mobile/data/models/right_models/Ok.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.ninja.mobile.data.models.right_models; - -public class Ok { - - public Object data; - - public Ok() { - } - -} diff --git a/app/src/main/java/com/ninja/mobile/data/models/right_models/Person.java b/app/src/main/java/com/ninja/mobile/data/models/right_models/Person.java deleted file mode 100644 index 4749f76ad1..0000000000 --- a/app/src/main/java/com/ninja/mobile/data/models/right_models/Person.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ninja.mobile.data.models.right_models; - -import java.util.List; - -public class Person { - - public long id; - public String name; - public String surname; - public String username; - public List phonelist; - public String alias; - - public Person() { - } - -} diff --git a/app/src/main/java/com/ninja/mobile/data/models/right_models/Profile.java b/app/src/main/java/com/ninja/mobile/data/models/right_models/Profile.java deleted file mode 100644 index c946d9c361..0000000000 --- a/app/src/main/java/com/ninja/mobile/data/models/right_models/Profile.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ninja.mobile.data.models.right_models; - -import java.util.List; - -public class Profile { - - public long id; - public String phone; - public List data; - public List accounts; - - public Profile() { - } - -} diff --git a/app/src/main/java/com/ninja/mobile/data/models/right_models/Room.java b/app/src/main/java/com/ninja/mobile/data/models/right_models/Room.java deleted file mode 100644 index 5a27750008..0000000000 --- a/app/src/main/java/com/ninja/mobile/data/models/right_models/Room.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ninja.mobile.data.models.right_models; - -import java.util.List; - -public class Room { - - public List acl; - public String description; - public String room; - - public Room() { - } - -} diff --git a/app/src/main/java/com/ninja/mobile/data/models/right_models/Roster.java b/app/src/main/java/com/ninja/mobile/data/models/right_models/Roster.java deleted file mode 100644 index 38c9ec6830..0000000000 --- a/app/src/main/java/com/ninja/mobile/data/models/right_models/Roster.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.ninja.mobile.data.models.right_models; - -import java.util.List; - -public class Roster { - - public long id; - public String names; - public String surnames; - public String user_id; - public long size; - public List userlist; - public List roomlist; - public String status; - - public Roster() { - } - -} diff --git a/app/src/main/java/com/ninja/mobile/data/models/Account.java b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Account.java similarity index 97% rename from app/src/main/java/com/ninja/mobile/data/models/Account.java rename to app/src/main/java/com/ninja/mobile/data/models/temp_models/Account.java index 92291e37d4..3129f3ef05 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/Account.java +++ b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Account.java @@ -1,4 +1,4 @@ -package com.ninja.mobile.data.models; +package com.ninja.mobile.data.models.temp_models; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/ninja/mobile/data/models/Country.java b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Country.java similarity index 94% rename from app/src/main/java/com/ninja/mobile/data/models/Country.java rename to app/src/main/java/com/ninja/mobile/data/models/temp_models/Country.java index 9a7f9e6cd3..20791382f5 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/Country.java +++ b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Country.java @@ -1,4 +1,4 @@ -package com.ninja.mobile.data.models; +package com.ninja.mobile.data.models.temp_models; import com.google.gson.annotations.SerializedName; @@ -10,7 +10,7 @@ import com.google.gson.annotations.SerializedName; public class Country { /** - * Name of country + * name of country */ private String name; /** @@ -39,7 +39,7 @@ public class Country { } /** - * Get Name of country + * Get name of country * * @return String */ @@ -48,7 +48,7 @@ public class Country { } /** - * Set Name of country + * Set name of country * * @param name String */ diff --git a/app/src/main/java/com/ninja/mobile/data/models/Person.java b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Person.java similarity index 97% rename from app/src/main/java/com/ninja/mobile/data/models/Person.java rename to app/src/main/java/com/ninja/mobile/data/models/temp_models/Person.java index 45ca372fb2..f4584d9ad2 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/Person.java +++ b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Person.java @@ -1,4 +1,4 @@ -package com.ninja.mobile.data.models; +package com.ninja.mobile.data.models.temp_models; /* * Created by Bo on 29.06.2017. diff --git a/app/src/main/java/com/ninja/mobile/data/models/Phone.java b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Phone.java similarity index 94% rename from app/src/main/java/com/ninja/mobile/data/models/Phone.java rename to app/src/main/java/com/ninja/mobile/data/models/temp_models/Phone.java index e8238da75b..4a7184385c 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/Phone.java +++ b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Phone.java @@ -1,4 +1,4 @@ -package com.ninja.mobile.data.models; +package com.ninja.mobile.data.models.temp_models; /* * Created by Bo on 29.06.2017. diff --git a/app/src/main/java/com/ninja/mobile/data/models/Room.java b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Room.java similarity index 96% rename from app/src/main/java/com/ninja/mobile/data/models/Room.java rename to app/src/main/java/com/ninja/mobile/data/models/temp_models/Room.java index feba4f28da..9a6213ab05 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/Room.java +++ b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Room.java @@ -1,4 +1,4 @@ -package com.ninja.mobile.data.models; +package com.ninja.mobile.data.models.temp_models; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/ninja/mobile/data/models/Roster.java b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Roster.java similarity index 97% rename from app/src/main/java/com/ninja/mobile/data/models/Roster.java rename to app/src/main/java/com/ninja/mobile/data/models/temp_models/Roster.java index 48a65ea015..ad7ed4e7ad 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/Roster.java +++ b/app/src/main/java/com/ninja/mobile/data/models/temp_models/Roster.java @@ -1,4 +1,4 @@ -package com.ninja.mobile.data.models; +package com.ninja.mobile.data.models.temp_models; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/ninja/mobile/data/models/User.java b/app/src/main/java/com/ninja/mobile/data/models/temp_models/User.java similarity index 84% rename from app/src/main/java/com/ninja/mobile/data/models/User.java rename to app/src/main/java/com/ninja/mobile/data/models/temp_models/User.java index 8ce48611b5..07ff47931c 100644 --- a/app/src/main/java/com/ninja/mobile/data/models/User.java +++ b/app/src/main/java/com/ninja/mobile/data/models/temp_models/User.java @@ -1,4 +1,4 @@ -package com.ninja.mobile.data.models; +package com.ninja.mobile.data.models.temp_models; import android.os.Parcel; import android.os.Parcelable; @@ -14,7 +14,6 @@ public class User implements Parcelable { public long userid; public String phonenumber; - public String status; public List accounts = new ArrayList<>(); @@ -37,14 +36,6 @@ public class User implements Parcelable { this.phonenumber = phonenumber; } - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - public List getAccounts() { return accounts; } @@ -62,14 +53,12 @@ public class User implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeLong(this.userid); dest.writeString(this.phonenumber); - dest.writeString(this.status); dest.writeTypedList(this.accounts); } protected User(Parcel in) { this.userid = in.readLong(); this.phonenumber = in.readString(); - this.status = in.readString(); this.accounts = in.createTypedArrayList(Account.CREATOR); } diff --git a/app/src/main/java/com/ninja/mobile/data/server/PahoService.java b/app/src/main/java/com/ninja/mobile/data/server/PahoService.java index 2f39242f98..cb4345a4e0 100644 --- a/app/src/main/java/com/ninja/mobile/data/server/PahoService.java +++ b/app/src/main/java/com/ninja/mobile/data/server/PahoService.java @@ -144,8 +144,14 @@ public class PahoService extends Service { private void initNode(MqttMessage message) { if (maxNode == -1) { - InitModel initModel = new InitModel(message.getPayload()); - maxNode = initModel.getVnodeMax(); + BertDecoder bertDecoder = BertDecoder.setupDecoder().withDecodeAtomAsString(true); + try { + BertTuple bertTuple = (BertTuple) bertDecoder.decodeAny(message.getPayload()); + InitModel initModel = new InitModel().decode(bertTuple); + maxNode = initModel.vnode_max; + } catch (InvalidObjectException e) { + e.printStackTrace(); + } } } @@ -187,7 +193,7 @@ public class PahoService extends Service { private void requestSms(String phone) { Auth auth = new Auth(); - auth.setPhone(phone); + auth.phone = phone; publishMessage(Topics.getAuthTopic(maxNode), auth.encode()); } @@ -238,7 +244,7 @@ public class PahoService extends Service { //requestSms Auth auth = new Auth(); - auth.setPhone(phone); + auth.phone = phone; publishMessageTest(Topics.getAuthTopic(maxNode), auth.encode()); //resendSms diff --git a/app/src/main/java/com/ninja/mobile/intetfaces/APIManager.java b/app/src/main/java/com/ninja/mobile/intetfaces/APIManager.java index 3d4caefd60..3f38453b0a 100644 --- a/app/src/main/java/com/ninja/mobile/intetfaces/APIManager.java +++ b/app/src/main/java/com/ninja/mobile/intetfaces/APIManager.java @@ -1,6 +1,6 @@ package com.ninja.mobile.intetfaces; -import com.ninja.mobile.data.models.Account; +import com.ninja.mobile.data.models.temp_models.Account; import java.util.List; diff --git a/app/src/main/java/com/ninja/mobile/mvp/presenters/EditProfilePresenter.java b/app/src/main/java/com/ninja/mobile/mvp/presenters/EditProfilePresenter.java index c4f300b9e0..454dc84fd5 100644 --- a/app/src/main/java/com/ninja/mobile/mvp/presenters/EditProfilePresenter.java +++ b/app/src/main/java/com/ninja/mobile/mvp/presenters/EditProfilePresenter.java @@ -3,7 +3,7 @@ package com.ninja.mobile.mvp.presenters; import android.text.TextUtils; import com.arellomobile.mvp.InjectViewState; -import com.ninja.mobile.data.models.Person; +import com.ninja.mobile.data.models.temp_models.Person; import com.ninja.mobile.mvp.view.EditProfileView; import com.ninja.mobile.utils.ValidationUtils; diff --git a/app/src/main/java/com/ninja/mobile/mvp/presenters/UserProfilePresenter.java b/app/src/main/java/com/ninja/mobile/mvp/presenters/UserProfilePresenter.java index 08b8aca369..e9a4d1a1ba 100644 --- a/app/src/main/java/com/ninja/mobile/mvp/presenters/UserProfilePresenter.java +++ b/app/src/main/java/com/ninja/mobile/mvp/presenters/UserProfilePresenter.java @@ -1,7 +1,7 @@ package com.ninja.mobile.mvp.presenters; import com.arellomobile.mvp.InjectViewState; -import com.ninja.mobile.data.models.Account; +import com.ninja.mobile.data.models.temp_models.Account; import com.ninja.mobile.mvp.view.UserProfileView; import io.reactivex.Single; diff --git a/app/src/main/java/com/ninja/mobile/mvp/view/EditProfileView.java b/app/src/main/java/com/ninja/mobile/mvp/view/EditProfileView.java index a81dadf0b7..e2bbf5a6e5 100644 --- a/app/src/main/java/com/ninja/mobile/mvp/view/EditProfileView.java +++ b/app/src/main/java/com/ninja/mobile/mvp/view/EditProfileView.java @@ -5,7 +5,7 @@ package com.ninja.mobile.mvp.view; */ import com.arellomobile.mvp.MvpView; -import com.ninja.mobile.data.models.Person; +import com.ninja.mobile.data.models.temp_models.Person; public interface EditProfileView extends MvpView { diff --git a/app/src/main/java/com/ninja/mobile/mvp/view/UserProfileView.java b/app/src/main/java/com/ninja/mobile/mvp/view/UserProfileView.java index fc3f9f8e41..b15290e3f7 100644 --- a/app/src/main/java/com/ninja/mobile/mvp/view/UserProfileView.java +++ b/app/src/main/java/com/ninja/mobile/mvp/view/UserProfileView.java @@ -3,7 +3,7 @@ package com.ninja.mobile.mvp.view; import android.support.annotation.NonNull; import com.arellomobile.mvp.MvpView; -import com.ninja.mobile.data.models.Account; +import com.ninja.mobile.data.models.temp_models.Account; /** * Created by dmitro.boiko on 03/07/2017. diff --git a/app/src/main/java/com/ninja/mobile/ui/activities/EditProfileActivity.java b/app/src/main/java/com/ninja/mobile/ui/activities/EditProfileActivity.java index 4c36cd2ad0..65d5f33b77 100644 --- a/app/src/main/java/com/ninja/mobile/ui/activities/EditProfileActivity.java +++ b/app/src/main/java/com/ninja/mobile/ui/activities/EditProfileActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.ninja.mobile.data.models.Person; +import com.ninja.mobile.data.models.temp_models.Person; import com.ninja.mobile.ui.base.BaseActivity; import com.ninja.mobile.ui.fragments.profile.EditProfileFragment; import com.ninja.mobile.ui.fragments.profile.MyProfileFragment; diff --git a/app/src/main/java/com/ninja/mobile/ui/activities/QRCodeGeneratorActivity.java b/app/src/main/java/com/ninja/mobile/ui/activities/QRCodeGeneratorActivity.java index 1e402ca553..edc100f428 100644 --- a/app/src/main/java/com/ninja/mobile/ui/activities/QRCodeGeneratorActivity.java +++ b/app/src/main/java/com/ninja/mobile/ui/activities/QRCodeGeneratorActivity.java @@ -8,8 +8,8 @@ import android.widget.ImageView; import com.google.zxing.WriterException; import com.ninja.mobile.R; -import com.ninja.mobile.data.models.Person; -import com.ninja.mobile.data.models.User; +import com.ninja.mobile.data.models.temp_models.Person; +import com.ninja.mobile.data.models.temp_models.User; import com.ninja.mobile.ui.base.BaseActivity; import com.ninja.mobile.ui.fragments.profile.MyProfileFragment; import com.ninja.mobile.utils.ZxingEncoder; diff --git a/app/src/main/java/com/ninja/mobile/ui/fragments/profile/EditProfileFragment.java b/app/src/main/java/com/ninja/mobile/ui/fragments/profile/EditProfileFragment.java index 193d7a2cb2..4f30eb248b 100644 --- a/app/src/main/java/com/ninja/mobile/ui/fragments/profile/EditProfileFragment.java +++ b/app/src/main/java/com/ninja/mobile/ui/fragments/profile/EditProfileFragment.java @@ -11,7 +11,7 @@ import android.view.ViewGroup; import com.arellomobile.mvp.presenter.InjectPresenter; import com.ninja.mobile.R; -import com.ninja.mobile.data.models.Person; +import com.ninja.mobile.data.models.temp_models.Person; import com.ninja.mobile.mvp.presenters.EditProfilePresenter; import com.ninja.mobile.mvp.view.EditProfileView; import com.ninja.mobile.ui.base.BaseFragment; diff --git a/app/src/main/java/com/ninja/mobile/ui/fragments/profile/MyProfileFragment.java b/app/src/main/java/com/ninja/mobile/ui/fragments/profile/MyProfileFragment.java index 3b8b3eb709..9e786b657f 100644 --- a/app/src/main/java/com/ninja/mobile/ui/fragments/profile/MyProfileFragment.java +++ b/app/src/main/java/com/ninja/mobile/ui/fragments/profile/MyProfileFragment.java @@ -21,9 +21,9 @@ import com.bumptech.glide.Glide; import com.ninja.mobile.BuildConfig; import com.ninja.mobile.R; import com.ninja.mobile.intetfaces.OnChooserPhotoDialogListener; -import com.ninja.mobile.data.models.Account; -import com.ninja.mobile.data.models.Person; -import com.ninja.mobile.data.models.User; +import com.ninja.mobile.data.models.temp_models.Account; +import com.ninja.mobile.data.models.temp_models.Person; +import com.ninja.mobile.data.models.temp_models.User; import com.ninja.mobile.mvp.presenters.MyProfilePresenter; import com.ninja.mobile.mvp.view.MyProfileView; import com.ninja.mobile.ui.activities.EditProfileActivity; diff --git a/app/src/main/java/com/ninja/mobile/ui/fragments/profile/UserProfileFragment.java b/app/src/main/java/com/ninja/mobile/ui/fragments/profile/UserProfileFragment.java index 801d1a9d18..468a9e57ef 100644 --- a/app/src/main/java/com/ninja/mobile/ui/fragments/profile/UserProfileFragment.java +++ b/app/src/main/java/com/ninja/mobile/ui/fragments/profile/UserProfileFragment.java @@ -11,8 +11,8 @@ import android.widget.Toast; import com.arellomobile.mvp.presenter.InjectPresenter; import com.ninja.mobile.R; -import com.ninja.mobile.data.models.Account; -import com.ninja.mobile.data.models.Person; +import com.ninja.mobile.data.models.temp_models.Account; +import com.ninja.mobile.data.models.temp_models.Person; import com.ninja.mobile.mvp.presenters.UserProfilePresenter; import com.ninja.mobile.mvp.view.UserProfileView; import com.ninja.mobile.ui.base.BaseFragment; -- GitLab