Comunic/ComunicAndroid
1
0
Fork 0
mirror of https://github.com/pierre42100/ComunicAndroid synced 2024-11-27 15:59:29 +00:00
Code Issues Projects Releases Wiki Activity

Restructured data folder

Browse Source
This commit is contained in:
Pierre 2018-04-10 18:50:50 +02:00
parent 648f6ca9af
commit a910beca51
74 changed files with 290 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/communiquons/android/comunic/client/api/APIRequest.java
View File

@ -5,7 +5,7 @@ import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import org.communiquons.android.comunic.client.BuildConfig;
import org.communiquons.android.comunic.client.data.Account.Account;
import org.communiquons.android.comunic.client.data.helpers.AccountHelper;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
@ -132,14 +132,14 @@ public class APIRequest {
private void addLoginTokens(APIRequestParameters params){
//Create account object
Account account = new Account(params.getContext());
AccountHelper accountHelper = new AccountHelper(params.getContext());
//Check if user is signed in or not
if(!account.signed_in())
if(!accountHelper.signed_in())
return; //Do nothing
//Get login tokens
ArrayList<String> tokens = account.getLoginTokens();
ArrayList<String> tokens = accountHelper.getLoginTokens();
if(tokens.size() < 2)
return; //Not enough tokens

4
app/src/main/java/org/communiquons/android/comunic/client/data/DatabaseContract.java
View File

@ -15,8 +15,8 @@ public final class DatabaseContract {
public DatabaseContract(){}
/* Database basic information */
static final int DATABASE_VERSION = 4;
static final String DATABASE_NAME = "database.db";
public static final int DATABASE_VERSION = 4;
public static final String DATABASE_NAME = "database.db";
/* Users info table */
public static abstract class UsersInfoSchema implements BaseColumns {

6
app/src/main/java/org/communiquons/android/comunic/client/data/notifications/NotifsList.java → app/src/main/java/org/communiquons/android/comunic/client/data/arrays/NotifsList.java
View File

@ -1,9 +1,11 @@
package org.communiquons.android.comunic.client.data.notifications;
package org.communiquons.android.comunic.client.data.arrays;
import android.support.annotation.Nullable;
import android.util.ArrayMap;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.enums.NotifElemType;
import org.communiquons.android.comunic.client.data.models.Notif;
import java.util.ArrayList;

5
app/src/main/java/org/communiquons/android/comunic/client/data/posts/PostsList.java → app/src/main/java/org/communiquons/android/comunic/client/data/arrays/PostsList.java
View File

@ -1,6 +1,7 @@
package org.communiquons.android.comunic.client.data.posts;
package org.communiquons.android.comunic.client.data.arrays;
import org.communiquons.android.comunic.client.data.comments.Comment;
import org.communiquons.android.comunic.client.data.models.Comment;
import org.communiquons.android.comunic.client.data.models.Post;
import java.util.ArrayList;

22
app/src/main/java/org/communiquons/android/comunic/client/api/APIRequestTask.java → app/src/main/java/org/communiquons/android/comunic/client/data/asynctasks/APIRequestTask.java
View File

@ -1,24 +1,10 @@
package org.communiquons.android.comunic.client.api;
package org.communiquons.android.comunic.client.data.asynctasks;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.AsyncTask;
import org.communiquons.android.comunic.client.data.Account.Account;
import org.communiquons.android.comunic.client.BuildConfig;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
/**
* Perform an API request on the server

11
app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/GetUsersInfos.java → app/src/main/java/org/communiquons/android/comunic/client/data/asynctasks/GetUsersInfos.java
View File

@ -1,15 +1,12 @@
package org.communiquons.android.comunic.client.data.UsersInfo;
package org.communiquons.android.comunic.client.data.asynctasks;
import android.content.Context;
import android.os.AsyncTask;
import android.util.ArrayMap;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIRequestTask;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.json.JSONException;
import org.json.JSONObject;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import java.util.ArrayList;

3
app/src/main/java/org/communiquons/android/comunic/client/data/ImageLoad/ImageLoadTask.java → app/src/main/java/org/communiquons/android/comunic/client/data/asynctasks/ImageLoadTask.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.ImageLoad;
package org.communiquons.android.comunic.client.data.asynctasks;
import android.content.Context;
import android.graphics.Bitmap;
@ -7,6 +7,7 @@ import android.os.AsyncTask;
import android.util.Log;
import android.widget.ImageView;
import org.communiquons.android.comunic.client.data.utils.ImageLoadUtils;
import org.communiquons.android.comunic.client.data.utils.Utilities;
import java.io.File;

2
app/src/main/java/org/communiquons/android/comunic/client/data/likes/LikesType.java → app/src/main/java/org/communiquons/android/comunic/client/data/enums/LikesType.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.likes;
package org.communiquons.android.comunic.client.data.enums;
/**
* Likes types

2
app/src/main/java/org/communiquons/android/comunic/client/data/notifications/NotifElemType.java → app/src/main/java/org/communiquons/android/comunic/client/data/enums/NotifElemType.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.notifications;
package org.communiquons.android.comunic.client.data.enums;
/**
* Notifications elements type

2
app/src/main/java/org/communiquons/android/comunic/client/data/notifications/NotificationTypes.java → app/src/main/java/org/communiquons/android/comunic/client/data/enums/NotificationTypes.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.notifications;
package org.communiquons.android.comunic.client.data.enums;
/**
* Enum of the notifications types

4
app/src/main/java/org/communiquons/android/comunic/client/data/notifications/NotificationVisibility.java → app/src/main/java/org/communiquons/android/comunic/client/data/enums/NotificationVisibility.java
View File

@ -1,7 +1,7 @@
package org.communiquons.android.comunic.client.data.notifications;
package org.communiquons.android.comunic.client.data.enums;
/**
* Notifications visibility enum
* Notifications visibility enums
*
* @author Pierre HUBERT
* Created by pierre on 4/9/18.

2
app/src/main/java/org/communiquons/android/comunic/client/data/posts/PageType.java → app/src/main/java/org/communiquons/android/comunic/client/data/enums/PageType.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.posts;
package org.communiquons.android.comunic.client.data.enums;
/**
* Page types

4
app/src/main/java/org/communiquons/android/comunic/client/data/posts/PostTypes.java → app/src/main/java/org/communiquons/android/comunic/client/data/enums/PostTypes.java
View File

@ -1,7 +1,7 @@
package org.communiquons.android.comunic.client.data.posts;
package org.communiquons.android.comunic.client.data.enums;
/**
* Posts types enum
* Posts types enums
*
* @author Pierre HUBERT
* Created by pierre on 1/28/18.

4
app/src/main/java/org/communiquons/android/comunic/client/data/posts/PostUserAccess.java → app/src/main/java/org/communiquons/android/comunic/client/data/enums/PostUserAccess.java
View File

@ -1,7 +1,7 @@
package org.communiquons.android.comunic.client.data.posts;
package org.communiquons.android.comunic.client.data.enums;
/**
* Post users access enum
* Post users access enums
*
* @author Pierre HUBERT
* Created by pierre on 3/25/18.

2
app/src/main/java/org/communiquons/android/comunic/client/data/posts/PostVisibilityLevels.java → app/src/main/java/org/communiquons/android/comunic/client/data/enums/PostVisibilityLevels.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.posts;
package org.communiquons.android.comunic.client.data.enums;
/**
* Post visibility levels

6
app/src/main/java/org/communiquons/android/comunic/client/data/Account/Account.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/AccountHelper.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.Account;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.util.Log;
@ -19,7 +19,7 @@ import java.util.Objects;
* Created by pierre on 10/29/17.
*/
public class Account {
public class AccountHelper {
/**
* Utilities object
@ -46,7 +46,7 @@ public class Account {
*
* @param context Context of the application
*/
public Account(Context context){
public AccountHelper(Context context){
mContext = context;
utils = new Utilities(context);

3
app/src/main/java/org/communiquons/android/comunic/client/data/comments/CommentsHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/CommentsHelper.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.comments;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.support.annotation.NonNull;
@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.models.Comment;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

5
app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessagesDbHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ConversationMessagesDbHelper.java
View File

@ -1,14 +1,13 @@
package org.communiquons.android.comunic.client.data.conversations;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.DatabaseContract.ConversationsMessagesSchema;
import org.communiquons.android.comunic.client.data.models.ConversationMessage;
import java.util.ArrayList;

10
app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessagesHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ConversationMessagesHelper.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.conversations;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.support.annotation.Nullable;
@ -7,7 +7,7 @@ import android.util.Log;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.models.ConversationMessage;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@ -55,7 +55,7 @@ public class ConversationMessagesHelper {
* @param conversation_id The ID of the conversation to refresh
* @return TRUE in case of success / FALSE else
*/
boolean refresh_conversation(int conversation_id){
public boolean refresh_conversation(int conversation_id){
//Get the ID of the last message available in the database
int last_message_id = getLastIDFromDb(conversation_id);
@ -116,7 +116,7 @@ public class ConversationMessagesHelper {
* @return The message of the interval, or null in case of failure
*/
@Nullable
ArrayList<ConversationMessage> getInDb(int conv, int start, int end){
public ArrayList<ConversationMessage> getInDb(int conv, int start, int end){
return mDbHelper.getInterval(conv, start, end);
@ -128,7 +128,7 @@ public class ConversationMessagesHelper {
* @param conversation_id Target conversation
* @return The ID of the last message available in the database or 0 in case of failure
*/
int getLastIDFromDb(int conversation_id){
public int getLastIDFromDb(int conversation_id){
//Get the id of the last message available in the database
ConversationMessage last_message = mDbHelper.getLast(conversation_id);

5
app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationsListDbHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ConversationsListDbHelper.java
View File

@ -1,14 +1,13 @@
package org.communiquons.android.comunic.client.data.conversations;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;
import org.communiquons.android.comunic.client.data.DatabaseContract.ConversationsListSchema;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.models.ConversationsInfo;
import java.util.ArrayList;

9
app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationsListHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ConversationsListHelper.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.conversations;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.support.annotation.NonNull;
@ -9,10 +9,9 @@ import android.util.Log;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.utils.AccountUtils;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.ConversationsInfo;
import org.communiquons.android.comunic.client.data.utils.ArrayUtils;
import org.json.JSONArray;
import org.json.JSONException;

3
app/src/main/java/org/communiquons/android/comunic/client/data/DatabaseHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/DatabaseHelper.java
View File

@ -1,9 +1,10 @@
package org.communiquons.android.comunic.client.data;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import org.communiquons.android.comunic.client.data.DatabaseContract;
import org.communiquons.android.comunic.client.data.DatabaseContract.FriendsListSchema;
import org.communiquons.android.comunic.client.data.DatabaseContract.UsersInfoSchema;
import org.communiquons.android.comunic.client.data.DatabaseContract.ConversationsListSchema;

4
app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendsListDbHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/FriendsListDbHelper.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.friendsList;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.ContentValues;
import android.database.Cursor;
@ -6,8 +6,8 @@ import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.DatabaseContract.FriendsListSchema;
import org.communiquons.android.comunic.client.data.models.Friend;
import java.util.ArrayList;

6
app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendsListHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/FriendsListHelper.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.friendsList;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.support.annotation.Nullable;
@ -7,7 +7,7 @@ import android.util.Log;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.models.Friend;
import org.json.JSONArray;
import org.json.JSONObject;
@ -66,7 +66,7 @@ public class FriendsListHelper {
* @return The list of friend of the user
*/
@Nullable
ArrayList<Friend> download(){
public ArrayList<Friend> download(){
//Prepare the API request
APIRequestParameters params = new APIRequestParameters(mContext, "friends/getList");

5
app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/GetUsersHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/GetUsersHelper.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.UsersInfo;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.support.annotation.NonNull;
@ -9,7 +9,8 @@ import android.util.Log;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.models.AdvancedUserInfo;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

8
app/src/main/java/org/communiquons/android/comunic/client/data/ImageLoad/ImageLoadManager.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ImageLoadHelper.java
View File

@ -1,18 +1,20 @@
package org.communiquons.android.comunic.client.data.ImageLoad;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.util.ArrayMap;
import android.view.View;
import android.widget.ImageView;
import org.communiquons.android.comunic.client.data.runnables.ImageLoadRunnable;
/**
* Image load manager
* Image load manager / helper
*
* @author Pierre HUBERT
* Created by pierre on 11/18/17.
*/
public class ImageLoadManager {
public class ImageLoadHelper {
/**
* The list of running operations

3
app/src/main/java/org/communiquons/android/comunic/client/data/likes/LikesHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/LikesHelper.java
View File

@ -1,10 +1,11 @@
package org.communiquons.android.comunic.client.data.likes;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.enums.LikesType;
/**
* Likes Helper

8
app/src/main/java/org/communiquons/android/comunic/client/data/notifications/NotificationsHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/NotificationsHelper.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.notifications;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.support.annotation.Nullable;
@ -6,6 +6,12 @@ import android.support.annotation.Nullable;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.models.Notif;
import org.communiquons.android.comunic.client.data.enums.NotifElemType;
import org.communiquons.android.comunic.client.data.enums.NotificationTypes;
import org.communiquons.android.comunic.client.data.enums.NotificationVisibility;
import org.communiquons.android.comunic.client.data.models.NotificationsCount;
import org.communiquons.android.comunic.client.data.arrays.NotifsList;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

11
app/src/main/java/org/communiquons/android/comunic/client/data/posts/PostsHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/PostsHelper.java
View File

@ -1,13 +1,18 @@
package org.communiquons.android.comunic.client.data.posts;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.Context;
import android.support.annotation.Nullable;
import android.util.Log;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.comments.CommentsHelper;
import org.communiquons.android.comunic.client.data.models.CreatePost;
import org.communiquons.android.comunic.client.data.enums.PageType;
import org.communiquons.android.comunic.client.data.models.Post;
import org.communiquons.android.comunic.client.data.enums.PostTypes;
import org.communiquons.android.comunic.client.data.enums.PostUserAccess;
import org.communiquons.android.comunic.client.data.enums.PostVisibilityLevels;
import org.communiquons.android.comunic.client.data.arrays.PostsList;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

4
app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/UsersInfosDbHelper.java → app/src/main/java/org/communiquons/android/comunic/client/data/helpers/UsersInfosDbHelper.java
View File

@ -1,11 +1,11 @@
package org.communiquons.android.comunic.client.data.UsersInfo;
package org.communiquons.android.comunic.client.data.helpers;
import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import org.communiquons.android.comunic.client.data.DatabaseContract.UsersInfoSchema;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
/**
* Users information helpers

2
app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/AdvancedUserInfo.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/AdvancedUserInfo.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.UsersInfo;
package org.communiquons.android.comunic.client.data.models;
/**
* Advanced informations about a single user

2
app/src/main/java/org/communiquons/android/comunic/client/data/comments/Comment.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/Comment.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.comments;
package org.communiquons.android.comunic.client.data.models;
import android.support.annotation.Nullable;

8
app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessage.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/ConversationMessage.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.conversations;
package org.communiquons.android.comunic.client.data.models;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -47,7 +47,7 @@ public class ConversationMessage {
*
* @param conversation_id The ID of the conversation
*/
void setConversation_id(int conversation_id) {
public void setConversation_id(int conversation_id) {
this.conversation_id = conversation_id;
}
@ -65,7 +65,7 @@ public class ConversationMessage {
*
* @param user_id The ID of the user
*/
void setUser_id(int user_id) {
public void setUser_id(int user_id) {
this.user_id = user_id;
}
@ -145,7 +145,7 @@ public class ConversationMessage {
*
* @param time_insert The time of insertion of the message
*/
void setTime_insert(int time_insert) {
public void setTime_insert(int time_insert) {
this.time_insert = time_insert;
}

14
app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationsInfo.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/ConversationsInfo.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.conversations;
package org.communiquons.android.comunic.client.data.models;
import android.support.annotation.Nullable;
import android.util.Log;
@ -38,7 +38,7 @@ public class ConversationsInfo {
*
* @param ID The ID of the conversation
*/
void setID(int ID) {
public void setID(int ID) {
this.ID = ID;
}
@ -56,7 +56,7 @@ public class ConversationsInfo {
*
* @param ID_owner The ID of the owner of the conversation
*/
void setID_owner(int ID_owner) {
public void setID_owner(int ID_owner) {
this.ID_owner = ID_owner;
}
@ -74,7 +74,7 @@ public class ConversationsInfo {
*
* @param last_active The timestamp of the last activity of the conversation
*/
void setLast_active(int last_active) {
public void setLast_active(int last_active) {
this.last_active = last_active;
}
@ -126,7 +126,7 @@ public class ConversationsInfo {
*
* @param following True if the user is following the conversation
*/
void setFollowing(boolean following) {
public void setFollowing(boolean following) {
this.following = following;
}
@ -144,7 +144,7 @@ public class ConversationsInfo {
*
* @param saw_last_message True if the user has seen the last message of the conversation
*/
void setSaw_last_message(boolean saw_last_message) {
public void setSaw_last_message(boolean saw_last_message) {
this.saw_last_message = saw_last_message;
}
@ -171,7 +171,7 @@ public class ConversationsInfo {
*
* @param id The ID of the member to add
*/
void addMember(Integer id){
public void addMember(Integer id){
if(members == null)
members = new ArrayList<>();

2
app/src/main/java/org/communiquons/android/comunic/client/data/posts/CreatePost.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/CreatePost.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.posts;
package org.communiquons.android.comunic.client.data.models;
/**
* This object extends the Post object in order to include all the required informations to

2
app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/Friend.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/Friend.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.friendsList;
package org.communiquons.android.comunic.client.data.models;
import org.communiquons.android.comunic.client.data.utils.Utilities;

4
app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendUser.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/FriendUser.java
View File

@ -1,6 +1,4 @@
package org.communiquons.android.comunic.client.data.friendsList;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
package org.communiquons.android.comunic.client.data.models;
/**
* This class contains information about a friend but also about user himself

6
app/src/main/java/org/communiquons/android/comunic/client/data/notifications/Notif.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/Notif.java
View File

@ -1,4 +1,8 @@
package org.communiquons.android.comunic.client.data.notifications;
package org.communiquons.android.comunic.client.data.models;
import org.communiquons.android.comunic.client.data.enums.NotifElemType;
import org.communiquons.android.comunic.client.data.enums.NotificationTypes;
import org.communiquons.android.comunic.client.data.enums.NotificationVisibility;
/**
* Notification object

2
app/src/main/java/org/communiquons/android/comunic/client/data/notifications/NotificationsCount.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/NotificationsCount.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.notifications;
package org.communiquons.android.comunic.client.data.models;
/**
* Notifications count service

15
app/src/main/java/org/communiquons/android/comunic/client/data/posts/Post.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/Post.java
View File

@ -1,8 +1,11 @@
package org.communiquons.android.comunic.client.data.posts;
package org.communiquons.android.comunic.client.data.models;
import android.support.annotation.Nullable;
import org.communiquons.android.comunic.client.data.comments.Comment;
import org.communiquons.android.comunic.client.data.enums.PageType;
import org.communiquons.android.comunic.client.data.enums.PostTypes;
import org.communiquons.android.comunic.client.data.enums.PostUserAccess;
import org.communiquons.android.comunic.client.data.enums.PostVisibilityLevels;
import java.util.ArrayList;
@ -62,7 +65,7 @@ public class Post {
//Set and get the post creation time
void setPost_time(int post_time) {
public void setPost_time(int post_time) {
this.post_time = post_time;
}
@ -119,7 +122,7 @@ public class Post {
}
//Set and get comments list
void setComments_list(ArrayList<Comment> comments_list) {
public void setComments_list(ArrayList<Comment> comments_list) {
this.comments_list = comments_list;
}
@ -129,7 +132,7 @@ public class Post {
}
//Set and post user access level
void setUser_access_level(PostUserAccess user_access_level) {
public void setUser_access_level(PostUserAccess user_access_level) {
this.user_access_level = user_access_level;
}
@ -177,7 +180,7 @@ public class Post {
}
//Set and get file path url
void setFile_path_url(String file_path_url) {
public void setFile_path_url(String file_path_url) {
this.file_path_url = file_path_url;
}

2
app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/UserInfo.java → app/src/main/java/org/communiquons/android/comunic/client/data/models/UserInfo.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.UsersInfo;
package org.communiquons.android.comunic.client.data.models;
import org.communiquons.android.comunic.client.data.utils.Utilities;

5
app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationRefreshRunnable.java → app/src/main/java/org/communiquons/android/comunic/client/data/runnables/ConversationRefreshRunnable.java
View File

@ -1,9 +1,12 @@
package org.communiquons.android.comunic.client.data.conversations;
package org.communiquons.android.comunic.client.data.runnables;
import android.app.Activity;
import android.support.annotation.NonNull;
import android.util.Log;
import org.communiquons.android.comunic.client.data.helpers.ConversationMessagesHelper;
import org.communiquons.android.comunic.client.data.models.ConversationMessage;
import java.util.ArrayList;
/**

4
app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendRefreshLoopRunnable.java → app/src/main/java/org/communiquons/android/comunic/client/data/runnables/FriendRefreshLoopRunnable.java
View File

@ -1,9 +1,9 @@
package org.communiquons.android.comunic.client.data.friendsList;
package org.communiquons.android.comunic.client.data.runnables;
import android.content.Context;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
/**
* Automatically refresh friends list thread

7
app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendsListRefreshRunnable.java → app/src/main/java/org/communiquons/android/comunic/client/data/runnables/FriendsListRefreshRunnable.java
View File

@ -1,8 +1,11 @@
package org.communiquons.android.comunic.client.data.friendsList;
package org.communiquons.android.comunic.client.data.runnables;
import android.content.Context;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.FriendsListDbHelper;
import org.communiquons.android.comunic.client.data.helpers.FriendsListHelper;
import org.communiquons.android.comunic.client.data.models.Friend;
import java.util.ArrayList;

4
app/src/main/java/org/communiquons/android/comunic/client/data/ImageLoad/ImageDownloadRunnable.java → app/src/main/java/org/communiquons/android/comunic/client/data/runnables/ImageDownloadRunnable.java
View File

@ -1,9 +1,9 @@
package org.communiquons.android.comunic.client.data.ImageLoad;
package org.communiquons.android.comunic.client.data.runnables;
import android.graphics.Bitmap;
import android.util.Log;
import org.communiquons.android.comunic.client.data.utils.BitmapUtils;
import org.communiquons.android.comunic.client.ui.utils.BitmapUtils;
import org.communiquons.android.comunic.client.data.utils.Utilities;
import java.io.File;

2
app/src/main/java/org/communiquons/android/comunic/client/data/ImageLoad/ImageLoadApplyRunnable.java → app/src/main/java/org/communiquons/android/comunic/client/data/runnables/ImageLoadApplyRunnable.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.ImageLoad;
package org.communiquons.android.comunic.client.data.runnables;
import android.graphics.Bitmap;
import android.support.annotation.UiThread;

8
app/src/main/java/org/communiquons/android/comunic/client/data/ImageLoad/ImageLoadRunnable.java → app/src/main/java/org/communiquons/android/comunic/client/data/runnables/ImageLoadRunnable.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.ImageLoad;
package org.communiquons.android.comunic.client.data.runnables;
import android.content.Context;
import android.graphics.Bitmap;
@ -7,6 +7,8 @@ import android.util.ArrayMap;
import android.util.Log;
import android.widget.ImageView;
import org.communiquons.android.comunic.client.data.utils.ImageLoadUtils;
import java.io.File;
import java.io.FileInputStream;
@ -20,7 +22,7 @@ import java.io.FileInputStream;
* Created by pierre on 11/18/17.
*/
class ImageLoadRunnable implements Runnable {
public class ImageLoadRunnable implements Runnable {
/**
* Debug tag
@ -59,7 +61,7 @@ class ImageLoadRunnable implements Runnable {
* @param imageView The imageView of the image
* @param url The URL of the image
*/
ImageLoadRunnable(Context context, ImageView imageView, String url){
public ImageLoadRunnable(Context context, ImageView imageView, String url){
//Check if the list of pending operations has to be initialized or not
if(pendingOperation == null)

8
app/src/main/java/org/communiquons/android/comunic/client/data/services/NotificationsService.java
View File

@ -10,9 +10,9 @@ import android.support.annotation.Nullable;
import android.util.Log;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.Account.Account;
import org.communiquons.android.comunic.client.data.notifications.NotificationsCount;
import org.communiquons.android.comunic.client.data.notifications.NotificationsHelper;
import org.communiquons.android.comunic.client.data.helpers.AccountHelper;
import org.communiquons.android.comunic.client.data.models.NotificationsCount;
import org.communiquons.android.comunic.client.data.helpers.NotificationsHelper;
import org.communiquons.android.comunic.client.data.utils.PreferencesUtils;
import org.communiquons.android.comunic.client.ui.activities.MainActivity;
@ -80,7 +80,7 @@ public class NotificationsService extends IntentService {
}
//Check if the user is signed in or not
if(!new Account(this).signed_in()){
if(!new AccountHelper(this).signed_in()){
Log.v(TAG, "Skip notifications refresh because the user is not signed in.");
removeNotification();
continue;

5
app/src/main/java/org/communiquons/android/comunic/client/data/Account/AccountUtils.java → app/src/main/java/org/communiquons/android/comunic/client/data/utils/AccountUtils.java
View File

@ -1,11 +1,10 @@
package org.communiquons.android.comunic.client.data.Account;
package org.communiquons.android.comunic.client.data.utils;
import android.content.Context;
import org.communiquons.android.comunic.client.api.APIRequestParameters;
import org.communiquons.android.comunic.client.api.APIRequestTask;
import org.communiquons.android.comunic.client.data.asynctasks.APIRequestTask;
import org.communiquons.android.comunic.client.api.APIResponse;
import org.communiquons.android.comunic.client.data.utils.Utilities;
import org.json.JSONObject;
/**

8
app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendsUtils.java → app/src/main/java/org/communiquons/android/comunic/client/data/utils/FriendsUtils.java
View File

@ -1,8 +1,10 @@
package org.communiquons.android.comunic.client.data.friendsList;
package org.communiquons.android.comunic.client.data.utils;
import android.util.ArrayMap;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.Friend;
import org.communiquons.android.comunic.client.data.models.FriendUser;
import java.util.ArrayList;
@ -38,7 +40,7 @@ public class FriendsUtils {
* @return The result of the operation
*/
public static ArrayList<FriendUser> merge_friends_user_infos_list(ArrayList<Friend> friendsList,
ArrayMap<Integer, UserInfo> userInfos){
ArrayMap<Integer, UserInfo> userInfos){
ArrayList<FriendUser> list = new ArrayList<>();

10
app/src/main/java/org/communiquons/android/comunic/client/data/ImageLoad/ImageLoadUtils.java → app/src/main/java/org/communiquons/android/comunic/client/data/utils/ImageLoadUtils.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.ImageLoad;
package org.communiquons.android.comunic.client.data.utils;
import android.content.Context;
import android.util.Log;
@ -14,7 +14,7 @@ import java.io.File;
* Created by pierre on 11/18/17.
*/
class ImageLoadUtils {
public class ImageLoadUtils {
/**
* Debug tag
@ -24,7 +24,7 @@ class ImageLoadUtils {
/**
* The main folder in the cache directory that stores the file
*/
static final String IMAGE_CACHE_DIRECTORY = "img_cache/";
public static final String IMAGE_CACHE_DIRECTORY = "img_cache/";
/**
* Get the file name, based on the URL name
@ -32,7 +32,7 @@ class ImageLoadUtils {
* @param url The URL of the file
* @return The name of the file, composed of characters that can be used in filename
*/
static String get_file_name(String url){
public static String get_file_name(String url){
return Utilities.sha1(url);
}
@ -42,7 +42,7 @@ class ImageLoadUtils {
* @param context Context of execution
* @return True in case of success
*/
static boolean create_parent_directory(Context context){
public static boolean create_parent_directory(Context context){
File parent = new File(context.getCacheDir(), IMAGE_CACHE_DIRECTORY);
//Check if parent directory already exists

9
app/src/main/java/org/communiquons/android/comunic/client/ui/activities/LoginActivity.java
View File

@ -11,8 +11,9 @@ import android.widget.TextView;
import android.widget.Toast;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.Account.Account;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.asynctasks.APIRequestTask;
import org.communiquons.android.comunic.client.data.helpers.AccountHelper;
import org.communiquons.android.comunic.client.data.utils.AccountUtils;
import org.communiquons.android.comunic.client.data.utils.Utilities;
import org.json.JSONException;
import org.json.JSONObject;
@ -161,8 +162,8 @@ public class LoginActivity extends AppCompatActivity {
tokens.add(tokensObj.getString("token2"));
//Save tokens
Account account = new Account(this);
if(!account.save_new_tokens(tokens)) {
AccountHelper accountHelper = new AccountHelper(this);
if(!accountHelper.save_new_tokens(tokens)) {
show_err_server_response();
return;
}

25
app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
View File

@ -6,7 +6,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceFragment;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.BottomNavigationView;
@ -18,14 +17,14 @@ import android.widget.Toast;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.api.APIRequest;
import org.communiquons.android.comunic.client.data.Account.Account;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper;
import org.communiquons.android.comunic.client.data.friendsList.FriendRefreshLoopRunnable;
import org.communiquons.android.comunic.client.data.helpers.AccountHelper;
import org.communiquons.android.comunic.client.data.utils.AccountUtils;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.helpers.ConversationsListHelper;
import org.communiquons.android.comunic.client.data.runnables.FriendRefreshLoopRunnable;
import org.communiquons.android.comunic.client.data.services.NotificationsService;
import org.communiquons.android.comunic.client.data.utils.UiUtils;
import org.communiquons.android.comunic.client.ui.utils.UiUtils;
import org.communiquons.android.comunic.client.ui.fragments.ConversationFragment;
import org.communiquons.android.comunic.client.ui.fragments.ConversationsListFragment;
import org.communiquons.android.comunic.client.ui.fragments.FriendsListFragment;
@ -54,7 +53,7 @@ public class MainActivity extends AppCompatActivity
/**
* Account object
*/
private Account account;
private AccountHelper accountHelper;
/**
* Account utils object
@ -86,10 +85,10 @@ public class MainActivity extends AppCompatActivity
super.onCreate(savedInstanceState);
//Initialize account objects
account = new Account(this);
accountHelper = new AccountHelper(this);
//Check if user is signed in or not
if(!account.signed_in()){
if(!accountHelper.signed_in()){
//Open the login activity
startActivity(new Intent(this, LoginActivity.class));
return;
@ -123,7 +122,7 @@ public class MainActivity extends AppCompatActivity
super.onStart();
//Check if user is signed in or not
if(!account.signed_in()){
if(!accountHelper.signed_in()){
//Open the login activity
startActivity(new Intent(this, LoginActivity.class));
return;
@ -253,7 +252,7 @@ public class MainActivity extends AppCompatActivity
public void onClick(DialogInterface dialog, int which) {
//Sign out user
account.sign_out();
accountHelper.sign_out();
//Redirect to login activity
startActivity(new Intent(MainActivity.this, LoginActivity.class));

6
app/src/main/java/org/communiquons/android/comunic/client/ui/activities/SearchUserActivity.java
View File

@ -16,10 +16,10 @@ import android.widget.ListView;
import android.widget.Toast;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.ui.adapters.UsersBasicAdapter;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import java.util.ArrayList;

19
app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java
View File

@ -2,23 +2,18 @@ package org.communiquons.android.comunic.client.ui.adapters;
import android.content.Context;
import android.support.annotation.Nullable;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.comments.Comment;
import org.communiquons.android.comunic.client.data.comments.CommentsHelper;
import org.communiquons.android.comunic.client.data.utils.UiUtils;
import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.Comment;
import org.communiquons.android.comunic.client.ui.utils.UiUtils;
import org.communiquons.android.comunic.client.ui.views.LikeButtonView;
import java.util.ArrayList;
@ -86,7 +81,7 @@ class CommentsAdapter extends ArrayAdapter<Comment> {
R.drawable.default_account_image));
accountName.setText("");
} else {
ImageLoadManager.load(context, user.getAcountImageURL(), accountImage);
ImageLoadHelper.load(context, user.getAcountImageURL(), accountImage);
accountName.setText(user.getDisplayFullName());
}
@ -99,8 +94,8 @@ class CommentsAdapter extends ArrayAdapter<Comment> {
commentImage.setVisibility(View.GONE);
else {
commentImage.setVisibility(View.VISIBLE);
ImageLoadManager.remove(commentImage);
ImageLoadManager.load(context, comment.getImage_url(), commentImage);
ImageLoadHelper.remove(commentImage);
ImageLoadHelper.load(context, comment.getImage_url(), commentImage);
}

17
app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java
View File

@ -4,7 +4,6 @@ import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.ArrayMap;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@ -15,10 +14,10 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.conversations.ConversationMessage;
import org.communiquons.android.comunic.client.data.utils.UiUtils;
import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.ConversationMessage;
import org.communiquons.android.comunic.client.ui.utils.UiUtils;
import java.util.ArrayList;
@ -181,8 +180,8 @@ public class ConversationMessageAdapter extends ArrayAdapter<ConversationMessage
*/
if(message.hasImage()){
//Load the image
ImageLoadManager.remove(messageImageView);
ImageLoadManager.load(getContext(), message.getImage_path(), messageImageView);
ImageLoadHelper.remove(messageImageView);
ImageLoadHelper.load(getContext(), message.getImage_path(), messageImageView);
//Make the image visible
messageImageView.setVisibility(View.VISIBLE);
@ -219,7 +218,7 @@ public class ConversationMessageAdapter extends ArrayAdapter<ConversationMessage
Update account image
*/
//Cancel any load pending operation
ImageLoadManager.remove(accountImageView);
ImageLoadHelper.remove(accountImageView);
//Set the default image
accountImageView.setImageResource(R.drawable.default_account_image);
@ -228,7 +227,7 @@ public class ConversationMessageAdapter extends ArrayAdapter<ConversationMessage
//Check if we can load a specific image
if(user != null) {
String imageURL = user.getAcountImageURL();
ImageLoadManager.load(getContext(), imageURL, accountImageView);
ImageLoadHelper.load(getContext(), imageURL, accountImageView);
}

2
app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationsListAdapter.java
View File

@ -11,7 +11,7 @@ import android.widget.ArrayAdapter;
import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.conversations.ConversationsInfo;
import org.communiquons.android.comunic.client.data.models.ConversationsInfo;
import org.communiquons.android.comunic.client.data.utils.Utilities;
import java.util.ArrayList;

6
app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/FriendsAdapter.java
View File

@ -12,8 +12,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager;
import org.communiquons.android.comunic.client.data.friendsList.FriendUser;
import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
import org.communiquons.android.comunic.client.data.models.FriendUser;
import org.communiquons.android.comunic.client.data.utils.Utilities;
import org.communiquons.android.comunic.client.ui.fragments.FriendsListFragment;
@ -63,7 +63,7 @@ public class FriendsAdapter extends ArrayAdapter<FriendUser> {
//Update user account image
ImageView user_image = listItemView.findViewById(R.id.fragment_friendslist_item_accountimage);
user_image.setImageDrawable(getContext().getDrawable(R.drawable.default_account_image));
ImageLoadManager.load(getContext(), friendUser.getUserInfo().getAcountImageURL(), user_image);
ImageLoadHelper.load(getContext(), friendUser.getUserInfo().getAcountImageURL(), user_image);
//Update user name
TextView user_name = listItemView.findViewById(R.id.fragment_friendslist_item_fullname);

12
app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/NotificationsAdapter.java
View File

@ -12,10 +12,10 @@ import android.widget.ImageView;
import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.notifications.Notif;
import org.communiquons.android.comunic.client.data.notifications.NotifsList;
import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.Notif;
import org.communiquons.android.comunic.client.data.arrays.NotifsList;
import org.communiquons.android.comunic.client.data.utils.Utilities;
/**
@ -68,8 +68,8 @@ public class NotificationsAdapter extends ArrayAdapter<Notif>{
//Update the user account image
ImageView image = convertView.findViewById(R.id.user_account_image);
ImageLoadManager.remove(image);
ImageLoadManager.load(getContext(),
ImageLoadHelper.remove(image);
ImageLoadHelper.load(getContext(),
mUsersInfo.get(notif.getFrom_user_id()).getAcountImageURL(), image);

23
app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/PostsAdapter.java
View File

@ -8,19 +8,18 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.comments.Comment;
import org.communiquons.android.comunic.client.data.posts.Post;
import org.communiquons.android.comunic.client.data.posts.PostTypes;
import org.communiquons.android.comunic.client.data.posts.PostsList;
import org.communiquons.android.comunic.client.data.utils.UiUtils;
import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.Comment;
import org.communiquons.android.comunic.client.data.models.Post;
import org.communiquons.android.comunic.client.data.enums.PostTypes;
import org.communiquons.android.comunic.client.data.arrays.PostsList;
import org.communiquons.android.comunic.client.ui.utils.UiUtils;
import org.communiquons.android.comunic.client.data.utils.Utilities;
import org.communiquons.android.comunic.client.ui.views.EditCommentContentView;
import org.communiquons.android.comunic.client.ui.views.LikeButtonView;
@ -101,14 +100,14 @@ public class PostsAdapter extends ArrayAdapter<Post>{
//Reset user information
userAccountName.setText("");
ImageLoadManager.remove(userAccountImage);
ImageLoadHelper.remove(userAccountImage);
userAccountImage.setImageDrawable(UiUtils.getDrawable(getContext(),
R.drawable.default_account_image));
//Set user information if available
if(userInfo != null){
userAccountName.setText(userInfo.getDisplayFullName());
ImageLoadManager.load(getContext(), userInfo.getAcountImageURL(), userAccountImage);
ImageLoadHelper.load(getContext(), userInfo.getAcountImageURL(), userAccountImage);
}
@ -152,14 +151,14 @@ public class PostsAdapter extends ArrayAdapter<Post>{
ImageView postImage = convertView.findViewById(R.id.post_image);
postImage.setVisibility(View.GONE);
postImage.setImageDrawable(null);
ImageLoadManager.remove(postImage);
ImageLoadHelper.remove(postImage);
if(post.getType() == PostTypes.IMAGE){
//Make image visible
postImage.setVisibility(View.VISIBLE);
//Load image
ImageLoadManager.load(getContext(), post.getFile_path_url(), postImage);
ImageLoadHelper.load(getContext(), post.getFile_path_url(), postImage);
}
//Set posts likes

10
app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/UsersAsysncInfoAdapter.java
View File

@ -13,9 +13,9 @@ import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.utils.UiUtils;
import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.ui.utils.UiUtils;
import java.util.ArrayList;
@ -64,7 +64,7 @@ public class UsersAsysncInfoAdapter extends ArrayAdapter<Integer> {
TextView account_name = convertView.findViewById(R.id.user_name);
//Empty the entry
ImageLoadManager.remove(account_image);
ImageLoadHelper.remove(account_image);
account_image.setImageDrawable(UiUtils.getDrawable(getContext(),
R.drawable.default_account_image));
account_name.setText("");
@ -78,7 +78,7 @@ public class UsersAsysncInfoAdapter extends ArrayAdapter<Integer> {
UserInfo user = usersInfos.get(userID);
account_name.setText(user.getDisplayFullName());
ImageLoadManager.load(getContext(), user.getAcountImageURL(), account_image);
ImageLoadHelper.load(getContext(), user.getAcountImageURL(), account_image);
}
return convertView;

11
app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/UsersBasicAdapter.java
View File

@ -11,12 +11,11 @@ import android.widget.ImageView;
import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.utils.UiUtils;
import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.ui.utils.UiUtils;
import java.util.ArrayList;
import java.util.zip.Inflater;
/**
* User basic adapter
@ -59,10 +58,10 @@ public class UsersBasicAdapter extends ArrayAdapter<UserInfo> {
//Set account image
ImageView account_image = convertView.findViewById(R.id.user_account_image);
ImageLoadManager.remove(account_image);
ImageLoadHelper.remove(account_image);
account_image.setImageDrawable(UiUtils.getDrawable(getContext(),
R.drawable.default_account_image));
ImageLoadManager.load(getContext(), userInfos.getAcountImageURL(), account_image);
ImageLoadHelper.load(getContext(), userInfos.getAcountImageURL(), account_image);
}
return convertView;

20
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationFragment.java
View File

@ -24,17 +24,17 @@ import android.widget.Toast;
import org.communiquons.android.comunic.client.ui.activities.MainActivity;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.conversations.ConversationMessage;
import org.communiquons.android.comunic.client.data.utils.AccountUtils;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.ConversationMessage;
import org.communiquons.android.comunic.client.ui.adapters.ConversationMessageAdapter;
import org.communiquons.android.comunic.client.data.conversations.ConversationMessagesHelper;
import org.communiquons.android.comunic.client.data.conversations.ConversationRefreshRunnable;
import org.communiquons.android.comunic.client.data.conversations.ConversationsInfo;
import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper;
import org.communiquons.android.comunic.client.data.utils.BitmapUtils;
import org.communiquons.android.comunic.client.data.helpers.ConversationMessagesHelper;
import org.communiquons.android.comunic.client.data.runnables.ConversationRefreshRunnable;
import org.communiquons.android.comunic.client.data.models.ConversationsInfo;
import org.communiquons.android.comunic.client.data.helpers.ConversationsListHelper;
import org.communiquons.android.comunic.client.ui.utils.BitmapUtils;
import java.io.FileNotFoundException;
import java.io.InputStream;

16
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationsListFragment.java
View File

@ -21,15 +21,15 @@ import android.widget.Toast;
import org.communiquons.android.comunic.client.ui.activities.MainActivity;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.conversations.ConversationsInfo;
import org.communiquons.android.comunic.client.data.utils.AccountUtils;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.ConversationsInfo;
import org.communiquons.android.comunic.client.ui.adapters.ConversationsListAdapter;
import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper;
import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper.openConversationListener;
import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper.updateConversationListener;
import org.communiquons.android.comunic.client.data.helpers.ConversationsListHelper;
import org.communiquons.android.comunic.client.data.helpers.ConversationsListHelper.openConversationListener;
import org.communiquons.android.comunic.client.data.helpers.ConversationsListHelper.updateConversationListener;
import java.util.ArrayList;

16
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java
View File

@ -20,15 +20,15 @@ import android.widget.Toast;
import org.communiquons.android.comunic.client.ui.activities.MainActivity;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper;
import org.communiquons.android.comunic.client.data.friendsList.Friend;
import org.communiquons.android.comunic.client.data.friendsList.FriendUser;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.helpers.ConversationsListHelper;
import org.communiquons.android.comunic.client.data.models.Friend;
import org.communiquons.android.comunic.client.data.models.FriendUser;
import org.communiquons.android.comunic.client.ui.adapters.FriendsAdapter;
import org.communiquons.android.comunic.client.data.friendsList.FriendsListHelper;
import org.communiquons.android.comunic.client.data.friendsList.FriendsUtils;
import org.communiquons.android.comunic.client.data.helpers.FriendsListHelper;
import org.communiquons.android.comunic.client.data.utils.FriendsUtils;
import java.util.ArrayList;

7
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/NotificationsFragment.java
View File

@ -15,10 +15,9 @@ import android.widget.ProgressBar;
import android.widget.Toast;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.notifications.NotificationsHelper;
import org.communiquons.android.comunic.client.data.notifications.NotifsList;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.helpers.NotificationsHelper;
import org.communiquons.android.comunic.client.data.arrays.NotifsList;
import org.communiquons.android.comunic.client.ui.activities.MainActivity;
import org.communiquons.android.comunic.client.ui.adapters.NotificationsAdapter;

13
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/PostsCreateFormFragment.java
View File

@ -9,16 +9,15 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.posts.CreatePost;
import org.communiquons.android.comunic.client.data.posts.PageType;
import org.communiquons.android.comunic.client.data.posts.Post;
import org.communiquons.android.comunic.client.data.posts.PostTypes;
import org.communiquons.android.comunic.client.data.posts.PostVisibilityLevels;
import org.communiquons.android.comunic.client.data.posts.PostsHelper;
import org.communiquons.android.comunic.client.data.models.CreatePost;
import org.communiquons.android.comunic.client.data.enums.PageType;
import org.communiquons.android.comunic.client.data.models.Post;
import org.communiquons.android.comunic.client.data.enums.PostTypes;
import org.communiquons.android.comunic.client.data.enums.PostVisibilityLevels;
import org.communiquons.android.comunic.client.data.helpers.PostsHelper;
/**
* Posts creation form

22
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/PostsListFragment.java
View File

@ -19,17 +19,17 @@ import android.widget.ListView;
import android.widget.Toast;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.comments.Comment;
import org.communiquons.android.comunic.client.data.comments.CommentsHelper;
import org.communiquons.android.comunic.client.data.likes.LikesHelper;
import org.communiquons.android.comunic.client.data.likes.LikesType;
import org.communiquons.android.comunic.client.data.posts.Post;
import org.communiquons.android.comunic.client.data.posts.PostsHelper;
import org.communiquons.android.comunic.client.data.posts.PostsList;
import org.communiquons.android.comunic.client.data.utils.AccountUtils;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.Comment;
import org.communiquons.android.comunic.client.data.helpers.CommentsHelper;
import org.communiquons.android.comunic.client.data.helpers.LikesHelper;
import org.communiquons.android.comunic.client.data.enums.LikesType;
import org.communiquons.android.comunic.client.data.models.Post;
import org.communiquons.android.comunic.client.data.helpers.PostsHelper;
import org.communiquons.android.comunic.client.data.arrays.PostsList;
import org.communiquons.android.comunic.client.data.utils.StringsUtils;
import org.communiquons.android.comunic.client.ui.adapters.PostsAdapter;
import org.communiquons.android.comunic.client.ui.views.EditCommentContentView;

12
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UpdateConversationFragment.java
View File

@ -24,13 +24,13 @@ import android.widget.Toast;
import org.communiquons.android.comunic.client.ui.activities.MainActivity;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.ui.activities.SearchUserActivity;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.utils.AccountUtils;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.ui.adapters.UsersAsysncInfoAdapter;
import org.communiquons.android.comunic.client.data.conversations.ConversationsInfo;
import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper;
import org.communiquons.android.comunic.client.data.models.ConversationsInfo;
import org.communiquons.android.comunic.client.data.helpers.ConversationsListHelper;
import java.util.ArrayList;

10
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserInfosFragment.java
View File

@ -14,11 +14,11 @@ import android.widget.Toast;
import org.communiquons.android.comunic.client.ui.activities.MainActivity;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.Account.AccountUtils;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadTask;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersInfos;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.utils.AccountUtils;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.asynctasks.ImageLoadTask;
import org.communiquons.android.comunic.client.data.asynctasks.GetUsersInfos;
import org.communiquons.android.comunic.client.data.models.UserInfo;
/**
* User informations fragment

22
app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserPageFragment.java
View File

@ -15,15 +15,15 @@ import android.widget.TextView;
import android.widget.Toast;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.DatabaseHelper;
import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager;
import org.communiquons.android.comunic.client.data.UsersInfo.AdvancedUserInfo;
import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper;
import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo;
import org.communiquons.android.comunic.client.data.posts.Post;
import org.communiquons.android.comunic.client.data.posts.PostsHelper;
import org.communiquons.android.comunic.client.data.posts.PostsList;
import org.communiquons.android.comunic.client.data.utils.UiUtils;
import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
import org.communiquons.android.comunic.client.data.models.AdvancedUserInfo;
import org.communiquons.android.comunic.client.data.helpers.GetUsersHelper;
import org.communiquons.android.comunic.client.data.models.UserInfo;
import org.communiquons.android.comunic.client.data.models.Post;
import org.communiquons.android.comunic.client.data.helpers.PostsHelper;
import org.communiquons.android.comunic.client.data.arrays.PostsList;
import org.communiquons.android.comunic.client.ui.utils.UiUtils;
import org.communiquons.android.comunic.client.ui.activities.MainActivity;
/**
@ -231,8 +231,8 @@ public class UserPageFragment extends Fragment implements PostsCreateFormFragmen
//Update user name and account image
user_name.setText(userInfo.getDisplayFullName());
ImageLoadManager.remove(user_image);
ImageLoadManager.load(getActivity(), userInfo.getAcountImageURL(), user_image);
ImageLoadHelper.remove(user_image);
ImageLoadHelper.load(getActivity(), userInfo.getAcountImageURL(), user_image);
//Load the list of posts of the user
load_posts();

2
app/src/main/java/org/communiquons/android/comunic/client/data/utils/BitmapUtils.java → app/src/main/java/org/communiquons/android/comunic/client/ui/utils/BitmapUtils.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.utils;
package org.communiquons.android.comunic.client.ui.utils;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;

2
app/src/main/java/org/communiquons/android/comunic/client/data/utils/UiUtils.java → app/src/main/java/org/communiquons/android/comunic/client/ui/utils/UiUtils.java
View File

@ -1,4 +1,4 @@
package org.communiquons.android.comunic.client.data.utils;
package org.communiquons.android.comunic.client.ui.utils;
import android.app.AlertDialog;
import android.content.Context;

2
app/src/main/java/org/communiquons/android/comunic/client/ui/views/LikeButtonView.java
View File

@ -12,7 +12,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import org.communiquons.android.comunic.client.R;
import org.communiquons.android.comunic.client.data.utils.UiUtils;
import org.communiquons.android.comunic.client.ui.utils.UiUtils;
/**
* Like button view