code cleanup
This commit is contained in:
parent
b80d1168bb
commit
ae2bfc02b4
|
@ -2,17 +2,10 @@ package org.nuclearfog.twidda.backend.api;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
||||||
import org.nuclearfog.twidda.backend.helper.MediaStatus;
|
import org.nuclearfog.twidda.backend.helper.MediaStatus;
|
||||||
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Domains;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Messages;
|
|
||||||
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
|
||||||
|
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
|
||||||
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
|
||||||
import org.nuclearfog.twidda.model.lists.Notifications;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Statuses;
|
|
||||||
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
|
||||||
import org.nuclearfog.twidda.model.lists.Trends;
|
|
||||||
import org.nuclearfog.twidda.model.lists.UserLists;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Users;
|
|
||||||
import org.nuclearfog.twidda.model.Account;
|
import org.nuclearfog.twidda.model.Account;
|
||||||
import org.nuclearfog.twidda.model.Emoji;
|
import org.nuclearfog.twidda.model.Emoji;
|
||||||
import org.nuclearfog.twidda.model.Instance;
|
import org.nuclearfog.twidda.model.Instance;
|
||||||
|
@ -26,6 +19,13 @@ import org.nuclearfog.twidda.model.Trend;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
import org.nuclearfog.twidda.model.UserList;
|
import org.nuclearfog.twidda.model.UserList;
|
||||||
import org.nuclearfog.twidda.model.WebPush;
|
import org.nuclearfog.twidda.model.WebPush;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Domains;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Messages;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Notifications;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Statuses;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Trends;
|
||||||
|
import org.nuclearfog.twidda.model.lists.UserLists;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Users;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -285,6 +285,7 @@ public interface Connection {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* show information of a single hashtag
|
* show information of a single hashtag
|
||||||
|
*
|
||||||
* @param name hashtag name
|
* @param name hashtag name
|
||||||
* @return hashtag information
|
* @return hashtag information
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -124,8 +124,6 @@ public abstract class ConnectionException extends Exception {
|
||||||
*/
|
*/
|
||||||
public static final int NETWORK_CONNECTION = 21;
|
public static final int NETWORK_CONNECTION = 21;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* error parsing json format
|
* error parsing json format
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,18 +27,11 @@ import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonTrend;
|
||||||
import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonUser;
|
import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonUser;
|
||||||
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
||||||
import org.nuclearfog.twidda.backend.helper.MediaStatus;
|
import org.nuclearfog.twidda.backend.helper.MediaStatus;
|
||||||
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Domains;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Messages;
|
|
||||||
import org.nuclearfog.twidda.backend.helper.update.PollUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.PollUpdate;
|
||||||
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
|
||||||
|
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
|
||||||
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
|
||||||
import org.nuclearfog.twidda.model.lists.Notifications;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Statuses;
|
|
||||||
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
|
||||||
import org.nuclearfog.twidda.model.lists.Trends;
|
|
||||||
import org.nuclearfog.twidda.model.lists.UserLists;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Users;
|
|
||||||
import org.nuclearfog.twidda.backend.utils.ConnectionBuilder;
|
import org.nuclearfog.twidda.backend.utils.ConnectionBuilder;
|
||||||
import org.nuclearfog.twidda.backend.utils.StringUtils;
|
import org.nuclearfog.twidda.backend.utils.StringUtils;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
|
@ -55,6 +48,13 @@ import org.nuclearfog.twidda.model.Trend;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
import org.nuclearfog.twidda.model.UserList;
|
import org.nuclearfog.twidda.model.UserList;
|
||||||
import org.nuclearfog.twidda.model.WebPush;
|
import org.nuclearfog.twidda.model.WebPush;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Domains;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Messages;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Notifications;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Statuses;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Trends;
|
||||||
|
import org.nuclearfog.twidda.model.lists.UserLists;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Users;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
@ -711,7 +711,7 @@ public class Mastodon implements Connection {
|
||||||
JSONArray array = new JSONArray(body.string());
|
JSONArray array = new JSONArray(body.string());
|
||||||
long[] cursors = getCursors(response);
|
long[] cursors = getCursors(response);
|
||||||
Domains result = new Domains(cursors[0], cursors[1]);
|
Domains result = new Domains(cursors[0], cursors[1]);
|
||||||
for (int i = 0 ; i < array.length() ; i++) {
|
for (int i = 0; i < array.length(); i++) {
|
||||||
result.add(array.getString(i));
|
result.add(array.getString(i));
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
@ -1237,6 +1237,7 @@ public class Mastodon implements Connection {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* call Trend/Hashtag endpoint and create trend result
|
* call Trend/Hashtag endpoint and create trend result
|
||||||
|
*
|
||||||
* @param endpoint Endpoint to use
|
* @param endpoint Endpoint to use
|
||||||
* @param params additional parameters
|
* @param params additional parameters
|
||||||
* @return trend list
|
* @return trend list
|
||||||
|
@ -1630,8 +1631,8 @@ public class Mastodon implements Connection {
|
||||||
/**
|
/**
|
||||||
* create requestbody with upload stream
|
* create requestbody with upload stream
|
||||||
*
|
*
|
||||||
* @param inputStream input stream to upload a file
|
* @param inputStream input stream to upload a file
|
||||||
* @param addToKey upload stream key
|
* @param addToKey upload stream key
|
||||||
* @return request body
|
* @return request body
|
||||||
*/
|
*/
|
||||||
private RequestBody createUploadRequest(final InputStream inputStream, String addToKey) throws IOException {
|
private RequestBody createUploadRequest(final InputStream inputStream, String addToKey) throws IOException {
|
||||||
|
@ -1715,14 +1716,14 @@ public class Mastodon implements Connection {
|
||||||
ECPoint point = key.getW();
|
ECPoint point = key.getW();
|
||||||
byte[] x = point.getAffineX().toByteArray();
|
byte[] x = point.getAffineX().toByteArray();
|
||||||
byte[] y = point.getAffineY().toByteArray();
|
byte[] y = point.getAffineY().toByteArray();
|
||||||
if(x.length>32)
|
if (x.length > 32)
|
||||||
x = Arrays.copyOfRange(x, x.length-32, x.length);
|
x = Arrays.copyOfRange(x, x.length - 32, x.length);
|
||||||
if(y.length>32)
|
if (y.length > 32)
|
||||||
y = Arrays.copyOfRange(y, y.length-32, y.length);
|
y = Arrays.copyOfRange(y, y.length - 32, y.length);
|
||||||
byte[] result = new byte[65];
|
byte[] result = new byte[65];
|
||||||
result[0] = 4;
|
result[0] = 4;
|
||||||
System.arraycopy(x, 0, result, 1+(32-x.length), x.length);
|
System.arraycopy(x, 0, result, 1 + (32 - x.length), x.length);
|
||||||
System.arraycopy(y, 0, result, result.length-y.length, y.length);
|
System.arraycopy(y, 0, result, result.length - y.length, y.length);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -24,17 +24,10 @@ import org.nuclearfog.twidda.backend.api.twitter.v1.impl.UserListV1;
|
||||||
import org.nuclearfog.twidda.backend.api.twitter.v1.impl.UserV1;
|
import org.nuclearfog.twidda.backend.api.twitter.v1.impl.UserV1;
|
||||||
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
||||||
import org.nuclearfog.twidda.backend.helper.MediaStatus;
|
import org.nuclearfog.twidda.backend.helper.MediaStatus;
|
||||||
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Domains;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Messages;
|
|
||||||
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.ProfileUpdate;
|
||||||
|
import org.nuclearfog.twidda.backend.helper.update.PushUpdate;
|
||||||
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
|
||||||
import org.nuclearfog.twidda.model.lists.Notifications;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Statuses;
|
|
||||||
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
|
import org.nuclearfog.twidda.backend.helper.update.UserListUpdate;
|
||||||
import org.nuclearfog.twidda.model.lists.Trends;
|
|
||||||
import org.nuclearfog.twidda.model.lists.UserLists;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Users;
|
|
||||||
import org.nuclearfog.twidda.backend.utils.ConnectionBuilder;
|
import org.nuclearfog.twidda.backend.utils.ConnectionBuilder;
|
||||||
import org.nuclearfog.twidda.backend.utils.StringUtils;
|
import org.nuclearfog.twidda.backend.utils.StringUtils;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
|
@ -52,6 +45,13 @@ import org.nuclearfog.twidda.model.Trend;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
import org.nuclearfog.twidda.model.UserList;
|
import org.nuclearfog.twidda.model.UserList;
|
||||||
import org.nuclearfog.twidda.model.WebPush;
|
import org.nuclearfog.twidda.model.WebPush;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Domains;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Messages;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Notifications;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Statuses;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Trends;
|
||||||
|
import org.nuclearfog.twidda.model.lists.UserLists;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Users;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
@ -1074,7 +1074,8 @@ public class TwitterV1 implements Connection {
|
||||||
params.add("command=STATUS");
|
params.add("command=STATUS");
|
||||||
params.add("media_id=" + mediaId);
|
params.add("media_id=" + mediaId);
|
||||||
// poll media processing information frequently
|
// poll media processing information frequently
|
||||||
do {
|
do
|
||||||
|
{
|
||||||
response = get(MEDIA_UPLOAD, params);
|
response = get(MEDIA_UPLOAD, params);
|
||||||
body = response.body();
|
body = response.body();
|
||||||
if (response.code() < 200 || response.code() >= 300 || body == null)
|
if (response.code() < 200 || response.code() >= 300 || body == null)
|
||||||
|
|
|
@ -20,13 +20,13 @@ import org.nuclearfog.twidda.backend.api.twitter.v2.maps.MediaV2Map;
|
||||||
import org.nuclearfog.twidda.backend.api.twitter.v2.maps.PollV2Map;
|
import org.nuclearfog.twidda.backend.api.twitter.v2.maps.PollV2Map;
|
||||||
import org.nuclearfog.twidda.backend.api.twitter.v2.maps.UserV2Map;
|
import org.nuclearfog.twidda.backend.api.twitter.v2.maps.UserV2Map;
|
||||||
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
||||||
import org.nuclearfog.twidda.model.lists.Statuses;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Users;
|
|
||||||
import org.nuclearfog.twidda.backend.utils.StringUtils;
|
import org.nuclearfog.twidda.backend.utils.StringUtils;
|
||||||
import org.nuclearfog.twidda.model.Account;
|
import org.nuclearfog.twidda.model.Account;
|
||||||
import org.nuclearfog.twidda.model.Instance;
|
import org.nuclearfog.twidda.model.Instance;
|
||||||
import org.nuclearfog.twidda.model.Poll;
|
import org.nuclearfog.twidda.model.Poll;
|
||||||
import org.nuclearfog.twidda.model.Status;
|
import org.nuclearfog.twidda.model.Status;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Statuses;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Users;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
|
@ -9,8 +9,8 @@ import org.nuclearfog.twidda.BuildConfig;
|
||||||
import org.nuclearfog.twidda.backend.api.Connection;
|
import org.nuclearfog.twidda.backend.api.Connection;
|
||||||
import org.nuclearfog.twidda.backend.api.ConnectionException;
|
import org.nuclearfog.twidda.backend.api.ConnectionException;
|
||||||
import org.nuclearfog.twidda.backend.api.ConnectionManager;
|
import org.nuclearfog.twidda.backend.api.ConnectionManager;
|
||||||
import org.nuclearfog.twidda.model.lists.Messages;
|
|
||||||
import org.nuclearfog.twidda.database.AppDatabase;
|
import org.nuclearfog.twidda.database.AppDatabase;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Messages;
|
||||||
import org.nuclearfog.twidda.ui.fragments.MessageFragment;
|
import org.nuclearfog.twidda.ui.fragments.MessageFragment;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ import org.nuclearfog.twidda.model.WebPush;
|
||||||
*
|
*
|
||||||
* @author nuclearfog
|
* @author nuclearfog
|
||||||
*/
|
*/
|
||||||
public class PushUpdater extends AsyncExecutor <PushUpdate, PushUpdater.PushUpdateResult> {
|
public class PushUpdater extends AsyncExecutor<PushUpdate, PushUpdater.PushUpdateResult> {
|
||||||
|
|
||||||
private Connection connection;
|
private Connection connection;
|
||||||
private GlobalSettings settings;
|
private GlobalSettings settings;
|
||||||
|
|
|
@ -9,8 +9,8 @@ import org.nuclearfog.twidda.BuildConfig;
|
||||||
import org.nuclearfog.twidda.backend.api.Connection;
|
import org.nuclearfog.twidda.backend.api.Connection;
|
||||||
import org.nuclearfog.twidda.backend.api.ConnectionException;
|
import org.nuclearfog.twidda.backend.api.ConnectionException;
|
||||||
import org.nuclearfog.twidda.backend.api.ConnectionManager;
|
import org.nuclearfog.twidda.backend.api.ConnectionManager;
|
||||||
import org.nuclearfog.twidda.model.lists.Statuses;
|
|
||||||
import org.nuclearfog.twidda.database.AppDatabase;
|
import org.nuclearfog.twidda.database.AppDatabase;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Statuses;
|
||||||
import org.nuclearfog.twidda.ui.fragments.StatusFragment;
|
import org.nuclearfog.twidda.ui.fragments.StatusFragment;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class MediaStatus implements Serializable, Closeable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* create MediaStatus from and online/offline source
|
* create MediaStatus from and online/offline source
|
||||||
*
|
*
|
||||||
* @param media Media instance containing information
|
* @param media Media instance containing information
|
||||||
*/
|
*/
|
||||||
public MediaStatus(Media media) {
|
public MediaStatus(Media media) {
|
||||||
|
|
|
@ -3,7 +3,6 @@ package org.nuclearfog.twidda.backend.helper.update;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.backend.helper.update.StatusUpdate;
|
|
||||||
import org.nuclearfog.twidda.model.Location;
|
import org.nuclearfog.twidda.model.Location;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
|
@ -6,9 +6,9 @@ import java.io.Serializable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Webpush updater class used to create a webpush subscription
|
* Webpush updater class used to create a webpush subscription
|
||||||
* @see org.nuclearfog.twidda.backend.api.Connection
|
|
||||||
*
|
*
|
||||||
* @author nuclearfog
|
* @author nuclearfog
|
||||||
|
* @see org.nuclearfog.twidda.backend.api.Connection
|
||||||
*/
|
*/
|
||||||
public class PushUpdate implements Serializable {
|
public class PushUpdate implements Serializable {
|
||||||
|
|
||||||
|
|
|
@ -323,7 +323,7 @@ public class StatusUpdate implements Serializable, Closeable {
|
||||||
*/
|
*/
|
||||||
public String[] getMediaKeys() {
|
public String[] getMediaKeys() {
|
||||||
String[] keys = new String[mediaStatuses.size()];
|
String[] keys = new String[mediaStatuses.size()];
|
||||||
for (int i = 0 ; i < keys.length ; i++) {
|
for (int i = 0; i < keys.length; i++) {
|
||||||
keys[i] = mediaStatuses.get(i).getKey();
|
keys[i] = mediaStatuses.get(i).getKey();
|
||||||
}
|
}
|
||||||
return keys;
|
return keys;
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class ErrorUtils {
|
||||||
/**
|
/**
|
||||||
* get error message string
|
* get error message string
|
||||||
*
|
*
|
||||||
* @param context application context
|
* @param context application context
|
||||||
* @param exception connection exception
|
* @param exception connection exception
|
||||||
* @return message string
|
* @return message string
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -88,7 +88,7 @@ public class LinkUtils {
|
||||||
/**
|
/**
|
||||||
* open a link to a media file
|
* open a link to a media file
|
||||||
*
|
*
|
||||||
* @param url media url
|
* @param url media url
|
||||||
*/
|
*/
|
||||||
public static void openMediaLink(Context context, Uri url) {
|
public static void openMediaLink(Context context, Uri url) {
|
||||||
Intent intent = new Intent(Intent.ACTION_VIEW);
|
Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||||
|
|
|
@ -7,10 +7,6 @@ import android.database.sqlite.SQLiteDatabase;
|
||||||
|
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.model.lists.Accounts;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Messages;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Notifications;
|
|
||||||
import org.nuclearfog.twidda.model.lists.Statuses;
|
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.database.DatabaseAdapter.AccountTable;
|
import org.nuclearfog.twidda.database.DatabaseAdapter.AccountTable;
|
||||||
import org.nuclearfog.twidda.database.DatabaseAdapter.BookmarkTable;
|
import org.nuclearfog.twidda.database.DatabaseAdapter.BookmarkTable;
|
||||||
|
@ -39,7 +35,6 @@ import org.nuclearfog.twidda.database.impl.DatabasePoll;
|
||||||
import org.nuclearfog.twidda.database.impl.DatabaseStatus;
|
import org.nuclearfog.twidda.database.impl.DatabaseStatus;
|
||||||
import org.nuclearfog.twidda.database.impl.DatabaseTrend;
|
import org.nuclearfog.twidda.database.impl.DatabaseTrend;
|
||||||
import org.nuclearfog.twidda.database.impl.DatabaseUser;
|
import org.nuclearfog.twidda.database.impl.DatabaseUser;
|
||||||
import org.nuclearfog.twidda.model.lists.Trends;
|
|
||||||
import org.nuclearfog.twidda.model.Account;
|
import org.nuclearfog.twidda.model.Account;
|
||||||
import org.nuclearfog.twidda.model.Emoji;
|
import org.nuclearfog.twidda.model.Emoji;
|
||||||
import org.nuclearfog.twidda.model.Instance;
|
import org.nuclearfog.twidda.model.Instance;
|
||||||
|
@ -51,6 +46,11 @@ import org.nuclearfog.twidda.model.Poll;
|
||||||
import org.nuclearfog.twidda.model.Status;
|
import org.nuclearfog.twidda.model.Status;
|
||||||
import org.nuclearfog.twidda.model.Trend;
|
import org.nuclearfog.twidda.model.Trend;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Accounts;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Messages;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Notifications;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Statuses;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Trends;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
|
@ -113,6 +113,6 @@ public class Messages extends LinkedList<Message> {
|
||||||
@Override
|
@Override
|
||||||
@NonNull
|
@NonNull
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "size=" + size() + " previous=" + getPrevCursor() + " next=" + getNextCursor();
|
return "size=" + size() + " previous=" + getPrevCursor() + " next=" + getNextCursor();
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -70,8 +70,8 @@ public class Trends extends LinkedList<Trend> {
|
||||||
/**
|
/**
|
||||||
* add a sublist at specific position
|
* add a sublist at specific position
|
||||||
*
|
*
|
||||||
* @param trends sublist to add
|
* @param trends sublist to add
|
||||||
* @param index index where to insert the sublist
|
* @param index index where to insert the sublist
|
||||||
*/
|
*/
|
||||||
public void addAll(int index, Trends trends) {
|
public void addAll(int index, Trends trends) {
|
||||||
if (isEmpty()) {
|
if (isEmpty()) {
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class PushNotification {
|
||||||
notificationIntent.putExtra(MainActivity.KEY_SELECT_NOTIFICATION, true);
|
notificationIntent.putExtra(MainActivity.KEY_SELECT_NOTIFICATION, true);
|
||||||
notificationIntent.addCategory(Intent.CATEGORY_LAUNCHER);
|
notificationIntent.addCategory(Intent.CATEGORY_LAUNCHER);
|
||||||
notificationIntent.setAction(Intent.ACTION_MAIN);
|
notificationIntent.setAction(Intent.ACTION_MAIN);
|
||||||
notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent. FLAG_ACTIVITY_SINGLE_TOP);
|
notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||||
PendingIntent resultIntent = PendingIntent.getActivity(context.getApplicationContext(), 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
|
PendingIntent resultIntent = PendingIntent.getActivity(context.getApplicationContext(), 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
|
||||||
notificationBuilder.setContentIntent(resultIntent).setPriority(NotificationCompat.PRIORITY_HIGH)
|
notificationBuilder.setContentIntent(resultIntent).setPriority(NotificationCompat.PRIORITY_HIGH)
|
||||||
.setDefaults(NotificationCompat.DEFAULT_SOUND | NotificationCompat.DEFAULT_VIBRATE).setOnlyAlertOnce(true)
|
.setDefaults(NotificationCompat.DEFAULT_SOUND | NotificationCompat.DEFAULT_VIBRATE).setOnlyAlertOnce(true)
|
||||||
|
|
|
@ -246,7 +246,7 @@ public class SearchActivity extends AppCompatActivity implements OnTabSelectedLi
|
||||||
this.trend = result.trend;
|
this.trend = result.trend;
|
||||||
invalidateMenu();
|
invalidateMenu();
|
||||||
}
|
}
|
||||||
switch(result.mode) {
|
switch (result.mode) {
|
||||||
case HashtagResult.FOLLOW:
|
case HashtagResult.FOLLOW:
|
||||||
Toast.makeText(getApplicationContext(), R.string.info_hashtag_followed, Toast.LENGTH_SHORT).show();
|
Toast.makeText(getApplicationContext(), R.string.info_hashtag_followed, Toast.LENGTH_SHORT).show();
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -658,7 +658,7 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
|
||||||
int position = -1;
|
int position = -1;
|
||||||
this.locations = result.locations;
|
this.locations = result.locations;
|
||||||
String[] items = new String[result.locations.size()];
|
String[] items = new String[result.locations.size()];
|
||||||
for (int i = 0 ; i < items.length ; i++) {
|
for (int i = 0; i < items.length; i++) {
|
||||||
items[i] = result.locations.get(i).getFullName();
|
items[i] = result.locations.get(i).getFullName();
|
||||||
if (items[i].equals(settings.getTrendLocation().getFullName())) {
|
if (items[i].equals(settings.getTrendLocation().getFullName())) {
|
||||||
position = i;
|
position = i;
|
||||||
|
|
|
@ -10,8 +10,8 @@ import com.squareup.picasso.Picasso;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.model.lists.Accounts;
|
|
||||||
import org.nuclearfog.twidda.model.Account;
|
import org.nuclearfog.twidda.model.Account;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Accounts;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.AccountHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.AccountHolder;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
||||||
|
|
||||||
|
|
|
@ -83,7 +83,7 @@ public class DropdownAdapter extends BaseAdapter {
|
||||||
* @param item item string
|
* @param item item string
|
||||||
*/
|
*/
|
||||||
public void setItem(String item) {
|
public void setItem(String item) {
|
||||||
this.items = new String[] {item};
|
this.items = new String[]{item};
|
||||||
notifyDataSetChanged();
|
notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,10 @@ import com.squareup.picasso.Picasso;
|
||||||
|
|
||||||
import org.nuclearfog.tag.Tagger.OnTagClickListener;
|
import org.nuclearfog.tag.Tagger.OnTagClickListener;
|
||||||
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
||||||
import org.nuclearfog.twidda.model.lists.Messages;
|
|
||||||
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.model.Message;
|
import org.nuclearfog.twidda.model.Message;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Messages;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.MessageHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.MessageHolder;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.MessageHolder.OnItemClickListener;
|
import org.nuclearfog.twidda.ui.adapter.holder.MessageHolder.OnItemClickListener;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
||||||
|
|
|
@ -12,9 +12,9 @@ import com.squareup.picasso.Picasso;
|
||||||
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
||||||
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.model.lists.Notifications;
|
|
||||||
import org.nuclearfog.twidda.model.Notification;
|
import org.nuclearfog.twidda.model.Notification;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Notifications;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.StatusHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.StatusHolder;
|
||||||
|
|
|
@ -10,10 +10,10 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
|
||||||
import com.squareup.picasso.Picasso;
|
import com.squareup.picasso.Picasso;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
||||||
import org.nuclearfog.twidda.model.lists.Statuses;
|
|
||||||
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.model.Status;
|
import org.nuclearfog.twidda.model.Status;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Statuses;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.StatusHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.StatusHolder;
|
||||||
|
|
|
@ -7,8 +7,8 @@ import androidx.recyclerview.widget.RecyclerView.Adapter;
|
||||||
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
|
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.model.lists.Trends;
|
|
||||||
import org.nuclearfog.twidda.model.Trend;
|
import org.nuclearfog.twidda.model.Trend;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Trends;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.TrendHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.TrendHolder;
|
||||||
|
|
|
@ -10,10 +10,10 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
|
||||||
import com.squareup.picasso.Picasso;
|
import com.squareup.picasso.Picasso;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
||||||
import org.nuclearfog.twidda.model.lists.Users;
|
|
||||||
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Users;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.UserHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.UserHolder;
|
||||||
|
|
|
@ -10,11 +10,11 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
|
||||||
import com.squareup.picasso.Picasso;
|
import com.squareup.picasso.Picasso;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
import org.nuclearfog.twidda.backend.async.TextEmojiLoader;
|
||||||
import org.nuclearfog.twidda.model.lists.UserLists;
|
|
||||||
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
import org.nuclearfog.twidda.backend.image.PicassoBuilder;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
import org.nuclearfog.twidda.model.UserList;
|
import org.nuclearfog.twidda.model.UserList;
|
||||||
|
import org.nuclearfog.twidda.model.lists.UserLists;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
import org.nuclearfog.twidda.ui.adapter.holder.OnHolderClickListener;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.PlaceHolder;
|
||||||
import org.nuclearfog.twidda.ui.adapter.holder.UserlistHolder;
|
import org.nuclearfog.twidda.ui.adapter.holder.UserlistHolder;
|
||||||
|
|
|
@ -41,7 +41,7 @@ import okhttp3.Call;
|
||||||
*
|
*
|
||||||
* @author nuclearfog
|
* @author nuclearfog
|
||||||
*/
|
*/
|
||||||
public class AudioPlayerDialog extends Dialog implements OnClickListener, Closeable {
|
public class AudioPlayerDialog extends Dialog implements OnClickListener, Closeable {
|
||||||
|
|
||||||
private PlayerControlView controls;
|
private PlayerControlView controls;
|
||||||
private TextView mediaLink;
|
private TextView mediaLink;
|
||||||
|
@ -140,8 +140,8 @@ public class AudioPlayerDialog extends Dialog implements OnClickListener, Close
|
||||||
private RenderersFactory createRenderer(Context context) {
|
private RenderersFactory createRenderer(Context context) {
|
||||||
return new RenderersFactory() {
|
return new RenderersFactory() {
|
||||||
@Override
|
@Override
|
||||||
public Renderer[] createRenderers(Handler eventHandler, VideoRendererEventListener videoRendererEventListener,
|
public Renderer[] createRenderers(Handler eventHandler, VideoRendererEventListener videoRendererEventListener, AudioRendererEventListener audioRendererEventListener,
|
||||||
AudioRendererEventListener audioRendererEventListener, TextOutput textRendererOutput, MetadataOutput metadataRendererOutput) {
|
TextOutput textRendererOutput, MetadataOutput metadataRendererOutput) {
|
||||||
return new Renderer[]{
|
return new Renderer[]{
|
||||||
new MediaCodecAudioRenderer(context, MediaCodecSelector.DEFAULT, eventHandler, audioRendererEventListener)
|
new MediaCodecAudioRenderer(context, MediaCodecSelector.DEFAULT, eventHandler, audioRendererEventListener)
|
||||||
};
|
};
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class StatusPreferenceDialog extends Dialog implements OnCheckedChangeLis
|
||||||
languages = Locale.getAvailableLocales();
|
languages = Locale.getAvailableLocales();
|
||||||
String[] language_names = new String[languages.length + 1];
|
String[] language_names = new String[languages.length + 1];
|
||||||
language_names[0] = context.getString(R.string.dialog_status_language_empty);
|
language_names[0] = context.getString(R.string.dialog_status_language_empty);
|
||||||
for (int i = 0 ; i < languages.length ; i++) {
|
for (int i = 0; i < languages.length; i++) {
|
||||||
language_names[i + 1] = languages[i].getDisplayLanguage() + " " + languages[i].getCountry();
|
language_names[i + 1] = languages[i].getDisplayLanguage() + " " + languages[i].getCountry();
|
||||||
}
|
}
|
||||||
language_adapter.setItems(language_names);
|
language_adapter.setItems(language_names);
|
||||||
|
|
|
@ -16,8 +16,8 @@ import org.nuclearfog.twidda.backend.async.DatabaseAction;
|
||||||
import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseParam;
|
import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseParam;
|
||||||
import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseResult;
|
import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseResult;
|
||||||
import org.nuclearfog.twidda.config.GlobalSettings;
|
import org.nuclearfog.twidda.config.GlobalSettings;
|
||||||
import org.nuclearfog.twidda.model.lists.Accounts;
|
|
||||||
import org.nuclearfog.twidda.model.Account;
|
import org.nuclearfog.twidda.model.Account;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Accounts;
|
||||||
import org.nuclearfog.twidda.notification.PushSubscription;
|
import org.nuclearfog.twidda.notification.PushSubscription;
|
||||||
import org.nuclearfog.twidda.ui.activities.AccountActivity;
|
import org.nuclearfog.twidda.ui.activities.AccountActivity;
|
||||||
import org.nuclearfog.twidda.ui.adapter.AccountAdapter;
|
import org.nuclearfog.twidda.ui.adapter.AccountAdapter;
|
||||||
|
|
|
@ -135,7 +135,7 @@ public class DomainFragment extends ListFragment implements OnDomainClickListene
|
||||||
/**
|
/**
|
||||||
* load domain list
|
* load domain list
|
||||||
*
|
*
|
||||||
* @param index index where to insert domains into the list
|
* @param index index where to insert domains into the list
|
||||||
* @param cursor cursor used to page through results
|
* @param cursor cursor used to page through results
|
||||||
*/
|
*/
|
||||||
private void load(int index, long cursor) {
|
private void load(int index, long cursor) {
|
||||||
|
|
|
@ -15,10 +15,10 @@ import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
|
||||||
import org.nuclearfog.twidda.backend.async.MessageLoader;
|
import org.nuclearfog.twidda.backend.async.MessageLoader;
|
||||||
import org.nuclearfog.twidda.backend.async.MessageLoader.MessageLoaderParam;
|
import org.nuclearfog.twidda.backend.async.MessageLoader.MessageLoaderParam;
|
||||||
import org.nuclearfog.twidda.backend.async.MessageLoader.MessageLoaderResult;
|
import org.nuclearfog.twidda.backend.async.MessageLoader.MessageLoaderResult;
|
||||||
import org.nuclearfog.twidda.model.lists.Messages;
|
|
||||||
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
||||||
import org.nuclearfog.twidda.backend.utils.LinkUtils;
|
import org.nuclearfog.twidda.backend.utils.LinkUtils;
|
||||||
import org.nuclearfog.twidda.model.Message;
|
import org.nuclearfog.twidda.model.Message;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Messages;
|
||||||
import org.nuclearfog.twidda.ui.activities.ImageViewer;
|
import org.nuclearfog.twidda.ui.activities.ImageViewer;
|
||||||
import org.nuclearfog.twidda.ui.activities.MessageEditor;
|
import org.nuclearfog.twidda.ui.activities.MessageEditor;
|
||||||
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
||||||
|
|
|
@ -20,9 +20,9 @@ import org.nuclearfog.twidda.backend.async.NotificationLoader;
|
||||||
import org.nuclearfog.twidda.backend.async.NotificationLoader.NotificationLoaderParam;
|
import org.nuclearfog.twidda.backend.async.NotificationLoader.NotificationLoaderParam;
|
||||||
import org.nuclearfog.twidda.backend.async.NotificationLoader.NotificationLoaderResult;
|
import org.nuclearfog.twidda.backend.async.NotificationLoader.NotificationLoaderResult;
|
||||||
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
||||||
import org.nuclearfog.twidda.model.lists.Notifications;
|
|
||||||
import org.nuclearfog.twidda.model.Notification;
|
import org.nuclearfog.twidda.model.Notification;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Notifications;
|
||||||
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
||||||
import org.nuclearfog.twidda.ui.activities.StatusActivity;
|
import org.nuclearfog.twidda.ui.activities.StatusActivity;
|
||||||
import org.nuclearfog.twidda.ui.adapter.NotificationAdapter;
|
import org.nuclearfog.twidda.ui.adapter.NotificationAdapter;
|
||||||
|
|
|
@ -15,9 +15,9 @@ import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
|
||||||
import org.nuclearfog.twidda.backend.async.StatusLoader;
|
import org.nuclearfog.twidda.backend.async.StatusLoader;
|
||||||
import org.nuclearfog.twidda.backend.async.StatusLoader.StatusParameter;
|
import org.nuclearfog.twidda.backend.async.StatusLoader.StatusParameter;
|
||||||
import org.nuclearfog.twidda.backend.async.StatusLoader.StatusResult;
|
import org.nuclearfog.twidda.backend.async.StatusLoader.StatusResult;
|
||||||
import org.nuclearfog.twidda.model.lists.Statuses;
|
|
||||||
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
||||||
import org.nuclearfog.twidda.model.Status;
|
import org.nuclearfog.twidda.model.Status;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Statuses;
|
||||||
import org.nuclearfog.twidda.ui.activities.StatusActivity;
|
import org.nuclearfog.twidda.ui.activities.StatusActivity;
|
||||||
import org.nuclearfog.twidda.ui.adapter.StatusAdapter;
|
import org.nuclearfog.twidda.ui.adapter.StatusAdapter;
|
||||||
import org.nuclearfog.twidda.ui.adapter.StatusAdapter.StatusSelectListener;
|
import org.nuclearfog.twidda.ui.adapter.StatusAdapter.StatusSelectListener;
|
||||||
|
|
|
@ -16,8 +16,8 @@ import org.nuclearfog.twidda.backend.async.TrendLoader;
|
||||||
import org.nuclearfog.twidda.backend.async.TrendLoader.TrendParameter;
|
import org.nuclearfog.twidda.backend.async.TrendLoader.TrendParameter;
|
||||||
import org.nuclearfog.twidda.backend.async.TrendLoader.TrendResult;
|
import org.nuclearfog.twidda.backend.async.TrendLoader.TrendResult;
|
||||||
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
||||||
import org.nuclearfog.twidda.model.lists.Trends;
|
|
||||||
import org.nuclearfog.twidda.model.Trend;
|
import org.nuclearfog.twidda.model.Trend;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Trends;
|
||||||
import org.nuclearfog.twidda.ui.activities.SearchActivity;
|
import org.nuclearfog.twidda.ui.activities.SearchActivity;
|
||||||
import org.nuclearfog.twidda.ui.adapter.TrendAdapter;
|
import org.nuclearfog.twidda.ui.adapter.TrendAdapter;
|
||||||
import org.nuclearfog.twidda.ui.adapter.TrendAdapter.TrendClickListener;
|
import org.nuclearfog.twidda.ui.adapter.TrendAdapter.TrendClickListener;
|
||||||
|
@ -187,7 +187,7 @@ public class TrendFragment extends ListFragment implements TrendClickListener, A
|
||||||
*/
|
*/
|
||||||
private void load(long cursor, int index) {
|
private void load(long cursor, int index) {
|
||||||
TrendParameter param;
|
TrendParameter param;
|
||||||
switch(mode) {
|
switch (mode) {
|
||||||
case MODE_POPULAR:
|
case MODE_POPULAR:
|
||||||
if (adapter.isEmpty()) {
|
if (adapter.isEmpty()) {
|
||||||
param = new TrendParameter(TrendParameter.POPULAR_OFFLINE, index, search, cursor);
|
param = new TrendParameter(TrendParameter.POPULAR_OFFLINE, index, search, cursor);
|
||||||
|
|
|
@ -19,9 +19,9 @@ import org.nuclearfog.twidda.backend.async.UserlistManager.ListManagerResult;
|
||||||
import org.nuclearfog.twidda.backend.async.UsersLoader;
|
import org.nuclearfog.twidda.backend.async.UsersLoader;
|
||||||
import org.nuclearfog.twidda.backend.async.UsersLoader.UserParam;
|
import org.nuclearfog.twidda.backend.async.UsersLoader.UserParam;
|
||||||
import org.nuclearfog.twidda.backend.async.UsersLoader.UserResult;
|
import org.nuclearfog.twidda.backend.async.UsersLoader.UserResult;
|
||||||
import org.nuclearfog.twidda.model.lists.Users;
|
|
||||||
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
|
import org.nuclearfog.twidda.model.lists.Users;
|
||||||
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
||||||
import org.nuclearfog.twidda.ui.adapter.UserAdapter;
|
import org.nuclearfog.twidda.ui.adapter.UserAdapter;
|
||||||
import org.nuclearfog.twidda.ui.adapter.UserAdapter.UserClickListener;
|
import org.nuclearfog.twidda.ui.adapter.UserAdapter.UserClickListener;
|
||||||
|
|
|
@ -15,10 +15,10 @@ import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
|
||||||
import org.nuclearfog.twidda.backend.async.UserlistLoader;
|
import org.nuclearfog.twidda.backend.async.UserlistLoader;
|
||||||
import org.nuclearfog.twidda.backend.async.UserlistLoader.UserlistParam;
|
import org.nuclearfog.twidda.backend.async.UserlistLoader.UserlistParam;
|
||||||
import org.nuclearfog.twidda.backend.async.UserlistLoader.UserlistResult;
|
import org.nuclearfog.twidda.backend.async.UserlistLoader.UserlistResult;
|
||||||
import org.nuclearfog.twidda.model.lists.UserLists;
|
|
||||||
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
import org.nuclearfog.twidda.backend.utils.ErrorUtils;
|
||||||
import org.nuclearfog.twidda.model.User;
|
import org.nuclearfog.twidda.model.User;
|
||||||
import org.nuclearfog.twidda.model.UserList;
|
import org.nuclearfog.twidda.model.UserList;
|
||||||
|
import org.nuclearfog.twidda.model.lists.UserLists;
|
||||||
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
||||||
import org.nuclearfog.twidda.ui.activities.UserlistActivity;
|
import org.nuclearfog.twidda.ui.activities.UserlistActivity;
|
||||||
import org.nuclearfog.twidda.ui.adapter.UserlistAdapter;
|
import org.nuclearfog.twidda.ui.adapter.UserlistAdapter;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:width="20dp"
|
android:width="20dp"
|
||||||
android:height="20dp"
|
android:height="20dp"
|
||||||
android:viewportWidth="21"
|
android:viewportWidth="21"
|
||||||
android:viewportHeight="21">
|
android:viewportHeight="21">
|
||||||
<path
|
<path
|
||||||
android:pathData="M18.958,3.624V14.924c0,1.98 -1.61,3.59 -3.59,3.59 -1.97,0 -3.59,-1.61 -3.59,-3.59 0,-1.97 1.62,-3.58 3.59,-3.58 0.84,0 1.59,0.29 2.2,0.77V6.164l-9.21,2.62v8.07c0,1.98 -1.62,3.59 -3.59,3.59 -1.98,0 -3.59,-1.61 -3.59,-3.59 0,-1.97 1.61,-3.58 3.59,-3.58 0.83,0 1.58,0.29 2.19,0.76V5.194c0,-1.47 0.89,-2.61 2.3,-2.99L15.038,0.624c1.17,-0.32 2.16,-0.21 2.86,0.33 0.71,0.53 1.06,1.43 1.06,2.67z"
|
android:pathData="M18.958,3.624V14.924c0,1.98 -1.61,3.59 -3.59,3.59 -1.97,0 -3.59,-1.61 -3.59,-3.59 0,-1.97 1.62,-3.58 3.59,-3.58 0.84,0 1.59,0.29 2.2,0.77V6.164l-9.21,2.62v8.07c0,1.98 -1.62,3.59 -3.59,3.59 -1.98,0 -3.59,-1.61 -3.59,-3.59 0,-1.97 1.61,-3.58 3.59,-3.58 0.83,0 1.58,0.29 2.19,0.76V5.194c0,-1.47 0.89,-2.61 2.3,-2.99L15.038,0.624c1.17,-0.32 2.16,-0.21 2.86,0.33 0.71,0.53 1.06,1.43 1.06,2.67z"
|
||||||
android:fillColor="#ffffff"/>
|
android:fillColor="#ffffff" />
|
||||||
</vector>
|
</vector>
|
|
@ -1,10 +1,10 @@
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:width="20dp"
|
android:width="20dp"
|
||||||
android:height="20dp"
|
android:height="20dp"
|
||||||
android:viewportWidth="20"
|
android:viewportWidth="20"
|
||||||
android:viewportHeight="20">
|
android:viewportHeight="20">
|
||||||
<path
|
<path
|
||||||
android:pathData="m20.025,10.016c0,0.921 -0.08,1.665 -1.002,1.665h-7.332v7.325c0,0.919 -0.745,1.001 -1.667,1.001 -0.922,0 -1.667,-0.082 -1.667,-1.001V11.681H1.025c-0.92,0 -1.002,-0.744 -1.002,-1.665 0,-0.921 0.082,-1.665 1.002,-1.665H8.358V1.026c0,-0.921 0.745,-1.001 1.667,-1.001 0.922,0 1.667,0.08 1.667,1.001v7.325h7.332c0.922,0 1.002,0.744 1.002,1.665z"
|
android:pathData="m20.025,10.016c0,0.921 -0.08,1.665 -1.002,1.665h-7.332v7.325c0,0.919 -0.745,1.001 -1.667,1.001 -0.922,0 -1.667,-0.082 -1.667,-1.001V11.681H1.025c-0.92,0 -1.002,-0.744 -1.002,-1.665 0,-0.921 0.082,-1.665 1.002,-1.665H8.358V1.026c0,-0.921 0.745,-1.001 1.667,-1.001 0.922,0 1.667,0.08 1.667,1.001v7.325h7.332c0.922,0 1.002,0.744 1.002,1.665z"
|
||||||
android:strokeWidth="1.66597"
|
android:strokeWidth="1.66597"
|
||||||
android:fillColor="#ffffff"/>
|
android:fillColor="#ffffff" />
|
||||||
</vector>
|
</vector>
|
|
@ -1,6 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:id="@+id/dialog_push_root"
|
android:id="@+id/dialog_push_root"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
@ -13,10 +13,10 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/fragment_list_recyclerview"
|
android:id="@+id/fragment_list_recyclerview"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
|
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
android:layout_margin="@dimen/item_domain_layout_margin"
|
android:layout_margin="@dimen/item_domain_layout_margin"
|
||||||
android:textSize="@dimen/item_domain_text_size"
|
android:textSize="@dimen/item_domain_text_size"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:lines="1"/>
|
android:lines="1" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/item_domain_delete"
|
android:id="@+id/item_domain_delete"
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
android:id="@+id/search_hashtag"
|
android:id="@+id/search_hashtag"
|
||||||
android:title="@string/menu_hashtag_follow"
|
android:title="@string/menu_hashtag_follow"
|
||||||
app:showAsAction="never"
|
app:showAsAction="never"
|
||||||
android:visible="false"/>
|
android:visible="false" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/search_filter"
|
android:id="@+id/search_filter"
|
||||||
|
|
Loading…
Reference in New Issue