Umbenannt und Key-Store hinzugefügt
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner;
|
||||
package de.p3.bewoplaner;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.test.InstrumentationRegistry;
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.p3.bewoplaner">
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="de.p3.bewoplaner">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
@@ -9,14 +10,14 @@
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
|
||||
<application
|
||||
android:name=".BewoplanerApplication"
|
||||
android:name="de.p3.bewoplaner.BewoplanerApplication"
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/AppTheme">
|
||||
<activity
|
||||
android:name=".page.splash.SplashActivity"
|
||||
android:name="de.p3.bewoplaner.page.splash.SplashActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme.FullBackground">
|
||||
<intent-filter>
|
||||
@@ -26,32 +27,32 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".page.login.LoginActivity"
|
||||
android:name="de.p3.bewoplaner.page.login.LoginActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme.FullBackground" />
|
||||
<activity
|
||||
android:name=".page.main.MainActivity"
|
||||
android:name="de.p3.bewoplaner.page.main.MainActivity"
|
||||
android:launchMode="singleTask"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme.NoActionBar" />
|
||||
<activity
|
||||
android:name=".page.impressum.ImpressumActivity"
|
||||
android:name="de.p3.bewoplaner.page.impressum.ImpressumActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme.NoActionBar" />
|
||||
<activity
|
||||
android:name=".page.chat.SingleChatActivity"
|
||||
android:name="de.p3.bewoplaner.page.chat.SingleChatActivity"
|
||||
android:label=""
|
||||
android:launchMode="singleTop"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/ChatStyle" />
|
||||
<activity
|
||||
android:name=".page.chat.GroupChatActivity"
|
||||
android:name="de.p3.bewoplaner.page.chat.GroupChatActivity"
|
||||
android:label=""
|
||||
android:launchMode="singleTop"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/ChatStyle" />
|
||||
<activity
|
||||
android:name=".page.chatmembers.ChatMembersActivity"
|
||||
android:name="de.p3.bewoplaner.page.chatmembers.ChatMembersActivity"
|
||||
android:label=""
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/ChatStyle" />
|
||||
@@ -60,15 +61,15 @@
|
||||
android:name="io.fabric.ApiKey"
|
||||
android:value="1dcc8d0ead50f1b328778876834fea3392c6fc22" />
|
||||
|
||||
<service android:name=".data.firebase.MessagingInstanceIdService">
|
||||
<service android:name="de.p3.bewoplaner.data.firebase.MessagingInstanceIdService">
|
||||
<intent-filter>
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
|
||||
</intent-filter>
|
||||
</service>
|
||||
<service
|
||||
android:name=".utils.AppStoppedService"
|
||||
android:name="de.p3.bewoplaner.utils.AppStoppedService"
|
||||
android:stopWithTask="false" />
|
||||
<service android:name=".data.firebase.HandleMessagesService">
|
||||
<service android:name="de.p3.bewoplaner.data.firebase.HandleMessagesService">
|
||||
<intent-filter>
|
||||
<action android:name="com.google.firebase.MESSAGING_EVENT" />
|
||||
</intent-filter>
|
||||
@@ -85,7 +86,7 @@
|
||||
</provider>
|
||||
|
||||
<receiver
|
||||
android:name=".data.firebase.ReplyNotificationReceiver"
|
||||
android:name="de.p3.bewoplaner.data.firebase.ReplyNotificationReceiver"
|
||||
android:enabled="true"
|
||||
android:exported="false" />
|
||||
|
||||
@@ -96,7 +97,7 @@
|
||||
android:name="com.google.firebase.messaging.default_notification_color"
|
||||
android:resource="@color/colorDefault" />
|
||||
|
||||
<activity android:name=".page.fileconfirmation.FileConfirmationActivity"></activity>
|
||||
<activity android:name="de.p3.bewoplaner.page.fileconfirmation.FileConfirmationActivity"></activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -1,4 +0,0 @@
|
||||
package com.p3.bewoplaner.data.events;
|
||||
|
||||
public class LogoutDirectlyEvent {
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.p3.bewoplaner;
|
||||
package de.p3.bewoplaner;
|
||||
|
||||
import com.crashlytics.android.Crashlytics;
|
||||
import com.p3.bewoplaner.data.firebase.MessagingInstanceIdService;
|
||||
import com.p3.bewoplaner.di.ApplicationComponent;
|
||||
import com.p3.bewoplaner.di.ApplicationModule;
|
||||
import com.p3.bewoplaner.di.DaggerApplicationComponent;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.data.firebase.MessagingInstanceIdService;
|
||||
import de.p3.bewoplaner.di.ApplicationComponent;
|
||||
import de.p3.bewoplaner.di.ApplicationModule;
|
||||
import de.p3.bewoplaner.di.DaggerApplicationComponent;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data;
|
||||
package de.p3.bewoplaner.data;
|
||||
|
||||
/**
|
||||
* Created by imarneanu on 2/10/17.
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.p3.bewoplaner.data.api;
|
||||
package de.p3.bewoplaner.data.api;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
|
||||
import com.p3.bewoplaner.BewoplanerApplication;
|
||||
import com.p3.bewoplaner.BuildConfig;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import com.p3.bewoplaner.di.P3DSEndpoint;
|
||||
import com.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
import de.p3.bewoplaner.BewoplanerApplication;
|
||||
import de.p3.bewoplaner.BuildConfig;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import de.p3.bewoplaner.di.P3DSEndpoint;
|
||||
import de.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import de.p3.bewoplaner.utils.Constants;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.p3.bewoplaner.data.api.common;
|
||||
package de.p3.bewoplaner.data.api.common;
|
||||
|
||||
import com.p3.bewoplaner.data.events.InvalidTokenEvent;
|
||||
import com.p3.bewoplaner.model.common.BaseResponse;
|
||||
import de.p3.bewoplaner.data.events.InvalidTokenEvent;
|
||||
import de.p3.bewoplaner.model.common.BaseResponse;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.api.common;
|
||||
package de.p3.bewoplaner.data.api.common;
|
||||
|
||||
import com.p3.bewoplaner.model.common.BaseResponse;
|
||||
import de.p3.bewoplaner.model.common.BaseResponse;
|
||||
|
||||
/**
|
||||
* Created by laszloffiferenc on 2/21/17.
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.api.common;
|
||||
package de.p3.bewoplaner.data.api.common;
|
||||
|
||||
/**
|
||||
* Created by laszloffiferenc on 2/21/17.
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.api.common;
|
||||
package de.p3.bewoplaner.data.api.common;
|
||||
|
||||
/**
|
||||
* Created by laszloffiferenc on 2/23/17.
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.data.api.responses;
|
||||
package de.p3.bewoplaner.data.api.responses;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.common.BaseResponse;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.common.BaseResponse;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
package com.p3.bewoplaner.data.api.responses;
|
||||
package de.p3.bewoplaner.data.api.responses;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import com.p3.bewoplaner.model.common.BaseResponse;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.model.common.BaseResponse;
|
||||
|
||||
/**
|
||||
* Created by Rares Teodorescu on 08/03/2017.
|
||||
@@ -15,7 +16,7 @@ public class MessageResponse extends BaseResponse {
|
||||
public static class Response {
|
||||
|
||||
@SerializedName("message")
|
||||
public com.p3.bewoplaner.model.Message message;
|
||||
public Message message;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.p3.bewoplaner.data.api.responses;
|
||||
package de.p3.bewoplaner.data.api.responses;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import com.p3.bewoplaner.model.common.BaseResponse;
|
||||
import de.p3.bewoplaner.model.common.BaseResponse;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
|
||||
/**
|
||||
* Created by imarneanu on 3/1/17.
|
||||
*/
|
||||
@@ -16,7 +18,7 @@ public class MessagesResponse extends BaseResponse {
|
||||
public static class Response {
|
||||
|
||||
@SerializedName("messages")
|
||||
public ArrayList<com.p3.bewoplaner.model.Message> messages;
|
||||
public ArrayList<Message> messages;
|
||||
|
||||
@SerializedName("hasMorePages")
|
||||
public boolean hasMorePages;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.data.api.responses;
|
||||
package de.p3.bewoplaner.data.api.responses;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import com.p3.bewoplaner.model.common.BaseResponse;
|
||||
import com.p3.bewoplaner.model.User;
|
||||
import de.p3.bewoplaner.model.common.BaseResponse;
|
||||
import de.p3.bewoplaner.model.User;
|
||||
|
||||
/**
|
||||
* Created by imarneanu on 2/23/17.
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.data.api.responses;
|
||||
package de.p3.bewoplaner.data.api.responses;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import com.p3.bewoplaner.model.common.BaseResponse;
|
||||
import de.p3.bewoplaner.model.common.BaseResponse;
|
||||
|
||||
/**
|
||||
* Created by laszloffiferenc on 2/28/17.
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.p3.bewoplaner.data.api.responses;
|
||||
package de.p3.bewoplaner.data.api.responses;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import com.p3.bewoplaner.model.common.BaseResponse;
|
||||
import de.p3.bewoplaner.model.common.BaseResponse;
|
||||
|
||||
/**
|
||||
* Created by Vlad on 28/02/2017.
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.data.api.services;
|
||||
package de.p3.bewoplaner.data.api.services;
|
||||
|
||||
import com.p3.bewoplaner.data.api.responses.GroupResponse;
|
||||
import com.p3.bewoplaner.data.api.responses.MessageResponse;
|
||||
import com.p3.bewoplaner.data.api.responses.MessagesResponse;
|
||||
import de.p3.bewoplaner.data.api.responses.GroupResponse;
|
||||
import de.p3.bewoplaner.data.api.responses.MessageResponse;
|
||||
import de.p3.bewoplaner.data.api.responses.MessagesResponse;
|
||||
|
||||
import okhttp3.MultipartBody;
|
||||
import okhttp3.RequestBody;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.p3.bewoplaner.data.api.services;
|
||||
package de.p3.bewoplaner.data.api.services;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import com.p3.bewoplaner.data.api.responses.ProfileResponse;
|
||||
import de.p3.bewoplaner.data.api.responses.ProfileResponse;
|
||||
|
||||
import retrofit2.http.Field;
|
||||
import retrofit2.http.FormUrlEncoded;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.p3.bewoplaner.data.api.services;
|
||||
package de.p3.bewoplaner.data.api.services;
|
||||
|
||||
import com.p3.bewoplaner.data.api.responses.ProfileResponse;
|
||||
import com.p3.bewoplaner.data.api.responses.UploadImageResponse;
|
||||
import de.p3.bewoplaner.data.api.responses.ProfileResponse;
|
||||
import de.p3.bewoplaner.data.api.responses.UploadImageResponse;
|
||||
|
||||
import okhttp3.MultipartBody;
|
||||
import retrofit2.http.Field;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.api.services;
|
||||
package de.p3.bewoplaner.data.api.services;
|
||||
|
||||
import com.p3.bewoplaner.data.api.responses.RegisterResponse;
|
||||
import de.p3.bewoplaner.data.api.responses.RegisterResponse;
|
||||
|
||||
import retrofit2.http.Field;
|
||||
import retrofit2.http.FormUrlEncoded;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.events;
|
||||
package de.p3.bewoplaner.data.events;
|
||||
|
||||
/**
|
||||
* Created by Rares Teodorescu on 31/03/2017.
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.events;
|
||||
package de.p3.bewoplaner.data.events;
|
||||
|
||||
/**
|
||||
* Created by Rares Teodorescu on 27/03/2017.
|
||||
@@ -0,0 +1,4 @@
|
||||
package de.p3.bewoplaner.data.events;
|
||||
|
||||
public class LogoutDirectlyEvent {
|
||||
}
|
||||
@@ -1,21 +1,21 @@
|
||||
package com.p3.bewoplaner.data.firebase;
|
||||
package de.p3.bewoplaner.data.firebase;
|
||||
|
||||
import com.google.firebase.messaging.FirebaseMessagingService;
|
||||
import com.google.firebase.messaging.RemoteMessage;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import com.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.main.MainActivity;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
import com.p3.bewoplaner.utils.LoggedOutUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import de.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.main.MainActivity;
|
||||
import de.p3.bewoplaner.utils.Constants;
|
||||
import de.p3.bewoplaner.utils.LoggedOutUtils;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Notification;
|
||||
@@ -48,7 +48,7 @@ import javax.inject.Inject;
|
||||
import javax.inject.Named;
|
||||
|
||||
import static android.graphics.BitmapFactory.decodeStream;
|
||||
import static com.p3.bewoplaner.utils.Constants.CHAT_IS_ALREADY_OPEN;
|
||||
import static de.p3.bewoplaner.utils.Constants.CHAT_IS_ALREADY_OPEN;
|
||||
|
||||
/**
|
||||
* Created by laszloffiferenc on 3/1/17.
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.data.firebase;
|
||||
package de.p3.bewoplaner.data.firebase;
|
||||
|
||||
import com.p3.bewoplaner.di.ApplicationComponent;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import com.p3.bewoplaner.page.chat.ChatModule;
|
||||
import com.p3.bewoplaner.page.login.LoginModule;
|
||||
import de.p3.bewoplaner.di.ApplicationComponent;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.page.chat.ChatModule;
|
||||
import de.p3.bewoplaner.page.login.LoginModule;
|
||||
|
||||
import dagger.Component;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.p3.bewoplaner.data.firebase;
|
||||
package de.p3.bewoplaner.data.firebase;
|
||||
|
||||
import com.google.firebase.iid.FirebaseInstanceId;
|
||||
import com.google.firebase.iid.FirebaseInstanceIdService;
|
||||
|
||||
import com.p3.bewoplaner.BewoplanerApplication;
|
||||
import com.p3.bewoplaner.data.api.responses.RegisterResponse;
|
||||
import com.p3.bewoplaner.data.api.services.RegisterService;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.BewoplanerApplication;
|
||||
import de.p3.bewoplaner.data.api.responses.RegisterResponse;
|
||||
import de.p3.bewoplaner.data.api.services.RegisterService;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
|
||||
import android.provider.Settings;
|
||||
import android.util.Log;
|
||||
@@ -1,23 +1,23 @@
|
||||
package com.p3.bewoplaner.data.firebase;
|
||||
package de.p3.bewoplaner.data.firebase;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
|
||||
import com.p3.bewoplaner.data.api.responses.MessageResponse;
|
||||
import com.p3.bewoplaner.data.api.services.ChatService;
|
||||
import com.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import com.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import com.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.RealmProvider;
|
||||
import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.chat.ChatPresenter;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
import com.p3.bewoplaner.utils.rx.RxUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
|
||||
import de.p3.bewoplaner.data.api.responses.MessageResponse;
|
||||
import de.p3.bewoplaner.data.api.services.ChatService;
|
||||
import de.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import de.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import de.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.RealmProvider;
|
||||
import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.chat.ChatPresenter;
|
||||
import de.p3.bewoplaner.utils.Constants;
|
||||
import de.p3.bewoplaner.utils.rx.RxUtils;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
@@ -37,7 +37,7 @@ import javax.inject.Named;
|
||||
import rx.Observable;
|
||||
import rx.Subscriber;
|
||||
|
||||
import static com.p3.bewoplaner.utils.Constants.GROUP_ID;
|
||||
import static de.p3.bewoplaner.utils.Constants.GROUP_ID;
|
||||
|
||||
/**
|
||||
* Created by laszloffiferenc on 3/20/17.
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.prefs;
|
||||
package de.p3.bewoplaner.data.prefs;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.data.prefs;
|
||||
package de.p3.bewoplaner.data.prefs;
|
||||
|
||||
import com.p3.bewoplaner.BewoplanerApplication;
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import de.p3.bewoplaner.BewoplanerApplication;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import com.securepreferences.SecurePreferences;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.prefs;
|
||||
package de.p3.bewoplaner.data.prefs;
|
||||
|
||||
import com.securepreferences.SecurePreferences;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.prefs;
|
||||
package de.p3.bewoplaner.data.prefs;
|
||||
|
||||
import com.securepreferences.SecurePreferences;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.prefs;
|
||||
package de.p3.bewoplaner.data.prefs;
|
||||
|
||||
import android.content.SharedPreferences;
|
||||
import android.support.annotation.NonNull;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.prefs;
|
||||
package de.p3.bewoplaner.data.prefs;
|
||||
|
||||
import android.content.SharedPreferences;
|
||||
import android.support.annotation.NonNull;
|
||||
@@ -1,14 +1,14 @@
|
||||
package com.p3.bewoplaner.data.repository;
|
||||
package de.p3.bewoplaner.data.repository;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.mapper.Mapper;
|
||||
import com.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import com.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.RealmSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.Specification;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.model.User;
|
||||
import de.p3.bewoplaner.data.repository.mapper.Mapper;
|
||||
import de.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.RealmSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.Specification;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.model.User;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.p3.bewoplaner.data.repository;
|
||||
package de.p3.bewoplaner.data.repository;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.mapper.Mapper;
|
||||
import com.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.RealmSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.Specification;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.data.repository.mapper.Mapper;
|
||||
import de.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.RealmSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.Specification;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.Callable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.repository;
|
||||
package de.p3.bewoplaner.data.repository;
|
||||
|
||||
import io.realm.Realm;
|
||||
import io.realm.RealmConfiguration;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.repository;
|
||||
package de.p3.bewoplaner.data.repository;
|
||||
|
||||
import io.realm.Realm;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository;
|
||||
package de.p3.bewoplaner.data.repository;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.specifications.Specification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.Specification;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.p3.bewoplaner.data.repository;
|
||||
package de.p3.bewoplaner.data.repository;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.mapper.Mapper;
|
||||
import com.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import com.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import com.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import com.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.model.User;
|
||||
import de.p3.bewoplaner.data.repository.mapper.Mapper;
|
||||
import de.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import de.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.model.User;
|
||||
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.p3.bewoplaner.data.repository;
|
||||
package de.p3.bewoplaner.data.repository;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.mapper.Mapper;
|
||||
import com.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import com.p3.bewoplaner.data.repository.specifications.RealmSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.Specification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.UserByIdSpecification;
|
||||
import com.p3.bewoplaner.model.User;
|
||||
import de.p3.bewoplaner.data.repository.mapper.Mapper;
|
||||
import de.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import de.p3.bewoplaner.data.repository.specifications.RealmSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.Specification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.UserByIdSpecification;
|
||||
import de.p3.bewoplaner.model.User;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.repository.mapper;
|
||||
package de.p3.bewoplaner.data.repository.mapper;
|
||||
|
||||
/**
|
||||
* Class responsible for mapping one object to another.
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.data.repository.models;
|
||||
package de.p3.bewoplaner.data.repository.models;
|
||||
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.model.User;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.model.User;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository.models;
|
||||
package de.p3.bewoplaner.data.repository.models;
|
||||
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
|
||||
import io.realm.RealmObject;
|
||||
import io.realm.annotations.PrimaryKey;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository.models;
|
||||
package de.p3.bewoplaner.data.repository.models;
|
||||
|
||||
import com.p3.bewoplaner.model.User;
|
||||
import de.p3.bewoplaner.model.User;
|
||||
|
||||
import io.realm.RealmObject;
|
||||
import io.realm.annotations.PrimaryKey;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository.specifications;
|
||||
package de.p3.bewoplaner.data.repository.specifications;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
|
||||
import io.realm.Realm;
|
||||
import io.realm.RealmQuery;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository.specifications;
|
||||
package de.p3.bewoplaner.data.repository.specifications;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
|
||||
import io.realm.Case;
|
||||
import io.realm.Realm;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository.specifications;
|
||||
package de.p3.bewoplaner.data.repository.specifications;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
|
||||
import io.realm.Realm;
|
||||
import io.realm.RealmQuery;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository.specifications;
|
||||
package de.p3.bewoplaner.data.repository.specifications;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
|
||||
import io.realm.Realm;
|
||||
import io.realm.RealmQuery;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository.specifications;
|
||||
package de.p3.bewoplaner.data.repository.specifications;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
|
||||
import io.realm.Realm;
|
||||
import io.realm.RealmQuery;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.repository.specifications;
|
||||
package de.p3.bewoplaner.data.repository.specifications;
|
||||
|
||||
import io.realm.Realm;
|
||||
import io.realm.RealmObject;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.data.repository.specifications;
|
||||
package de.p3.bewoplaner.data.repository.specifications;
|
||||
|
||||
/**
|
||||
* Created by Rares Teodorescu on 11/01/2017.
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.data.repository.specifications;
|
||||
package de.p3.bewoplaner.data.repository.specifications;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
|
||||
import io.realm.Realm;
|
||||
import io.realm.RealmQuery;
|
||||
@@ -1,21 +1,21 @@
|
||||
package com.p3.bewoplaner.di;
|
||||
package de.p3.bewoplaner.di;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.p3.bewoplaner.BewoplanerApplication;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.api.ApiModule;
|
||||
import com.p3.bewoplaner.data.prefs.AppPrefs;
|
||||
import com.p3.bewoplaner.data.prefs.AppPrefsModule;
|
||||
import com.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import com.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import com.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import com.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.RealmProvider;
|
||||
import com.p3.bewoplaner.data.repository.RepositoryModule;
|
||||
import com.p3.bewoplaner.data.repository.UserRealmRepository;
|
||||
import com.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import com.p3.bewoplaner.utils.SystemUtils;
|
||||
import de.p3.bewoplaner.BewoplanerApplication;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.api.ApiModule;
|
||||
import de.p3.bewoplaner.data.prefs.AppPrefs;
|
||||
import de.p3.bewoplaner.data.prefs.AppPrefsModule;
|
||||
import de.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import de.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import de.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import de.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.RealmProvider;
|
||||
import de.p3.bewoplaner.data.repository.RepositoryModule;
|
||||
import de.p3.bewoplaner.data.repository.UserRealmRepository;
|
||||
import de.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import de.p3.bewoplaner.utils.SystemUtils;
|
||||
import com.securepreferences.SecurePreferences;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.di;
|
||||
package de.p3.bewoplaner.di;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.p3.bewoplaner.BewoplanerApplication;
|
||||
import com.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import com.p3.bewoplaner.utils.SystemUtils;
|
||||
import de.p3.bewoplaner.BewoplanerApplication;
|
||||
import de.p3.bewoplaner.di.scopes.ApplicationScope;
|
||||
import de.p3.bewoplaner.utils.SystemUtils;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
import android.content.Context;
|
||||
@@ -1,22 +1,22 @@
|
||||
package com.p3.bewoplaner.di;
|
||||
package de.p3.bewoplaner.di;
|
||||
|
||||
import com.p3.bewoplaner.BewoplanerApplication;
|
||||
import com.p3.bewoplaner.data.firebase.DaggerMessagingComponent;
|
||||
import com.p3.bewoplaner.data.firebase.MessagingComponent;
|
||||
import com.p3.bewoplaner.page.chat.ChatComponent;
|
||||
import com.p3.bewoplaner.page.chat.DaggerChatComponent;
|
||||
import com.p3.bewoplaner.page.contacts.ContactsComponent;
|
||||
import com.p3.bewoplaner.page.contacts.DaggerContactsComponent;
|
||||
import com.p3.bewoplaner.page.fileconfirmation.DaggerFileConfirmationComponent;
|
||||
import com.p3.bewoplaner.page.fileconfirmation.FileConfirmationComponent;
|
||||
import com.p3.bewoplaner.page.login.DaggerLoginComponent;
|
||||
import com.p3.bewoplaner.page.login.LoginComponent;
|
||||
import com.p3.bewoplaner.page.main.DaggerMainComponent;
|
||||
import com.p3.bewoplaner.page.main.MainComponent;
|
||||
import com.p3.bewoplaner.page.profile.DaggerProfileComponent;
|
||||
import com.p3.bewoplaner.page.profile.ProfileComponent;
|
||||
import com.p3.bewoplaner.page.splash.DaggerSplashComponent;
|
||||
import com.p3.bewoplaner.page.splash.SplashComponent;
|
||||
import de.p3.bewoplaner.BewoplanerApplication;
|
||||
import de.p3.bewoplaner.data.firebase.DaggerMessagingComponent;
|
||||
import de.p3.bewoplaner.data.firebase.MessagingComponent;
|
||||
import de.p3.bewoplaner.page.chat.ChatComponent;
|
||||
import de.p3.bewoplaner.page.chat.DaggerChatComponent;
|
||||
import de.p3.bewoplaner.page.contacts.ContactsComponent;
|
||||
import de.p3.bewoplaner.page.contacts.DaggerContactsComponent;
|
||||
import de.p3.bewoplaner.page.fileconfirmation.DaggerFileConfirmationComponent;
|
||||
import de.p3.bewoplaner.page.fileconfirmation.FileConfirmationComponent;
|
||||
import de.p3.bewoplaner.page.login.DaggerLoginComponent;
|
||||
import de.p3.bewoplaner.page.login.LoginComponent;
|
||||
import de.p3.bewoplaner.page.main.DaggerMainComponent;
|
||||
import de.p3.bewoplaner.page.main.MainComponent;
|
||||
import de.p3.bewoplaner.page.profile.DaggerProfileComponent;
|
||||
import de.p3.bewoplaner.page.profile.ProfileComponent;
|
||||
import de.p3.bewoplaner.page.splash.DaggerSplashComponent;
|
||||
import de.p3.bewoplaner.page.splash.SplashComponent;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.di;
|
||||
package de.p3.bewoplaner.di;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.di.scopes;
|
||||
package de.p3.bewoplaner.di.scopes;
|
||||
|
||||
import java.lang.annotation.Inherited;
|
||||
import java.lang.annotation.Retention;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.di.scopes;
|
||||
package de.p3.bewoplaner.di.scopes;
|
||||
|
||||
import java.lang.annotation.Inherited;
|
||||
import java.lang.annotation.Retention;
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.p3.bewoplaner.model;
|
||||
package de.p3.bewoplaner.model;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import com.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import com.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.GroupRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.model;
|
||||
package de.p3.bewoplaner.model;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.model;
|
||||
package de.p3.bewoplaner.model;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import com.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
import de.p3.bewoplaner.data.repository.models.UserRealm;
|
||||
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.model.common;
|
||||
package de.p3.bewoplaner.model.common;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
@@ -1,23 +1,21 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.events.InvalidTokenEvent;
|
||||
import com.p3.bewoplaner.data.events.LogoutDirectlyEvent;
|
||||
import com.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import com.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.common.RuntimePermissionActivity;
|
||||
import com.p3.bewoplaner.page.fileconfirmation.FileConfirmationActivity;
|
||||
import com.p3.bewoplaner.page.login.LoginPresenter;
|
||||
import com.p3.bewoplaner.page.main.LogoutNavigation;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
import com.p3.bewoplaner.utils.EndlessScrollListener;
|
||||
import com.p3.bewoplaner.utils.FileUtils;
|
||||
import com.p3.bewoplaner.utils.SystemUtils;
|
||||
import com.p3.bewoplaner.utils.ui.EmptyLayout;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.events.InvalidTokenEvent;
|
||||
import de.p3.bewoplaner.data.events.LogoutDirectlyEvent;
|
||||
import de.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import de.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.common.RuntimePermissionActivity;
|
||||
import de.p3.bewoplaner.page.login.LoginPresenter;
|
||||
import de.p3.bewoplaner.page.main.LogoutNavigation;
|
||||
import de.p3.bewoplaner.utils.EndlessScrollListener;
|
||||
import de.p3.bewoplaner.utils.FileUtils;
|
||||
import de.p3.bewoplaner.utils.SystemUtils;
|
||||
import de.p3.bewoplaner.utils.ui.EmptyLayout;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
@@ -64,8 +62,6 @@ import hani.momanii.supernova_emoji_library.Actions.EmojIconActions;
|
||||
import hani.momanii.supernova_emoji_library.Helper.EmojiconEditText;
|
||||
import okhttp3.MediaType;
|
||||
|
||||
import static com.p3.bewoplaner.data.AppPrefsConstants.USER_ID;
|
||||
|
||||
/**
|
||||
* Created by Rares Teodorescu on 21/02/2017.
|
||||
*/
|
||||
@@ -111,7 +107,7 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
|
||||
CoordinatorLayout mCoordinatorLayout;
|
||||
|
||||
@Inject
|
||||
@Named(USER_ID)
|
||||
@Named(AppPrefsConstants.USER_ID)
|
||||
LongPreference mUserIdPreference;
|
||||
|
||||
@Inject
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.github.lzyzsd.circleprogress.DonutProgress;
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.utils.DateUtils;
|
||||
import com.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.utils.DateUtils;
|
||||
import de.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
|
||||
import android.net.Uri;
|
||||
import android.support.annotation.Nullable;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.p3.bewoplaner.di.ApplicationComponent;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import com.p3.bewoplaner.page.login.LoginModule;
|
||||
import de.p3.bewoplaner.di.ApplicationComponent;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.page.login.LoginModule;
|
||||
|
||||
import dagger.Component;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.p3.bewoplaner.data.api.services.ChatService;
|
||||
import com.p3.bewoplaner.di.P3DSEndpoint;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.data.api.services.ChatService;
|
||||
import de.p3.bewoplaner.di.P3DSEndpoint;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
@@ -1,27 +1,27 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
|
||||
import com.p3.bewoplaner.data.api.responses.MessageResponse;
|
||||
import com.p3.bewoplaner.data.api.responses.MessagesResponse;
|
||||
import com.p3.bewoplaner.data.api.services.ChatService;
|
||||
import com.p3.bewoplaner.data.events.GroupUpdatedEvent;
|
||||
import com.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import com.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import com.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.RealmProvider;
|
||||
import com.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.MessageByGroupIdSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
|
||||
import com.p3.bewoplaner.utils.SystemUtils;
|
||||
import com.p3.bewoplaner.utils.rx.RxUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
|
||||
import de.p3.bewoplaner.data.api.responses.MessageResponse;
|
||||
import de.p3.bewoplaner.data.api.responses.MessagesResponse;
|
||||
import de.p3.bewoplaner.data.api.services.ChatService;
|
||||
import de.p3.bewoplaner.data.events.GroupUpdatedEvent;
|
||||
import de.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import de.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import de.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.RealmProvider;
|
||||
import de.p3.bewoplaner.data.repository.models.MessageRealm;
|
||||
import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.MessageByGroupIdSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
|
||||
import de.p3.bewoplaner.utils.SystemUtils;
|
||||
import de.p3.bewoplaner.utils.rx.RxUtils;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
|
||||
@@ -45,6 +45,7 @@ import java.util.Random;
|
||||
import javax.inject.Inject;
|
||||
import javax.inject.Named;
|
||||
|
||||
import de.p3.bewoplaner.utils.FileUtils;
|
||||
import io.realm.Realm;
|
||||
import okhttp3.MultipartBody;
|
||||
import okhttp3.RequestBody;
|
||||
@@ -56,8 +57,7 @@ import rx.android.schedulers.AndroidSchedulers;
|
||||
import rx.functions.Func1;
|
||||
import rx.schedulers.Schedulers;
|
||||
|
||||
import static com.p3.bewoplaner.data.AppPrefsConstants.USER_ID;
|
||||
import static com.p3.bewoplaner.utils.FileUtils.getFileTypeFromFilePath;
|
||||
import static de.p3.bewoplaner.data.AppPrefsConstants.USER_ID;
|
||||
|
||||
/**
|
||||
* Created by Rares Teodorescu on 21/02/2017.
|
||||
@@ -493,7 +493,7 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView> implements Cha
|
||||
public void downloadFile(Message message, String filePath, int itemPosition) {
|
||||
if (message.fileDownloaded) {
|
||||
getView().stopItemProgress(itemPosition);
|
||||
getView().fileDownloadedSuccessfully(filePath, getFileTypeFromFilePath(filePath));
|
||||
getView().fileDownloadedSuccessfully(filePath, FileUtils.getFileTypeFromFilePath(filePath));
|
||||
return;
|
||||
}
|
||||
downloadFileFromUrl(message.filePath, filePath, itemPosition)
|
||||
@@ -923,7 +923,7 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView> implements Cha
|
||||
int totalSize = urlConnection.getContentLength();
|
||||
|
||||
if (file.length() == totalSize || totalSize == -1) {
|
||||
subscriber.onNext(getFileTypeFromFilePath(filePath));
|
||||
subscriber.onNext(FileUtils.getFileTypeFromFilePath(filePath));
|
||||
subscriber.onCompleted();
|
||||
return;
|
||||
}
|
||||
@@ -958,7 +958,7 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView> implements Cha
|
||||
//close the output stream when done
|
||||
fileOutput.close();
|
||||
|
||||
subscriber.onNext(getFileTypeFromFilePath(filePath));
|
||||
subscriber.onNext(FileUtils.getFileTypeFromFilePath(filePath));
|
||||
subscriber.onCompleted();
|
||||
|
||||
} catch (IOException e) {
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.mvp.MVPView;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.mvp.MVPView;
|
||||
|
||||
import android.net.Uri;
|
||||
import android.support.annotation.StringRes;
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.chatmembers.ChatMembersActivity;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.chatmembers.ChatMembersActivity;
|
||||
import de.p3.bewoplaner.utils.Constants;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.utils.DateUtils;
|
||||
import com.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.utils.DateUtils;
|
||||
import de.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.view.Gravity;
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.utils.Constants;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
@@ -48,7 +48,7 @@ public class SingleChatActivity extends BaseChatActivity {
|
||||
|
||||
if (mSystemUtils.isNetworkUnavailable()) {
|
||||
mCallback.loadMessagesFromDBByGroupId(mGroup.id, true);
|
||||
showError(R.string.error_no_internet_connection);
|
||||
showError(de.p3.bewoplaner.R.string.error_no_internet_connection);
|
||||
} else {
|
||||
mCallback.loadMessagesFromServerByGroupId(mGroup.id);
|
||||
}
|
||||
@@ -66,7 +66,7 @@ public class SingleChatActivity extends BaseChatActivity {
|
||||
|
||||
if (mSystemUtils.isNetworkUnavailable()) {
|
||||
mCallback.loadMessagesFromDBByGroupId(mGroup.id, true);
|
||||
showError(R.string.error_no_internet_connection);
|
||||
showError(de.p3.bewoplaner.R.string.error_no_internet_connection);
|
||||
} else {
|
||||
mCallback.fetchNewMessages(mGroup.id);
|
||||
}
|
||||
@@ -89,12 +89,12 @@ public class SingleChatActivity extends BaseChatActivity {
|
||||
protected void loadMessages() {
|
||||
if (!TextUtils.isEmpty(mGroup.mobile)) {
|
||||
mExtraImageView.setVisibility(View.VISIBLE);
|
||||
mExtraImageView.setImageResource(R.drawable.call);
|
||||
mExtraImageView.setImageResource(de.p3.bewoplaner.R.drawable.call);
|
||||
}
|
||||
|
||||
if (mSystemUtils.isNetworkUnavailable()) {
|
||||
mCallback.loadMessagesFromDBByGroupId(mGroup.id, true);
|
||||
showError(R.string.error_no_internet_connection);
|
||||
showError(de.p3.bewoplaner.R.string.error_no_internet_connection);
|
||||
} else {
|
||||
mCallback.loadMessagesFromServerByGroupId(mGroup.id);
|
||||
}
|
||||
@@ -104,13 +104,13 @@ public class SingleChatActivity extends BaseChatActivity {
|
||||
protected void setToolbar() {
|
||||
mSingleChatTitleTextView.setVisibility(View.VISIBLE);
|
||||
mSingleChatTitleTextView.setText(mGroup.name);
|
||||
mSingleChatTitleTextView.setTextColor(ContextCompat.getColor(this, mGroup.isEmployee(mGroup.users) ? R.color.colorHelpGroup : R.color.colorBlack));
|
||||
mSingleChatTitleTextView.setTextColor(ContextCompat.getColor(this, mGroup.isEmployee(mGroup.users) ? de.p3.bewoplaner.R.color.colorHelpGroup : de.p3.bewoplaner.R.color.colorBlack));
|
||||
|
||||
if (TextUtils.isEmpty(mGroup.avatar)) {
|
||||
mChatImageView.setImageResource(R.drawable.avatar);
|
||||
mChatImageView.setImageResource(de.p3.bewoplaner.R.drawable.avatar);
|
||||
} else {
|
||||
Glide.with(this).load(mGroup.avatar)
|
||||
.placeholder(R.drawable.avatar)
|
||||
.placeholder(de.p3.bewoplaner.R.drawable.avatar)
|
||||
.dontAnimate()
|
||||
.into(mChatImageView);
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.page.chat;
|
||||
package de.p3.bewoplaner.page.chat;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.utils.DateUtils;
|
||||
import com.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.utils.DateUtils;
|
||||
import de.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.view.Gravity;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.chatmembers;
|
||||
package de.p3.bewoplaner.page.chatmembers;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.page.chatmembers;
|
||||
package de.p3.bewoplaner.page.chatmembers;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.model.User;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.model.User;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.page.common;
|
||||
package de.p3.bewoplaner.page.common;
|
||||
|
||||
import android.support.v4.app.Fragment;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.page.common;
|
||||
package de.p3.bewoplaner.page.common;
|
||||
|
||||
/**
|
||||
* Callback for requesting permission.
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.p3.bewoplaner.page.common;
|
||||
package de.p3.bewoplaner.page.common;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.utils.DialogHandler;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.utils.DialogHandler;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.content.Intent;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.p3.bewoplaner.page.contacts;
|
||||
package de.p3.bewoplaner.page.contacts;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.utils.DateUtils;
|
||||
import com.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.utils.DateUtils;
|
||||
import de.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
|
||||
import android.graphics.Typeface;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.contacts;
|
||||
package de.p3.bewoplaner.page.contacts;
|
||||
|
||||
import com.p3.bewoplaner.di.ApplicationComponent;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import com.p3.bewoplaner.page.chat.ChatModule;
|
||||
import de.p3.bewoplaner.di.ApplicationComponent;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.page.chat.ChatModule;
|
||||
|
||||
import dagger.Component;
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
package com.p3.bewoplaner.page.contacts;
|
||||
package de.p3.bewoplaner.page.contacts;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.events.GroupUpdatedEvent;
|
||||
import com.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.chat.GroupChatActivity;
|
||||
import com.p3.bewoplaner.page.chat.SingleChatActivity;
|
||||
import com.p3.bewoplaner.page.common.BaseFragment;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
import com.p3.bewoplaner.utils.ui.EmptyLayout;
|
||||
import com.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.events.GroupUpdatedEvent;
|
||||
import de.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.chat.GroupChatActivity;
|
||||
import de.p3.bewoplaner.page.chat.SingleChatActivity;
|
||||
import de.p3.bewoplaner.page.common.BaseFragment;
|
||||
import de.p3.bewoplaner.utils.Constants;
|
||||
import de.p3.bewoplaner.utils.ui.EmptyLayout;
|
||||
import de.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
@@ -1,22 +1,22 @@
|
||||
package com.p3.bewoplaner.page.contacts;
|
||||
package de.p3.bewoplaner.page.contacts;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
|
||||
import com.p3.bewoplaner.data.api.responses.GroupResponse;
|
||||
import com.p3.bewoplaner.data.api.services.ChatService;
|
||||
import com.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import com.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.UserRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.GroupByNameSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.GroupSpecification;
|
||||
import com.p3.bewoplaner.data.repository.specifications.UserByIdSpecification;
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
|
||||
import com.p3.bewoplaner.utils.SystemUtils;
|
||||
import com.p3.bewoplaner.utils.rx.RxUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
|
||||
import de.p3.bewoplaner.data.api.responses.GroupResponse;
|
||||
import de.p3.bewoplaner.data.api.services.ChatService;
|
||||
import de.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import de.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.UserRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.GroupByNameSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.GroupSpecification;
|
||||
import de.p3.bewoplaner.data.repository.specifications.UserByIdSpecification;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
|
||||
import de.p3.bewoplaner.utils.SystemUtils;
|
||||
import de.p3.bewoplaner.utils.rx.RxUtils;
|
||||
|
||||
import android.support.annotation.NonNull;
|
||||
import android.util.Log;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.contacts;
|
||||
package de.p3.bewoplaner.page.contacts;
|
||||
|
||||
import com.p3.bewoplaner.model.Group;
|
||||
import com.p3.bewoplaner.model.Message;
|
||||
import com.p3.bewoplaner.page.mvp.MVPView;
|
||||
import de.p3.bewoplaner.model.Group;
|
||||
import de.p3.bewoplaner.model.Message;
|
||||
import de.p3.bewoplaner.page.mvp.MVPView;
|
||||
|
||||
import android.support.annotation.StringRes;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.page.fileconfirmation;
|
||||
package de.p3.bewoplaner.page.fileconfirmation;
|
||||
|
||||
import android.database.Cursor;
|
||||
import android.net.Uri;
|
||||
@@ -10,10 +10,10 @@ import android.os.Bundle;
|
||||
import android.webkit.WebView;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
import com.p3.bewoplaner.utils.FileUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.utils.Constants;
|
||||
import de.p3.bewoplaner.utils.FileUtils;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.p3.bewoplaner.page.fileconfirmation;
|
||||
package de.p3.bewoplaner.page.fileconfirmation;
|
||||
|
||||
import com.p3.bewoplaner.di.ApplicationComponent;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.di.ApplicationComponent;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
|
||||
import dagger.Component;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.fileconfirmation;
|
||||
package de.p3.bewoplaner.page.fileconfirmation;
|
||||
|
||||
import com.p3.bewoplaner.data.api.services.ChatService;
|
||||
import com.p3.bewoplaner.di.P3DSEndpoint;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.data.api.services.ChatService;
|
||||
import de.p3.bewoplaner.di.P3DSEndpoint;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.p3.bewoplaner.page.fileconfirmation;
|
||||
package de.p3.bewoplaner.page.fileconfirmation;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.support.annotation.NonNull;
|
||||
|
||||
import com.p3.bewoplaner.data.api.services.ChatService;
|
||||
import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
|
||||
import de.p3.bewoplaner.data.api.services.ChatService;
|
||||
import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.fileconfirmation;
|
||||
package de.p3.bewoplaner.page.fileconfirmation;
|
||||
|
||||
import android.net.Uri;
|
||||
|
||||
import com.p3.bewoplaner.page.mvp.MVPLceView;
|
||||
import de.p3.bewoplaner.page.mvp.MVPLceView;
|
||||
|
||||
/**
|
||||
* Created by Lyndon on 13-Oct-2017.
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.page.impressum;
|
||||
package de.p3.bewoplaner.page.impressum;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.R;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.Intent;
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.p3.bewoplaner.page.login;
|
||||
package de.p3.bewoplaner.page.login;
|
||||
|
||||
import com.google.firebase.iid.FirebaseInstanceId;
|
||||
|
||||
import com.p3.bewoplaner.BewoplanerApplication;
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.prefs.AppPrefs;
|
||||
import com.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import com.p3.bewoplaner.page.main.MainActivity;
|
||||
import com.p3.bewoplaner.utils.AppStoppedService;
|
||||
import com.p3.bewoplaner.utils.DialogHandler;
|
||||
import com.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
import de.p3.bewoplaner.BewoplanerApplication;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.prefs.AppPrefs;
|
||||
import de.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.page.main.MainActivity;
|
||||
import de.p3.bewoplaner.utils.AppStoppedService;
|
||||
import de.p3.bewoplaner.utils.DialogHandler;
|
||||
import de.p3.bewoplaner.utils.ui.ViewUtils;
|
||||
import com.securepreferences.SecurePreferences;
|
||||
|
||||
import android.content.Intent;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.p3.bewoplaner.page.login;
|
||||
package de.p3.bewoplaner.page.login;
|
||||
|
||||
import com.p3.bewoplaner.di.ApplicationComponent;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.di.ApplicationComponent;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
|
||||
import dagger.Component;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.p3.bewoplaner.page.login;
|
||||
package de.p3.bewoplaner.page.login;
|
||||
|
||||
import com.p3.bewoplaner.data.api.services.LoginService;
|
||||
import com.p3.bewoplaner.data.api.services.RegisterService;
|
||||
import com.p3.bewoplaner.di.P3DSEndpoint;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.data.api.services.LoginService;
|
||||
import de.p3.bewoplaner.data.api.services.RegisterService;
|
||||
import de.p3.bewoplaner.di.P3DSEndpoint;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
@@ -1,31 +1,31 @@
|
||||
package com.p3.bewoplaner.page.login;
|
||||
package de.p3.bewoplaner.page.login;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
|
||||
import com.p3.bewoplaner.data.api.common.ErrorThrowable;
|
||||
import com.p3.bewoplaner.data.api.common.ErrorType;
|
||||
import com.p3.bewoplaner.data.api.common.ErrorUtils;
|
||||
import com.p3.bewoplaner.data.api.responses.RegisterResponse;
|
||||
import com.p3.bewoplaner.data.api.services.LoginService;
|
||||
import com.p3.bewoplaner.data.api.services.RegisterService;
|
||||
import com.p3.bewoplaner.data.prefs.AppPrefs;
|
||||
import com.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import com.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import com.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import com.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import com.p3.bewoplaner.data.repository.RealmProvider;
|
||||
import com.p3.bewoplaner.data.repository.UserRealmRepository;
|
||||
import com.p3.bewoplaner.model.User;
|
||||
import com.p3.bewoplaner.page.main.LogoutNavigation;
|
||||
import com.p3.bewoplaner.page.main.MainNavigation;
|
||||
import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
|
||||
import com.p3.bewoplaner.utils.SystemUtils;
|
||||
import com.p3.bewoplaner.utils.rx.RxUtils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
|
||||
import de.p3.bewoplaner.data.api.common.ErrorThrowable;
|
||||
import de.p3.bewoplaner.data.api.common.ErrorType;
|
||||
import de.p3.bewoplaner.data.api.common.ErrorUtils;
|
||||
import de.p3.bewoplaner.data.api.responses.RegisterResponse;
|
||||
import de.p3.bewoplaner.data.api.services.LoginService;
|
||||
import de.p3.bewoplaner.data.api.services.RegisterService;
|
||||
import de.p3.bewoplaner.data.prefs.AppPrefs;
|
||||
import de.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import de.p3.bewoplaner.data.prefs.LongPreference;
|
||||
import de.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import de.p3.bewoplaner.data.repository.GroupRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.MessageRealmRepository;
|
||||
import de.p3.bewoplaner.data.repository.RealmProvider;
|
||||
import de.p3.bewoplaner.data.repository.UserRealmRepository;
|
||||
import de.p3.bewoplaner.model.User;
|
||||
import de.p3.bewoplaner.page.main.LogoutNavigation;
|
||||
import de.p3.bewoplaner.page.main.MainNavigation;
|
||||
import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
|
||||
import de.p3.bewoplaner.utils.SystemUtils;
|
||||
import de.p3.bewoplaner.utils.rx.RxUtils;
|
||||
import com.securepreferences.SecurePreferences;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.p3.bewoplaner.page.login;
|
||||
package de.p3.bewoplaner.page.login;
|
||||
|
||||
import com.p3.bewoplaner.page.main.LogoutNavigation;
|
||||
import com.p3.bewoplaner.page.main.MainNavigation;
|
||||
import com.p3.bewoplaner.page.mvp.MVPLceView;
|
||||
import de.p3.bewoplaner.page.main.LogoutNavigation;
|
||||
import de.p3.bewoplaner.page.main.MainNavigation;
|
||||
import de.p3.bewoplaner.page.mvp.MVPLceView;
|
||||
|
||||
/**
|
||||
* Created by laszloffiferenc on 2/21/17.
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.page.main;
|
||||
package de.p3.bewoplaner.page.main;
|
||||
|
||||
public interface LogoutNavigation {
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
package com.p3.bewoplaner.page.main;
|
||||
package de.p3.bewoplaner.page.main;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.p3.bewoplaner.R;
|
||||
import com.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import com.p3.bewoplaner.data.events.InvalidTokenEvent;
|
||||
import com.p3.bewoplaner.data.events.LogoutDirectlyEvent;
|
||||
import com.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import com.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import com.p3.bewoplaner.di.InjectionHelper;
|
||||
import com.p3.bewoplaner.page.chat.GroupChatActivity;
|
||||
import com.p3.bewoplaner.page.chat.SingleChatActivity;
|
||||
import com.p3.bewoplaner.page.contacts.ContactsFragment;
|
||||
import com.p3.bewoplaner.page.impressum.ImpressumActivity;
|
||||
import com.p3.bewoplaner.page.login.LoginActivity;
|
||||
import com.p3.bewoplaner.page.login.LoginPresenter;
|
||||
import com.p3.bewoplaner.page.profile.ProfileFragment;
|
||||
import com.p3.bewoplaner.utils.Constants;
|
||||
import com.p3.bewoplaner.utils.DialogHandler;
|
||||
import com.p3.bewoplaner.utils.SystemUtils;
|
||||
import com.p3.bewoplaner.utils.Utils;
|
||||
import de.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.data.AppPrefsConstants;
|
||||
import de.p3.bewoplaner.data.events.InvalidTokenEvent;
|
||||
import de.p3.bewoplaner.data.events.LogoutDirectlyEvent;
|
||||
import de.p3.bewoplaner.data.prefs.BooleanPreference;
|
||||
import de.p3.bewoplaner.data.prefs.StringPreference;
|
||||
import de.p3.bewoplaner.di.InjectionHelper;
|
||||
import de.p3.bewoplaner.page.chat.GroupChatActivity;
|
||||
import de.p3.bewoplaner.page.chat.SingleChatActivity;
|
||||
import de.p3.bewoplaner.page.contacts.ContactsFragment;
|
||||
import de.p3.bewoplaner.page.impressum.ImpressumActivity;
|
||||
import de.p3.bewoplaner.page.login.LoginActivity;
|
||||
import de.p3.bewoplaner.page.login.LoginPresenter;
|
||||
import de.p3.bewoplaner.page.profile.ProfileFragment;
|
||||
import de.p3.bewoplaner.utils.Constants;
|
||||
import de.p3.bewoplaner.utils.DialogHandler;
|
||||
import de.p3.bewoplaner.utils.SystemUtils;
|
||||
import de.p3.bewoplaner.utils.Utils;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.p3.bewoplaner.page.main;
|
||||
package de.p3.bewoplaner.page.main;
|
||||
|
||||
import com.p3.bewoplaner.di.ApplicationComponent;
|
||||
import com.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import com.p3.bewoplaner.page.chat.ChatModule;
|
||||
import com.p3.bewoplaner.page.login.LoginModule;
|
||||
import com.p3.bewoplaner.utils.AppStoppedService;
|
||||
import de.p3.bewoplaner.di.ApplicationComponent;
|
||||
import de.p3.bewoplaner.di.scopes.ActivityScope;
|
||||
import de.p3.bewoplaner.page.chat.ChatModule;
|
||||
import de.p3.bewoplaner.page.login.LoginModule;
|
||||
import de.p3.bewoplaner.utils.AppStoppedService;
|
||||
|
||||
import dagger.Component;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.page.main;
|
||||
package de.p3.bewoplaner.page.main;
|
||||
|
||||
/**
|
||||
* Created by imarneanu on 2/10/17.
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.p3.bewoplaner.page.main;
|
||||
package de.p3.bewoplaner.page.main;
|
||||
|
||||
import com.p3.bewoplaner.R;
|
||||
import de.p3.bewoplaner.R;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
@@ -1,14 +1,14 @@
|
||||
package com.p3.bewoplaner.page.mvp;
|
||||
package de.p3.bewoplaner.page.mvp;
|
||||
|
||||
import android.support.annotation.CallSuper;
|
||||
import android.support.annotation.NonNull;
|
||||
|
||||
import de.p3.bewoplaner.utils.Preconditions;
|
||||
import rx.Subscription;
|
||||
import rx.subscriptions.CompositeSubscription;
|
||||
|
||||
import static com.p3.bewoplaner.utils.Preconditions.checkNotNull;
|
||||
import static com.p3.bewoplaner.utils.Preconditions.checkNull;
|
||||
import static com.p3.bewoplaner.utils.Preconditions.checkState;
|
||||
import static de.p3.bewoplaner.utils.Preconditions.checkNotNull;
|
||||
import static de.p3.bewoplaner.utils.Preconditions.checkState;
|
||||
|
||||
/**
|
||||
* Created by imarneanu on 2/9/17.
|
||||
@@ -29,20 +29,20 @@ public abstract class MVPAbstractPresenter<V extends MVPView>
|
||||
|
||||
@Override
|
||||
public final void attachView(@NonNull V view) {
|
||||
checkNull(mView, "view is already attached");
|
||||
Preconditions.checkNull(mView, "view is already attached");
|
||||
mView = view;
|
||||
afterAttachView(view);
|
||||
checkState((mCalledThroughSuper & METHOD_AFTER_ATTACH) == METHOD_AFTER_ATTACH,
|
||||
Preconditions.checkState((mCalledThroughSuper & METHOD_AFTER_ATTACH) == METHOD_AFTER_ATTACH,
|
||||
"super.afterAttachView() not called");
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void detachView() {
|
||||
checkNotNull(mCompositeSubscription, "subscriptionList is NULL");
|
||||
Preconditions.checkNotNull(mCompositeSubscription, "subscriptionList is NULL");
|
||||
mCompositeSubscription.clear();
|
||||
checkNotNull(mView, "view is not attached");
|
||||
Preconditions.checkNotNull(mView, "view is not attached");
|
||||
beforeDetachView(mView);
|
||||
checkState((mCalledThroughSuper & METHOD_BEFORE_DETACH) == METHOD_BEFORE_DETACH,
|
||||
Preconditions.checkState((mCalledThroughSuper & METHOD_BEFORE_DETACH) == METHOD_BEFORE_DETACH,
|
||||
"super.beforeDetachView() not called");
|
||||
mView = null;
|
||||
mCalledThroughSuper = 0;
|
||||
@@ -60,7 +60,7 @@ public abstract class MVPAbstractPresenter<V extends MVPView>
|
||||
*/
|
||||
@NonNull
|
||||
protected V getView() {
|
||||
checkNotNull(mView, "view is not attached");
|
||||
Preconditions.checkNotNull(mView, "view is not attached");
|
||||
return mView;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.p3.bewoplaner.page.mvp;
|
||||
package de.p3.bewoplaner.page.mvp;
|
||||
|
||||
import android.support.annotation.StringRes;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user