Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Still cleaning code

This commit is contained in:
tom79 2020-03-08 10:29:06 +01:00
parent 832bade7eb
commit 0bdc58d508
87 changed files with 1862 additions and 2282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/app/fedilab/android/activities/AdminActivity.java
View File

@ -313,7 +313,7 @@ public class AdminActivity extends BaseActivity {
private class AdminPagerAdapter extends FragmentStatePagerAdapter {
AdminPagerAdapter(FragmentManager fm) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull
@ -344,6 +344,7 @@ public class AdminActivity extends BaseActivity {
public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
}
@Override
public int getCount() {
return 2;

2
app/src/main/java/app/fedilab/android/activities/BaseActivity.java
View File

@ -65,7 +65,7 @@ public class BaseActivity extends CyaneaAppCompatActivity {
.detectLeakedRegistrationObjects()
.detectActivityLeaks()
.penaltyLog()
// .penaltyDeath()
// .penaltyDeath()
.build());
}
canShowActionMode = true;

57
app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
View File

@ -433,13 +433,11 @@ public abstract class BaseMainActivity extends BaseActivity
pTabLocal.setCustomView(R.layout.tab_badge);
Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_subscriptions, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_overview, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_trending_up, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_recently_added, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_home, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(), R.drawable.ic_subscriptions, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(), R.drawable.ic_overview, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(), R.drawable.ic_trending_up, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(), R.drawable.ic_recently_added, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(), R.drawable.ic_home, R.attr.iconColorMenu);
@SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId")
@ -532,9 +530,9 @@ public abstract class BaseMainActivity extends BaseActivity
//TabLayout.Tab pfTabDiscover = tabLayout.newTab();
Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_notifications, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_people, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_home, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(), R.drawable.ic_notifications, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(), R.drawable.ic_people, R.attr.iconColorMenu);
Helper.changeDrawableColor(getApplicationContext(), R.drawable.ic_home, R.attr.iconColorMenu);
pfTabHome.setCustomView(R.layout.tab_badge);
pfTabLocal.setCustomView(R.layout.tab_badge);
@ -1119,7 +1117,7 @@ public abstract class BaseMainActivity extends BaseActivity
MenuFloating.tags = new ArrayList<>();
Helper.updateHeaderAccountInfo(activity, account, headerLayout);
//Locked account can see follow request
if( MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA ) {
if (MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
if (account.isLocked()) {
navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true);
} else {
@ -1265,14 +1263,15 @@ public abstract class BaseMainActivity extends BaseActivity
try {
Handler handler = new Handler();
handler.postDelayed(dialogBuilderOptin::show, 1000);
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
}else{
} else {
int lastReleaseNoteRead = sharedpreferences.getInt(Helper.SET_POPUP_RELEASE_NOTES, 0);
int versionCode = BuildConfig.VERSION_CODE;
if( lastReleaseNoteRead != versionCode ){ //Need to push release notes
if( social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA ) {
if (lastReleaseNoteRead != versionCode) { //Need to push release notes
if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
new RetrieveRemoteDataAsyncTask(getApplicationContext(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
try (BufferedReader reader = new BufferedReader(
@ -1660,11 +1659,6 @@ public abstract class BaseMainActivity extends BaseActivity
}
@Override
protected void onPause() {
super.onPause();
@ -1714,7 +1708,8 @@ public abstract class BaseMainActivity extends BaseActivity
Intent myIntent = new Intent(BaseMainActivity.this, OwnerStatusActivity.class);
startActivity(myIntent);
return false;
}if (id == R.id.nav_trends) {
}
if (id == R.id.nav_trends) {
Intent myIntent = new Intent(BaseMainActivity.this, SearchResultActivity.class);
Bundle b = new Bundle();
b.putString("search", "fedilab_trend");
@ -2037,7 +2032,7 @@ public abstract class BaseMainActivity extends BaseActivity
return;
List<Account> accounts = results.getAccounts();
List<Status> statuses = results.getStatuses();
if( !developerAccount) {
if (!developerAccount) {
if (accounts != null && accounts.size() > 0) {
Intent intent = new Intent(BaseMainActivity.this, ShowAccountActivity.class);
@ -2052,8 +2047,8 @@ public abstract class BaseMainActivity extends BaseActivity
intent.putExtras(b);
startActivity(intent);
}
}else{
if( accounts != null && accounts.size() > 0 ) {
} else {
if (accounts != null && accounts.size() > 0) {
developers = new ArrayList<>();
developers.addAll(accounts);
new RetrieveRelationshipAsyncTask(getApplicationContext(), accounts.get(0).getId(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@ -2063,10 +2058,10 @@ public abstract class BaseMainActivity extends BaseActivity
@Override
public void onRetrieveRelationship(Relationship relationship, Error error) {
if( dialogReleaseNoteView != null && developers != null && developers.size() > 0){
if( !relationship.isFollowing()){
if (dialogReleaseNoteView != null && developers != null && developers.size() > 0) {
if (!relationship.isFollowing()) {
TextView dev_follow_title = dialogReleaseNoteView.findViewById(R.id.dev_follow_title);
if( dev_follow_title != null){
if (dev_follow_title != null) {
dev_follow_title.setVisibility(View.VISIBLE);
}
ExpandableHeightListView lv_developers = dialogReleaseNoteView.findViewById(R.id.lv_developers);
@ -2364,7 +2359,6 @@ public abstract class BaseMainActivity extends BaseActivity
}
public enum iconLauncher {
BUBBLES,
FEDIVERSE,
@ -2381,12 +2375,11 @@ public abstract class BaseMainActivity extends BaseActivity
int mNumOfTabs;
private PagerAdapter(FragmentManager fm, int NumOfTabs) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
this.mNumOfTabs = NumOfTabs;
}
@Override
public Parcelable saveState() {
return null;
@ -2504,7 +2497,7 @@ public abstract class BaseMainActivity extends BaseActivity
bundle.putSerializable("type", DisplayNotificationsFragment.Type.ALL);
fragment.setArguments(bundle);
return fragment;
}else {
} else {
DisplayStoriesFragment fragment = new DisplayStoriesFragment();
bundle.putSerializable("type", RetrieveStoriesAsyncTask.type.ME);
fragment.setArguments(bundle);
@ -2520,7 +2513,7 @@ public abstract class BaseMainActivity extends BaseActivity
} else {
mPageReferenceMap = new HashMap<>();
}
// super.destroyItem(container, position, object);
// super.destroyItem(container, position, object);
}
@Override

6
app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
View File

@ -16,7 +16,6 @@ package app.fedilab.android.activities;
import android.Manifest;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
@ -70,7 +69,6 @@ import app.fedilab.android.client.APIResponse;
import app.fedilab.android.client.Entities.Account;
import app.fedilab.android.client.Entities.Error;
import app.fedilab.android.client.Entities.Version;
import app.fedilab.android.client.Glide.GlideApp;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.interfaces.OnRetrieveAccountInterface;
import app.fedilab.android.interfaces.OnUpdateCredentialInterface;
@ -241,7 +239,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
@Override
public void afterTextChanged(Editable s) {
int maxChar = 160;
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA){
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
maxChar = 500;
}
if (s.length() > maxChar) {
@ -354,7 +352,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
}
});
if( !EditProfileActivity.this.isFinishing()) {
if (!EditProfileActivity.this.isFinishing()) {
Glide.with(set_profile_picture.getContext())
.load(account.getAvatar())
.into(set_profile_picture);

2
app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
View File

@ -113,7 +113,7 @@ public class InstanceHealthActivity extends BaseActivity {
private void checkInstance() {
if (instance == null){
if (instance == null) {
LinearLayout main_container = findViewById(R.id.main_container);
TextView no_instance = findViewById(R.id.no_instance);
instance_container.setVisibility(View.VISIBLE);

11
app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java
View File

@ -32,6 +32,7 @@ import android.widget.TextView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import java.util.ArrayList;
@ -79,8 +80,8 @@ public class InstanceProfileActivity extends BaseActivity {
if (getSupportActionBar() != null)
getSupportActionBar().hide();
if (b != null)
instance = b.getString("instance",null);
if( instance == null){
instance = b.getString("instance", null);
if (instance == null) {
finish();
}
Button close = findViewById(R.id.close);
@ -117,7 +118,7 @@ public class InstanceProfileActivity extends BaseActivity {
try {
InstanceNodeInfo instanceNodeInfo = new API(InstanceProfileActivity.this).instanceInfo(instance.trim());
runOnUiThread(() -> {
if( instanceNodeInfo == null){
if (instanceNodeInfo == null) {
finish();
return;
}
@ -130,7 +131,7 @@ public class InstanceProfileActivity extends BaseActivity {
SpannableString descriptionSpan;
if( instanceNodeInfo.getNodeDescription() != null) {
if (instanceNodeInfo.getNodeDescription() != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
descriptionSpan = new SpannableString(Html.fromHtml(instanceNodeInfo.getNodeDescription(), FROM_HTML_MODE_LEGACY));
else
@ -143,7 +144,7 @@ public class InstanceProfileActivity extends BaseActivity {
String softwareStr = instanceNodeInfo.getName() + " - ";
software.setText(softwareStr);
version.setText(instanceNodeInfo.getVersion());
if( instanceNodeInfo.getStaffAccount() != null){
if (instanceNodeInfo.getStaffAccount() != null) {
List<Account> accounts = new ArrayList<>();
accounts.add(instanceNodeInfo.getStaffAccount());
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);

2
app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java
View File

@ -63,7 +63,7 @@ public class LiveNotificationSettingsAccountsActivity extends BaseActivity {
ArrayList<Account> accounts = new ArrayList<>();
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
List<Account> accountStreams = new AccountDAO(getApplicationContext(), db).getAllAccountCrossAction();
if( accountStreams == null || accountStreams.size() == 0 ){
if (accountStreams == null || accountStreams.size() == 0) {
finish();
return;
}

26
app/src/main/java/app/fedilab/android/activities/LoginActivity.java
View File

@ -304,16 +304,16 @@ public class LoginActivity extends BaseActivity {
final String action = "/instances/search";
final HashMap<String, String> parameters = new HashMap<>();
String query = s.toString().trim();
if (query.startsWith("http://")){
query =query.replace("http://", "");
if (query.startsWith("http://")) {
query = query.replace("http://", "");
}
if (query.startsWith("https://")){
query =query.replace("https://", "");
if (query.startsWith("https://")) {
query = query.replace("https://", "");
}
parameters.put("q", query);
parameters.put("count", String.valueOf(1000));
parameters.put("name", String.valueOf(true));
if( thread != null && thread.isAlive()){
if (thread != null && thread.isAlive()) {
thread.interrupt();
thread = null;
}
@ -322,7 +322,7 @@ public class LoginActivity extends BaseActivity {
thread = new Thread(() -> {
try {
final String response = new HttpsConnection(LoginActivity.this, instance).get("https://instances.social/api/1.0" + action, 30, parameters, Helper.THEKINRAR_SECRET_TOKEN);
if( response == null) {
if (response == null) {
return;
}
runOnUiThread(() -> {
@ -436,11 +436,11 @@ public class LoginActivity extends BaseActivity {
private void retrievesClientId() {
if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU && socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
String instanceFromField = login_instance.getText().toString().trim();
if (instanceFromField.startsWith("http://")){
instanceFromField =instanceFromField.replace("http://", "");
if (instanceFromField.startsWith("http://")) {
instanceFromField = instanceFromField.replace("http://", "");
}
if (instanceFromField.startsWith("https://")){
instanceFromField =instanceFromField.replace("https://", "");
if (instanceFromField.startsWith("https://")) {
instanceFromField = instanceFromField.replace("https://", "");
}
String host = instanceFromField;
try {
@ -563,7 +563,8 @@ public class LoginActivity extends BaseActivity {
}
try {
instance = URLEncoder.encode(host, "utf-8");
} catch (UnsupportedEncodingException ignored) {}
} catch (UnsupportedEncodingException ignored) {
}
String username = login_uid.getText().toString().trim().toLowerCase();
String password = login_passwd.getText().toString();
oauthUrl = "/api/account/verify_credentials.json";
@ -778,15 +779,18 @@ public class LoginActivity extends BaseActivity {
bubbleShowCase.finishSequence();
}
}
@Override
public void onCloseActionImageClick(@NotNull BubbleShowCase bubbleShowCase) {
if (loop) {
bubbleShowCase.finishSequence();
}
}
@Override
public void onBubbleClick(@NotNull BubbleShowCase bubbleShowCase) {
}
@Override
public void onBackgroundDimClick(@NotNull BubbleShowCase bubbleShowCase) {
}

3
app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java
View File

@ -18,7 +18,6 @@ package app.fedilab.android.activities;
import android.app.DatePickerDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
@ -446,7 +445,7 @@ public class OwnerNotificationActivity extends BaseActivity implements OnRetriev
mainLoader.setVisibility(View.GONE);
nextElementLoader.setVisibility(View.GONE);
//Discards 404 - error which can often happen due to toots which have been deleted
if (apiResponse.getError() != null && apiResponse.getError().getStatusCode() != 404&& apiResponse.getError().getStatusCode() != 501) {
if (apiResponse.getError() != null && apiResponse.getError().getStatusCode() != 404 && apiResponse.getError().getStatusCode() != 501) {
Toasty.error(getApplicationContext(), apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
swipeRefreshLayout.setRefreshing(false);
swiped = false;

2
app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
View File

@ -295,7 +295,7 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube
}
});
String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
if( user_agent != null) {
if (user_agent != null) {
webview_video.getSettings().setUserAgentString(user_agent);
}
webview_video.getSettings().setAllowFileAccess(true);

3
app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java
View File

@ -45,7 +45,6 @@ import androidx.appcompat.app.ActionBar;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import net.gotev.uploadservice.MultipartUploadRequest;
import net.gotev.uploadservice.ServerResponse;
import net.gotev.uploadservice.UploadInfo;
@ -174,7 +173,7 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
} else if (uriString.startsWith("file://")) {
filename = myFile.getName();
}
if( filename == null){
if (filename == null) {
filename = new Date().toString();
}
set_upload_file_name.setVisibility(View.VISIBLE);

4
app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
View File

@ -351,7 +351,7 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
switch (requestCode) {
case CAMERA_REQUEST:
if( data != null && data.getExtras() != null) {
if (data != null && data.getExtras() != null) {
mPhotoEditor.clearAllViews();
Bitmap photo = (Bitmap) data.getExtras().get("data");
mPhotoEditorView.getSource().setImageBitmap(photo);
@ -359,7 +359,7 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
}
break;
case PICK_REQUEST:
if( data != null && data.getData() != null) {
if (data != null && data.getData() != null) {
try {
mPhotoEditor.clearAllViews();
Uri uri = data.getData();

16
app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java
View File

@ -496,7 +496,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
int maxUploadRetryTimes = sharedpreferences.getInt(Helper.MAX_UPLOAD_IMG_RETRY_TIMES, 3);
String url = scheme + "://" + Helper.getLiveInstance(activity) + "/api/v1/media";
if( pixelfedStory) {
if (pixelfedStory) {
url = scheme + "://" + Helper.getLiveInstance(activity) + "/api/stories/v1/add";
}
UploadNotificationConfig uploadConfig = new UploadNotificationConfig();
@ -508,7 +508,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
request.addHeader("Authorization", "Bearer " + token);
request.setNotificationConfig(uploadConfig);
request.addFileToUpload(uri.toString().replace("file://", ""), "file");
if( !pixelfedStory) {
if (!pixelfedStory) {
request.addParameter("filename", fileName).setMaxRetries(maxUploadRetryTimes);
}
request.startUpload();
@ -654,7 +654,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
toot_sensitive = findViewById(R.id.toot_sensitive);
LinearLayout drawer_layout = findViewById(R.id.drawer_layout);
ImageButton toot_emoji = findViewById(R.id.toot_emoji);
LinearLayout bottom_bar_tooting = findViewById(R.id.bottom_bar_tooting);
LinearLayout bottom_bar_tooting = findViewById(R.id.bottom_bar_tooting);
isScheduled = false;
if (sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, true)) {
final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(drawer_layout).build(toot_content);
@ -670,11 +670,11 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
}
TextView indication_story = findViewById(R.id.indication_story);
pixelfed_story.setOnCheckedChangeListener((buttonView, isChecked) -> {
if( isChecked){
if (isChecked) {
composer_container.setVisibility(View.GONE);
indication_story.setVisibility(View.VISIBLE);
bottom_bar_tooting.setVisibility(View.GONE);
}else{
} else {
composer_container.setVisibility(View.VISIBLE);
indication_story.setVisibility(View.GONE);
bottom_bar_tooting.setVisibility(View.VISIBLE);
@ -891,7 +891,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
}
private void addNewMedia(JSONObject response, ArrayList<String> successfullyUploadedFiles) {
if( !pixelfed_story.isChecked()) {
if (!pixelfed_story.isChecked()) {
Attachment attachment;
attachment = API.parseAttachmentResponse(response);
boolean alreadyAdded = false;
@ -1371,9 +1371,9 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
}
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == THEME_LIGHT){
if (theme == THEME_LIGHT) {
//Hack for colors in compose menu
for(int i = 0 ; i < menu.size(); i++){
for (int i = 0; i < menu.size(); i++) {
MenuItem item = menu.getItem(i);
SpannableString s = new SpannableString(item.getTitle());
s.setSpan(new ForegroundColorSpan(Color.BLACK), 0, s.length(), 0);

2
app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
View File

@ -216,7 +216,7 @@ public class PlaylistsActivity extends BaseActivity implements OnPlaylistActionI
nextElementLoader.setVisibility(View.GONE);
//Discards 404 - error which can often happen due to toots which have been deleted
if (apiResponse.getError() != null) {
if (!apiResponse.getError().getError().startsWith("404 -")&&!apiResponse.getError().getError().startsWith("501 -"))
if (!apiResponse.getError().getError().startsWith("404 -") && !apiResponse.getError().getError().startsWith("501 -"))
Toasty.error(getApplicationContext(), apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
swipeRefreshLayout.setRefreshing(false);
swiped = false;

12
app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
View File

@ -161,9 +161,9 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
//Manage download of attachments
RadioGroup radioGroup = dialogView.findViewById(R.id.set_attachment_group);
radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
if( checkedId == R.id.twitter_accounts){
if (checkedId == R.id.twitter_accounts) {
instance_list.setHint(R.string.list_of_twitter_accounts);
}else {
} else {
instance_list.setHint(R.string.instance);
}
});
@ -172,7 +172,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
@Override
public void onClick(DialogInterface dialog, int id) {
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
String instanceName = instance_list.getText().toString().trim().replace("@","");
String instanceName = instance_list.getText().toString().trim().replace("@", "");
new Thread(new Runnable() {
@Override
public void run() {
@ -201,7 +201,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "MISSKEY");
} else if (radioGroup.getCheckedRadioButtonId() == R.id.gnu_instance) {
new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "GNU");
}else if (radioGroup.getCheckedRadioButtonId() == R.id.twitter_accounts) {
} else if (radioGroup.getCheckedRadioButtonId() == R.id.twitter_accounts) {
new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "NITTER");
}
if (timelines != null && adapter != null) {
@ -263,7 +263,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
@Override
public void afterTextChanged(Editable s) {
if (radioGroup.getCheckedRadioButtonId() != R.id.twitter_accounts){
if (radioGroup.getCheckedRadioButtonId() != R.id.twitter_accounts) {
Pattern host = Pattern.compile("([\\da-z\\.-]+\\.[a-z\\.]{2,12})");
Matcher matcher = host.matcher(s.toString().trim());
if (s.toString().trim().length() == 0 || !matcher.find()) {
@ -336,7 +336,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
else
isLoadingInstance = false;
}
}else {
} else {
alertDialog.getButton(
AlertDialog.BUTTON_POSITIVE).setEnabled(true);
}

12
app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java
View File

@ -94,7 +94,7 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
} else {
Toasty.error(getApplicationContext(), getString(R.string.toast_error_search), Toast.LENGTH_LONG).show();
}
if( search.compareTo("fedilab_trend") == 0 ) {
if (search.compareTo("fedilab_trend") == 0) {
forTrends = true;
}
if (getSupportActionBar() != null)
@ -115,15 +115,15 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
finish();
}
});
if( !forTrends) {
if (!forTrends) {
toolbar_title.setText(search);
}else{
} else {
toolbar_title.setText(getString(R.string.trending_now));
}
}
if( !forTrends) {
if (!forTrends) {
setTitle(search);
}else{
} else {
setTitle(R.string.trending_now);
}
loader.setVisibility(View.VISIBLE);
@ -173,7 +173,7 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
lv_search.setAdapter(searchListAdapter);
searchListAdapter.notifyDataSetChanged();
} else {
if (apiResponse.getTrends() == null || apiResponse.getTrends().size() == 0 ) {
if (apiResponse.getTrends() == null || apiResponse.getTrends().size() == 0) {
RelativeLayout no_result = findViewById(R.id.no_result);
no_result.setVisibility(View.VISIBLE);
return;

3
app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
View File

@ -190,7 +190,7 @@ public class SearchResultTabActivity extends BaseActivity {
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull
@ -230,6 +230,7 @@ public class SearchResultTabActivity extends BaseActivity {
public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
}
@Override
public int getCount() {
return 4;

2
app/src/main/java/app/fedilab/android/activities/SettingsActivity.java
View File

@ -186,7 +186,7 @@ public class SettingsActivity extends BaseActivity {
private static class SettingsPagerAdapter extends FragmentStatePagerAdapter {
SettingsPagerAdapter(FragmentManager fm) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull

28
app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
View File

@ -303,7 +303,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
header_edit_profile.bringToFront();
}
//TODO: add other software that supports identity proofs
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
new RetrieveIdentityProofAsyncTask(ShowAccountActivity.this, account.getId(), ShowAccountActivity.this).execute();
}
String urlHeader = account.getHeader();
@ -891,14 +891,14 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
return;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
int[][] states = new int[][] {
new int[] { android.R.attr.state_enabled}, // enabled
new int[] {-android.R.attr.state_enabled}, // disabled
new int[] {-android.R.attr.state_checked}, // unchecked
new int[] { android.R.attr.state_pressed} // pressed
int[][] states = new int[][]{
new int[]{android.R.attr.state_enabled}, // enabled
new int[]{-android.R.attr.state_enabled}, // disabled
new int[]{-android.R.attr.state_checked}, // unchecked
new int[]{android.R.attr.state_pressed} // pressed
};
int[] colors = new int[] {
int[] colors = new int[]{
ContextCompat.getColor(ShowAccountActivity.this, R.color.mastodonC4),
ContextCompat.getColor(ShowAccountActivity.this, R.color.mastodonC4___),
ContextCompat.getColor(ShowAccountActivity.this, R.color.mastodonC4),
@ -918,7 +918,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
account_follow.setEnabled(false);
account_follow.setContentDescription(getString(R.string.action_disabled));
doAction = action.NOTHING;
}else if (relationship.isRequested()) {
} else if (relationship.isRequested()) {
account_follow_request.setVisibility(View.VISIBLE);
account_follow.setImageResource(R.drawable.ic_hourglass_full);
account_follow.setVisibility(View.VISIBLE);
@ -1417,7 +1417,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
@Override
public void onActionDone(ManageListsAsyncTask.action actionType, APIResponse apiResponse, int statusCode) {
if (apiResponse.getError() != null) {
if (!apiResponse.getError().getError().startsWith("404 -")&&!apiResponse.getError().getError().startsWith("501 -"))
if (!apiResponse.getError().getError().startsWith("404 -") && !apiResponse.getError().getError().startsWith("501 -"))
Toasty.error(getApplicationContext(), apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
return;
}
@ -1436,11 +1436,11 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
@Override
public void onIdentityProof(APIResponse apiResponse) {
if( apiResponse == null) {
if (apiResponse == null) {
return;
}
List<IdentityProof> identityProofs = apiResponse.getIdentityProofs();
if( identityProofs != null && identityProofs.size() > 0 ){
if (identityProofs != null && identityProofs.size() > 0) {
ImageView identity_proofs_indicator = findViewById(R.id.identity_proofs_indicator);
identity_proofs_indicator.setVisibility(View.VISIBLE);
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
@ -1457,8 +1457,8 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
AlertDialog.Builder builder = new AlertDialog.Builder(ShowAccountActivity.this, style);
LayoutInflater inflater = getLayoutInflater();
View identityProofsView = inflater.inflate(R.layout.popup_identity_proof, new LinearLayout(ShowAccountActivity.this), false);
RecyclerView identityProofsRecycler = identityProofsView.findViewById(R.id.identity_proofs_list);
View identityProofsView = inflater.inflate(R.layout.popup_identity_proof, new LinearLayout(ShowAccountActivity.this), false);
RecyclerView identityProofsRecycler = identityProofsView.findViewById(R.id.identity_proofs_list);
LinearLayoutManager mLayoutManager = new LinearLayoutManager(ShowAccountActivity.this);
identityProofsRecycler.setLayoutManager(mLayoutManager);
IdentityProofsAdapter identityProofsAdapter = new IdentityProofsAdapter(identityProofs);
@ -1487,7 +1487,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull

1
app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
View File

@ -29,7 +29,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;

12
app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
View File

@ -103,7 +103,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
startActivity(shareIntent);
} catch (Exception ignored) {
}
}else{
} else {
Toasty.success(context, context.getString(R.string.save_over), Toasty.LENGTH_LONG).show();
}
}
@ -150,7 +150,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
media_save.setOnClickListener(view12 -> {
int position = mPager.getCurrentItem();
Attachment attachment = attachments.get(position);
if( attachment.getType().compareTo("image") == 0 ){
if (attachment.getType().compareTo("image") == 0) {
if (Build.VERSION.SDK_INT >= 23) {
if (ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(SlideMediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE);
@ -160,7 +160,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
} else {
Helper.manageMove(SlideMediaActivity.this, attachment.getUrl(), false);
}
}else {
} else {
if (Build.VERSION.SDK_INT >= 23) {
if (ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(SlideMediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE);
@ -178,9 +178,9 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
media_share.setOnClickListener(view1 -> {
int position = mPager.getCurrentItem();
Attachment attachment = attachments.get(position);
if( attachment.getType().compareTo("image") == 0 ){
if (attachment.getType().compareTo("image") == 0) {
Helper.manageMove(SlideMediaActivity.this, attachment.getUrl(), true);
}else if (attachment.getType().toLowerCase().equals("video") || attachment.getType().toLowerCase().equals("audio") || attachment.getType().toLowerCase().equals("gifv")) {
} else if (attachment.getType().toLowerCase().equals("video") || attachment.getType().toLowerCase().equals("audio") || attachment.getType().toLowerCase().equals("gifv")) {
downloadID = Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
} else {
if (Build.VERSION.SDK_INT >= 23) {
@ -409,7 +409,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull

1767
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

File diff suppressed because it is too large Load Diff

2
app/src/main/java/app/fedilab/android/activities/TootInfoActivity.java
View File

@ -136,7 +136,7 @@ public class TootInfoActivity extends BaseActivity {
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull

181
app/src/main/java/app/fedilab/android/activities/WebviewActivity.java
View File

@ -16,8 +16,8 @@ package app.fedilab.android.activities;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
@ -34,7 +34,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.webkit.DownloadListener;
import android.widget.ArrayAdapter;
import android.widget.FrameLayout;
import android.widget.Toast;
@ -43,6 +42,8 @@ import androidx.appcompat.app.AlertDialog;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import org.jetbrains.annotations.NotNull;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
@ -57,7 +58,6 @@ import app.fedilab.android.sqlite.Sqlite;
import app.fedilab.android.webview.CustomWebview;
import app.fedilab.android.webview.MastalabWebChromeClient;
import app.fedilab.android.webview.MastalabWebViewClient;
import app.fedilab.android.webview.ProxyHelper;
import es.dmoral.toasty.Toasty;
@ -76,6 +76,7 @@ public class WebviewActivity extends BaseActivity {
private Menu defaultMenu;
private MastalabWebViewClient mastalabWebViewClient;
@SuppressLint("SetJavaScriptEnabled")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -85,9 +86,6 @@ public class WebviewActivity extends BaseActivity {
case Helper.THEME_LIGHT:
setTheme(R.style.AppTheme_Fedilab);
break;
case Helper.THEME_DARK:
setTheme(R.style.AppThemeDark);
break;
case Helper.THEME_BLACK:
setTheme(R.style.AppThemeBlack);
break;
@ -115,68 +113,53 @@ public class WebviewActivity extends BaseActivity {
webView.getSettings().setJavaScriptEnabled(true);
MastalabWebChromeClient mastalabWebChromeClient = new MastalabWebChromeClient(WebviewActivity.this, webView, webview_container, videoLayout);
mastalabWebChromeClient.setOnToggledFullscreen(new MastalabWebChromeClient.ToggledFullscreenCallback() {
@Override
public void toggledFullscreen(boolean fullscreen) {
mastalabWebChromeClient.setOnToggledFullscreen(fullscreen -> {
if (fullscreen) {
videoLayout.setVisibility(View.VISIBLE);
WindowManager.LayoutParams attrs = getWindow().getAttributes();
attrs.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;
attrs.flags |= WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
getWindow().setAttributes(attrs);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
} else {
WindowManager.LayoutParams attrs = getWindow().getAttributes();
attrs.flags &= ~WindowManager.LayoutParams.FLAG_FULLSCREEN;
attrs.flags &= ~WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
getWindow().setAttributes(attrs);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
videoLayout.setVisibility(View.GONE);
}
if (fullscreen) {
videoLayout.setVisibility(View.VISIBLE);
WindowManager.LayoutParams attrs = getWindow().getAttributes();
attrs.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;
attrs.flags |= WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
getWindow().setAttributes(attrs);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
} else {
WindowManager.LayoutParams attrs = getWindow().getAttributes();
attrs.flags &= ~WindowManager.LayoutParams.FLAG_FULLSCREEN;
attrs.flags &= ~WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
getWindow().setAttributes(attrs);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
videoLayout.setVisibility(View.GONE);
}
});
webView.setWebChromeClient(mastalabWebChromeClient);
mastalabWebViewClient = new MastalabWebViewClient(WebviewActivity.this);
webView.setWebViewClient(mastalabWebViewClient);
webView.setDownloadListener(new DownloadListener() {
@Override
public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
webView.setDownloadListener((url, userAgent, contentDisposition, mimetype, contentLength) -> {
if (Build.VERSION.SDK_INT >= 23) {
if (ContextCompat.checkSelfPermission(WebviewActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(WebviewActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(WebviewActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE);
} else {
Helper.manageDownloads(WebviewActivity.this, url);
}
if (Build.VERSION.SDK_INT >= 23) {
if (ContextCompat.checkSelfPermission(WebviewActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(WebviewActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(WebviewActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE);
} else {
Helper.manageDownloads(WebviewActivity.this, url);
}
} else {
Helper.manageDownloads(WebviewActivity.this, url);
}
});
if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
url = "http://" + url;
if (trackingDomains == null) {
AsyncTask.execute(new Runnable() {
@Override
public void run() {
SQLiteDatabase db = Sqlite.getInstance(WebviewActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
trackingDomains = new DomainBlockDAO(WebviewActivity.this, db).getAll();
if (trackingDomains == null)
trackingDomains = new ArrayList<>();
// Get a handler that can be used to post to the main thread
Handler mainHandler = new Handler(getMainLooper());
Runnable myRunnable = new Runnable() {
@Override
public void run() {
webView.loadUrl(url);
}
};
mainHandler.post(myRunnable);
AsyncTask.execute(() -> {
SQLiteDatabase db = Sqlite.getInstance(WebviewActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
trackingDomains = new DomainBlockDAO(WebviewActivity.this, db).getAll();
if (trackingDomains == null)
trackingDomains = new ArrayList<>();
// Get a handler that can be used to post to the main thread
Handler mainHandler = new Handler(getMainLooper());
Runnable myRunnable = () -> webView.loadUrl(url);
mainHandler.post(myRunnable);
}
});
} else
webView.loadUrl(url);
@ -213,7 +196,7 @@ public class WebviewActivity extends BaseActivity {
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
public boolean onCreateOptionsMenu(@NotNull Menu menu) {
getMenuInflater().inflate(R.menu.main_webview, menu);
defaultMenu = menu;
if (peertubeLink) {
@ -253,20 +236,12 @@ public class WebviewActivity extends BaseActivity {
AlertDialog.Builder builder = new AlertDialog.Builder(WebviewActivity.this, style);
builder.setTitle(R.string.list_of_blocked_domains);
builder.setNegativeButton(R.string.close, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
});
builder.setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss());
builder.setAdapter(arrayAdapter, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String strName = arrayAdapter.getItem(which);
assert strName != null;
Toasty.info(getApplicationContext(), strName, Toast.LENGTH_LONG).show();
}
builder.setAdapter(arrayAdapter, (dialog, which) -> {
String strName = arrayAdapter.getItem(which);
assert strName != null;
Toasty.info(getApplicationContext(), strName, Toast.LENGTH_LONG).show();
});
builder.show();
@ -281,40 +256,7 @@ public class WebviewActivity extends BaseActivity {
return true;
case R.id.action_comment:
Toasty.info(getApplicationContext(), getString(R.string.retrieve_remote_status), Toast.LENGTH_LONG).show();
new AsyncTask<Void, Void, Void>() {
private List<app.fedilab.android.client.Entities.Status> remoteStatuses;
private WeakReference<Context> contextReference = new WeakReference<>(WebviewActivity.this);
@Override
protected Void doInBackground(Void... voids) {
if (url != null) {
APIResponse search = new API(contextReference.get()).search(peertubeLinkToFetch);
if (search != null && search.getResults() != null) {
remoteStatuses = search.getResults().getStatuses();
}
}
return null;
}
@Override
protected void onPostExecute(Void result) {
Intent intent = new Intent(contextReference.get(), TootActivity.class);
Bundle b = new Bundle();
if (remoteStatuses == null || remoteStatuses.size() == 0) {
Toasty.error(contextReference.get(), getString(R.string.toast_error), Toast.LENGTH_LONG).show();
return;
}
if (remoteStatuses.get(0).getReblog() != null) {
b.putParcelable("tootReply", remoteStatuses.get(0).getReblog());
} else {
b.putParcelable("tootReply", remoteStatuses.get(0));
}
intent.putExtras(b); //Put your id to your next Intent
contextReference.get().startActivity(intent);
}
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new connnectAsync(new WeakReference<>(WebviewActivity.this), url, peertubeLinkToFetch).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
return true;
default:
return super.onOptionsItemSelected(item);
@ -354,4 +296,45 @@ public class WebviewActivity extends BaseActivity {
if (webView != null)
webView.destroy();
}
static class connnectAsync extends AsyncTask<Void, Void, List<app.fedilab.android.client.Entities.Status>> {
private WeakReference<Context> contextReference;
private String url;
private String peertubeLinkToFetch;
connnectAsync(WeakReference<Context> contextReference, String url, String peertubeLinkToFetch) {
this.contextReference = contextReference;
this.url = url;
this.peertubeLinkToFetch = peertubeLinkToFetch;
}
@Override
protected List<app.fedilab.android.client.Entities.Status> doInBackground(Void... voids) {
List<app.fedilab.android.client.Entities.Status> remoteStatuses = null;
if (url != null) {
APIResponse search = new API(contextReference.get()).search(peertubeLinkToFetch);
if (search != null && search.getResults() != null) {
remoteStatuses = search.getResults().getStatuses();
}
}
return remoteStatuses;
}
@Override
protected void onPostExecute(List<app.fedilab.android.client.Entities.Status> remoteStatuses) {
Intent intent = new Intent(contextReference.get(), TootActivity.class);
Bundle b = new Bundle();
if (remoteStatuses == null || remoteStatuses.size() == 0) {
Toasty.error(contextReference.get(), contextReference.get().getString(R.string.toast_error), Toast.LENGTH_LONG).show();
return;
}
if (remoteStatuses.get(0).getReblog() != null) {
b.putParcelable("tootReply", remoteStatuses.get(0).getReblog());
} else {
b.putParcelable("tootReply", remoteStatuses.get(0));
}
intent.putExtras(b); //Put your id to your next Intent
contextReference.get().startActivity(intent);
}
}
}

54
app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
View File

@ -16,6 +16,7 @@
package app.fedilab.android.activities;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@ -51,7 +52,6 @@ import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
import app.fedilab.android.client.HttpsConnection;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.webview.CustomWebview;
import app.fedilab.android.webview.ProxyHelper;
import es.dmoral.toasty.Toasty;
/**
@ -67,7 +67,6 @@ public class WebviewConnectActivity extends BaseActivity {
private String instance;
private UpdateAccountInfoAsyncTask.SOCIAL social;
@SuppressWarnings("deprecation")
public static void clearCookies(Context context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
@ -84,6 +83,7 @@ public class WebviewConnectActivity extends BaseActivity {
}
}
@SuppressLint("SetJavaScriptEnabled")
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
@ -92,9 +92,6 @@ public class WebviewConnectActivity extends BaseActivity {
case Helper.THEME_LIGHT:
setTheme(R.style.AppTheme_Fedilab);
break;
case Helper.THEME_DARK:
setTheme(R.style.AppThemeDark);
break;
case Helper.THEME_BLACK:
setTheme(R.style.AppThemeBlack);
break;
@ -122,19 +119,14 @@ public class WebviewConnectActivity extends BaseActivity {
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
toolbar_close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
toolbar_close.setOnClickListener(v -> finish());
toolbar_title.setText(R.string.add_account);
}
webView = findViewById(R.id.webviewConnect);
clearCookies(getApplicationContext());
webView.getSettings().setJavaScriptEnabled(true);
String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
if( user_agent != null) {
if (user_agent != null) {
webView.getSettings().setUserAgentString(user_agent);
}
if (android.os.Build.VERSION.SDK_INT >= 21) {
@ -160,7 +152,6 @@ public class WebviewConnectActivity extends BaseActivity {
webView.setWebViewClient(new WebViewClient() {
@SuppressWarnings("deprecation")
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
super.shouldOverrideUrlLoading(view, url);
@ -181,28 +172,25 @@ public class WebviewConnectActivity extends BaseActivity {
parameters.put(Helper.REDIRECT_URI, Helper.REDIRECT_CONTENT_WEB);
parameters.put("grant_type", "authorization_code");
parameters.put("code", code);
new Thread(new Runnable() {
@Override
public void run() {
new Thread(() -> {
try {
final String response = new HttpsConnection(WebviewConnectActivity.this, instance).post(Helper.instanceWithProtocol(getApplicationContext(), instance) + action, 30, parameters, null);
JSONObject resobj;
try {
final String response = new HttpsConnection(WebviewConnectActivity.this, instance).post(Helper.instanceWithProtocol(getApplicationContext(), instance) + action, 30, parameters, null);
JSONObject resobj;
try {
resobj = new JSONObject(response);
String token = resobj.get("access_token").toString();
String refresh_token = null;
if (resobj.has("refresh_token"))
refresh_token = resobj.get("refresh_token").toString();
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
editor.apply();
//Update the account with the token;
new UpdateAccountInfoAsyncTask(WebviewConnectActivity.this, token, clientId, clientSecret, refresh_token, instance, social).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} catch (JSONException ignored) {
}
} catch (Exception ignored) {
resobj = new JSONObject(response);
String token = resobj.get("access_token").toString();
String refresh_token = null;
if (resobj.has("refresh_token"))
refresh_token = resobj.get("refresh_token").toString();
SharedPreferences sharedpreferences1 = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences1.edit();
editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
editor.apply();
//Update the account with the token;
new UpdateAccountInfoAsyncTask(WebviewConnectActivity.this, token, clientId, clientSecret, refresh_token, instance, social).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} catch (JSONException ignored) {
}
} catch (Exception ignored) {
}
}).start();
return true;

1
app/src/main/java/app/fedilab/android/asynctasks/ManageFiltersAsyncTask.java
View File

@ -38,6 +38,7 @@ public class ManageFiltersAsyncTask extends AsyncTask<Void, Void, Void> {
private action apiAction;
private WeakReference<Context> contextReference;
private Filters filter;
public ManageFiltersAsyncTask(Context context, action apiAction, Filters filter, OnFilterActionInterface onFilterActionInterface) {
contextReference = new WeakReference<>(context);
this.listener = onFilterActionInterface;

1
app/src/main/java/app/fedilab/android/asynctasks/ManageListsAsyncTask.java
View File

@ -43,6 +43,7 @@ public class ManageListsAsyncTask extends AsyncTask<Void, Void, Void> {
private String max_id, since_id;
private int limit;
private String search;
public ManageListsAsyncTask(Context context, action apiAction, String[] accountsId, String targetedId, String listId, String title, OnListActionInterface onListActionInterface) {
contextReference = new WeakReference<>(context);
this.listener = onListActionInterface;

1
app/src/main/java/app/fedilab/android/asynctasks/ManagePlaylistsAsyncTask.java
View File

@ -46,6 +46,7 @@ public class ManagePlaylistsAsyncTask extends AsyncTask<Void, Void, Void> {
private String max_id;
private Playlist playlist;
private String videoId;
public ManagePlaylistsAsyncTask(Context context, action apiAction, Playlist playlist, String videoId, String max_id, OnPlaylistActionInterface onPlaylistActionInterface) {
contextReference = new WeakReference<>(context);
this.listener = onPlaylistActionInterface;

7
app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
View File

@ -32,7 +32,6 @@ import app.fedilab.android.client.Entities.Results;
import app.fedilab.android.client.Entities.RetrieveFeedsParam;
import app.fedilab.android.client.GNUAPI;
import app.fedilab.android.client.PeertubeAPI;
import app.fedilab.android.fragments.DisplayStatusFragment;
import app.fedilab.android.helper.FilterToots;
import app.fedilab.android.interfaces.OnRetrieveFeedsInterface;
import app.fedilab.android.sqlite.InstancesDAO;
@ -63,7 +62,6 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
private WeakReference<Context> contextReference;
private FilterToots filterToots;
private String instanceName, remoteInstance, name;
private boolean cached = false;
private int timelineId;
private String currentfilter;
private String social;
@ -95,7 +93,6 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
}
public RetrieveFeedsAsyncTask(Context context, Type action, String instanceName, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
this.contextReference = new WeakReference<>(context);
this.action = action;
@ -176,8 +173,6 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
}
@Override
protected Void doInBackground(Void... params) {
API api = new API(this.contextReference.get());
@ -257,7 +252,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
status.setType(action);
}
}
}else if (remoteInstanceObj != null && remoteInstanceObj.size() > 0 && remoteInstanceObj.get(0).getType().equals("PIXELFED")) {
} else if (remoteInstanceObj != null && remoteInstanceObj.size() > 0 && remoteInstanceObj.get(0).getType().equals("PIXELFED")) {
apiResponse = api.getPixelfedTimeline(instanceName, max_id);
} else if (remoteInstanceObj != null && remoteInstanceObj.size() > 0 && remoteInstanceObj.get(0).getType().equals("GNU")) {
apiResponse = api.getGNUTimeline(instanceName, max_id);

1
app/src/main/java/app/fedilab/android/asynctasks/RetrieveIdentityProofAsyncTask.java
View File

@ -21,7 +21,6 @@ import java.lang.ref.WeakReference;
import app.fedilab.android.client.API;
import app.fedilab.android.client.APIResponse;
import app.fedilab.android.interfaces.OnRetrieveIdentityProofInterface;

2
app/src/main/java/app/fedilab/android/asynctasks/RetrieveMetaDataAsyncTask.java
View File

@ -95,7 +95,7 @@ public class RetrieveMetaDataAsyncTask extends AsyncTask<Void, Void, Void> {
Pattern descriptionPattern = Pattern.compile("meta[ a-zA-Z=\"'-]+property=[\"']og:description[\"']\\s+content=[\"']([^>]*)[\"']");
Pattern imagePattern = Pattern.compile("meta[ a-zA-Z=\"'-]+property=[\"']og:image[\"']\\s+content=[\"']([^>]*)[\"']");
try {
if( !potentialUrl.startsWith("http")){
if (!potentialUrl.startsWith("http")) {
potentialUrl = "https://" + potentialUrl;
}
URLConnection conn = new URL(potentialUrl).openConnection();

2
app/src/main/java/app/fedilab/android/asynctasks/RetrieveRemoteDataAsyncTask.java
View File

@ -42,13 +42,13 @@ public class RetrieveRemoteDataAsyncTask extends AsyncTask<Void, Void, Void> {
private boolean developerAccount = false;
public RetrieveRemoteDataAsyncTask(Context context, OnRetrieveRemoteAccountInterface onRetrieveRemoteAccountInterface) {
this.url = "https://toot.fedilab.app/@fedilab";
developerAccount = true;
this.listener = onRetrieveRemoteAccountInterface;
this.contextReference = new WeakReference<>(context);
}
public RetrieveRemoteDataAsyncTask(Context context, String username, String instance, OnRetrieveRemoteAccountInterface onRetrieveRemoteAccountInterface) {
this.url = Helper.instanceWithProtocol(context, instance) + "/@" + username;
this.listener = onRetrieveRemoteAccountInterface;

4
app/src/main/java/app/fedilab/android/asynctasks/RetrieveSearchAsyncTask.java
View File

@ -72,9 +72,9 @@ public class RetrieveSearchAsyncTask extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... params) {
if( query.compareTo("fedilab_trend") == 0 ) {
if (query.compareTo("fedilab_trend") == 0) {
apiResponse = new API(this.contextReference.get()).getTrends();
}else if (this.type == null) {
} else if (this.type == null) {
if (MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
API api = new API(this.contextReference.get());
String[] split = query.trim().split("@");

17
app/src/main/java/app/fedilab/android/asynctasks/RetrieveStoriesAsyncTask.java
View File

@ -16,7 +16,9 @@ package app.fedilab.android.asynctasks;
import android.content.Context;
import android.os.AsyncTask;
import java.lang.ref.WeakReference;
import app.fedilab.android.client.APIResponse;
import app.fedilab.android.client.PixelfedAPI;
import app.fedilab.android.interfaces.OnRetrieveStoriesInterface;
@ -36,11 +38,6 @@ public class RetrieveStoriesAsyncTask extends AsyncTask<Void, Void, Void> {
private WeakReference<Context> contextReference;
private type typeOfStory;
public enum type{
ME,
FRIENDS
}
public RetrieveStoriesAsyncTask(Context context, String max_id, type typeOfStory, OnRetrieveStoriesInterface onRetrieveStoriesInterface) {
this.contextReference = new WeakReference<>(context);
this.max_id = max_id;
@ -48,13 +45,12 @@ public class RetrieveStoriesAsyncTask extends AsyncTask<Void, Void, Void> {
this.typeOfStory = typeOfStory;
}
@Override
protected Void doInBackground(Void... params) {
PixelfedAPI pixelfedAPI = new PixelfedAPI(this.contextReference.get());
if( typeOfStory == type.FRIENDS) {
if (typeOfStory == type.FRIENDS) {
apiResponse = pixelfedAPI.getFriendStories(max_id);
}else if (typeOfStory == type.ME){
} else if (typeOfStory == type.ME) {
apiResponse = pixelfedAPI.getMyStories();
}
return null;
@ -65,4 +61,9 @@ public class RetrieveStoriesAsyncTask extends AsyncTask<Void, Void, Void> {
listener.onRetrieveStories(apiResponse);
}
public enum type {
ME,
FRIENDS
}
}

1
app/src/main/java/app/fedilab/android/asynctasks/SyncBookmarksAsyncTask.java
View File

@ -40,6 +40,7 @@ public class SyncBookmarksAsyncTask extends AsyncTask<Void, Void, Void> {
private OnSyncBookmarksInterface listener;
private WeakReference<Context> contextReference;
private sync type;
public SyncBookmarksAsyncTask(Context context, sync type, OnSyncBookmarksInterface onSyncBookmarksInterface) {
this.contextReference = new WeakReference<>(context);
this.type = type;

2
app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java
View File

@ -86,7 +86,7 @@ public class UpdateAccountInfoByIDAsyncTask extends AsyncTask<Void, Void, Void>
if (response != null && response.getEmojis() != null && response.getEmojis().size() > 0) {
new CustomEmojiDAO(contextReference.get(), db).removeAll();
for (Emojis emojis : response.getEmojis()) {
if( emojis.isVisible_in_picker()) {
if (emojis.isVisible_in_picker()) {
new CustomEmojiDAO(contextReference.get(), db).insertEmoji(emojis);
}
}

490
app/src/main/java/app/fedilab/android/client/API.java
View File

@ -20,7 +20,6 @@ import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.google.gson.JsonArray;
@ -360,7 +359,7 @@ public class API {
}
ArrayList<String> resolutions = new ArrayList<>();
if( resobj.has("streamingPlaylists") && resobj.getJSONArray("streamingPlaylists").length() > 0){
if (resobj.has("streamingPlaylists") && resobj.getJSONArray("streamingPlaylists").length() > 0) {
JSONArray files = resobj.getJSONArray("streamingPlaylists").getJSONObject(0).getJSONArray("files");
for (int j = 0; j < files.length(); j++) {
@ -369,7 +368,7 @@ public class API {
}
peertube.setResolution(resolutions);
peertube.setStreamService(true);
}else {
} else {
JSONArray files = resobj.getJSONArray("files");
for (int j = 0; j < files.length(); j++) {
@ -546,9 +545,9 @@ public class API {
poll.setExpired(resobj.getBoolean("expired"));
poll.setMultiple(resobj.getBoolean("multiple"));
poll.setVotes_count(resobj.getInt("votes_count"));
if( resobj.has("voters_count")){
if (resobj.has("voters_count")) {
poll.setVoters_count(resobj.getInt("voters_count"));
}else{
} else {
poll.setVoters_count(resobj.getInt("votes_count"));
}
poll.setVoted(resobj.getBoolean("voted"));
@ -579,14 +578,14 @@ public class API {
Status status = new Status();
try {
status.setId(resobj.get("id").toString());
if( resobj.has("uri")) {
if (resobj.has("uri")) {
status.setUri(resobj.get("uri").toString());
}else {
} else {
status.setUri(resobj.get("id").toString());
}
if( resobj.has("created_at")) {
if (resobj.has("created_at")) {
status.setCreated_at(Helper.mstStringToDate(context, resobj.get("created_at").toString()));
}else{
} else {
status.setCreated_at(new Date());
}
status.setIn_reply_to_id(resobj.get("in_reply_to_id").toString());
@ -606,7 +605,7 @@ public class API {
status.setUrl(resobj.get("url").toString());
ArrayList<Attachment> attachments = new ArrayList<>();
//Retrieves attachments
if( resobj.has("media_attachments")) {
if (resobj.has("media_attachments")) {
JSONArray arrayAttachement = resobj.getJSONArray("media_attachments");
if (arrayAttachement != null) {
@ -743,9 +742,9 @@ public class API {
poll.setExpired(resobj.getJSONObject("poll").getBoolean("expired"));
poll.setMultiple(resobj.getJSONObject("poll").getBoolean("multiple"));
poll.setVotes_count(resobj.getJSONObject("poll").getInt("votes_count"));
if( resobj.getJSONObject("poll").has("voters_count") && !resobj.getJSONObject("poll").isNull("voters_count")){
if (resobj.getJSONObject("poll").has("voters_count") && !resobj.getJSONObject("poll").isNull("voters_count")) {
poll.setVoters_count(resobj.getJSONObject("poll").getInt("voters_count"));
}else{
} else {
poll.setVoters_count(resobj.getJSONObject("poll").getInt("votes_count"));
}
poll.setVoted(resobj.getJSONObject("poll").getBoolean("voted"));
@ -795,159 +794,6 @@ public class API {
return status;
}
/**
* Parse xml response for Nitter
*
* @param xml String
* @return List<Status>
*/
private List<Status> parseNitter(String xml) {
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
String nitterHost = sharedpreferences.getString(Helper.SET_NITTER_HOST, Helper.DEFAULT_NITTER_HOST).toLowerCase();
List<Status> statuses = new ArrayList<>();
try {
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
factory.setNamespaceAware(true);
XmlPullParser xpp = factory.newPullParser();
xpp.setInput( new StringReader( xml ) );
int eventType = xpp.getEventType();
Account account = null;
Status status = null;
HashMap<String, String> mappedProfile = new HashMap<>();
while (eventType != XmlPullParser.END_DOCUMENT) {
if(eventType == XmlPullParser.START_TAG) {
if( xpp.getName().compareTo("item") == 0 ){
status = new Status();
status.setReplies_count(0);
status.setFavourites_count(0);
status.setReblogs_count(0);
status.setFavourited(false);
status.setReblogged(false);
status.setEmojiFound(true);
status.setPollEmojiFound(true);
status.setEmojiTranslateFound(true);
status.setMedia_attachments(new ArrayList<>());
account = new Account();
}else if( xpp.getName().compareTo("creator") == 0 ){
eventType = xpp.next();
if(eventType == XmlPullParser.TEXT) {
if( account != null ){
account.setAcct(xpp.getText().replace("@","")+"@" + nitterHost);
account.setDisplay_name(xpp.getText().replace("@",""));
account.setUsername(xpp.getText().replace("@",""));
account.setId("https://" + nitterHost + "/" + xpp.getText());
account.setUuid("https://" + nitterHost + "/" + xpp.getText());
account.setUrl("https://" + nitterHost + "/" + xpp.getText());
if( !mappedProfile.containsKey(xpp.getText()) ){
HttpsConnection httpsConnection = new HttpsConnection(context, nitterHost);
try {
String response = httpsConnection.get("https://" + nitterHost + "/" + xpp.getText() + "/rss", 10, null, null);
XmlPullParserFactory factory2 = XmlPullParserFactory.newInstance();
factory2.setNamespaceAware(true);
XmlPullParser xpp2 = factory2.newPullParser();
xpp2.setInput( new StringReader( response ) );
int eventType2 = xpp2.getEventType();
while (eventType2 != XmlPullParser.END_DOCUMENT) {
if (eventType2 == XmlPullParser.START_TAG) {
if (xpp2.getName().compareTo("url") == 0) {
eventType2 = xpp2.next();
if(eventType2 == XmlPullParser.TEXT ) {
mappedProfile.put(xpp.getText(), xpp2.getText());
}
break;
}
}
eventType2 = xpp2.next();
}
} catch (NoSuchAlgorithmException | KeyManagementException | HttpsConnection.HttpsConnectionException e) {
e.printStackTrace();
}
}
account.setAvatar(mappedProfile.get(xpp.getText()));
}
}
} else if( xpp.getName().compareTo("pubDate") == 0 ){
eventType = xpp.next();
if(eventType == XmlPullParser.TEXT && status != null) {
if( xpp.getText() != null ) {
try {
DateFormat formatter = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
Date date = formatter.parse(xpp.getText());
status.setCreated_at(date);
} catch (ParseException e) {
status.setCreated_at(new Date());
}
}
}
}else if( xpp.getName().compareTo("description") == 0 ){
eventType = xpp.next();
if(eventType == XmlPullParser.TEXT && status != null) {
if( xpp.getText() != null ) {
String description = xpp.getText();
Pattern imgPattern = Pattern.compile("<img [^>]*src=\"([^\"]+)\"[^>]*>");
Matcher matcher = imgPattern.matcher(description);
List<String> imgs = new ArrayList<>();
int i = 1;
ArrayList<Attachment> attachments = new ArrayList<>();
while (matcher.find()) {
description = description.replaceAll(Pattern.quote(matcher.group()), "");
imgs.add("[media_" + i + "]|" + matcher.group(1));
Attachment attachment = new Attachment();
attachment.setType("image");
attachment.setDescription("");
attachment.setUrl(matcher.group(1));
attachment.setPreview_url(matcher.group(1));
attachment.setId(matcher.group(1));
attachments.add(attachment);
}
status.setMedia_attachments(attachments);
status.setContent(context, description);
}
}
}else if( xpp.getName().compareTo("guid") == 0 ){
eventType = xpp.next();
if(eventType == XmlPullParser.TEXT && status != null) {
if( xpp.getText() != null ) {
status.setUri(xpp.getText());
Pattern idPattern = Pattern.compile("([0-9])+");
Matcher matcher = idPattern.matcher(xpp.getText());
while (matcher.find()) {
status.setId(matcher.group(0));
}
}
}
}else if( xpp.getName().compareTo("link") == 0 ){
eventType = xpp.next();
if(eventType == XmlPullParser.TEXT && status != null) {
if( xpp.getText() != null ) {
status.setUrl(xpp.getText());
}
}
}
} else if(eventType == XmlPullParser.END_TAG) {
if( xpp.getName().compareTo("item") == 0 ){
if (status != null) {
status.setAccount(account);
statuses.add(status);
}
account = null;
status = null;
}
}
eventType = xpp.next();
}
} catch (XmlPullParserException | IOException e) {
e.printStackTrace();
}
return statuses;
}
/**
* Parse json response for several notes (Misskey)
*
@ -1394,19 +1240,19 @@ public class API {
} else {
account.setCreated_at(new Date());
}
if( !resobj.isNull("followers_count")) {
if (!resobj.isNull("followers_count")) {
account.setFollowers_count(Integer.valueOf(resobj.get("followers_count").toString()));
}else{
} else {
account.setFollowers_count(0);
}
if( !resobj.isNull("following_count")) {
if (!resobj.isNull("following_count")) {
account.setFollowing_count(Integer.valueOf(resobj.get("following_count").toString()));
}else{
} else {
account.setFollowing_count(0);
}
if( !resobj.isNull("statuses_count")) {
if (!resobj.isNull("statuses_count")) {
account.setStatuses_count(Integer.valueOf(resobj.get("statuses_count").toString()));
}else{
} else {
account.setStatuses_count(0);
}
account.setNote(resobj.get("note").toString());
@ -1501,41 +1347,6 @@ public class API {
return account;
}
private List<IdentityProof> parseIdentityProof(Context context, JSONArray jsonArray) {
List<IdentityProof> identityProofs = new ArrayList<>();
try {
int i = 0;
while (i < jsonArray.length()) {
JSONObject resobj = jsonArray.getJSONObject(i);
IdentityProof identityProof = parseIdentityProof(context, resobj);
i++;
if (identityProof != null) {
identityProofs.add(identityProof);
}
}
} catch (JSONException e) {
e.printStackTrace();
}
return identityProofs;
}
private IdentityProof parseIdentityProof(Context context, JSONObject jsonObject) {
IdentityProof identityProof = new IdentityProof();
try {
identityProof.setProfile_url(jsonObject.getString("profile_url"));
identityProof.setProof_url(jsonObject.getString("proof_url"));
identityProof.setProvider(jsonObject.getString("provider"));
identityProof.setProvider_username(jsonObject.getString("provider_username"));
identityProof.setUpdated_at(Helper.mstStringToDate(context, jsonObject.getString("updated_at")));
} catch (JSONException | ParseException e) {
e.printStackTrace();
}
return identityProof;
}
/**
* Parse json response an unique account
*
@ -1719,6 +1530,193 @@ public class API {
return notification;
}
/**
* Parse xml response for Nitter
*
* @param xml String
* @return List<Status>
*/
private List<Status> parseNitter(String xml) {
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
String nitterHost = sharedpreferences.getString(Helper.SET_NITTER_HOST, Helper.DEFAULT_NITTER_HOST).toLowerCase();
List<Status> statuses = new ArrayList<>();
try {
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
factory.setNamespaceAware(true);
XmlPullParser xpp = factory.newPullParser();
xpp.setInput(new StringReader(xml));
int eventType = xpp.getEventType();
Account account = null;
Status status = null;
HashMap<String, String> mappedProfile = new HashMap<>();
while (eventType != XmlPullParser.END_DOCUMENT) {
if (eventType == XmlPullParser.START_TAG) {
if (xpp.getName().compareTo("item") == 0) {
status = new Status();
status.setReplies_count(0);
status.setFavourites_count(0);
status.setReblogs_count(0);
status.setFavourited(false);
status.setReblogged(false);
status.setEmojiFound(true);
status.setPollEmojiFound(true);
status.setEmojiTranslateFound(true);
status.setMedia_attachments(new ArrayList<>());
account = new Account();
} else if (xpp.getName().compareTo("creator") == 0) {
eventType = xpp.next();
if (eventType == XmlPullParser.TEXT) {
if (account != null) {
account.setAcct(xpp.getText().replace("@", "") + "@" + nitterHost);
account.setDisplay_name(xpp.getText().replace("@", ""));
account.setUsername(xpp.getText().replace("@", ""));
account.setId("https://" + nitterHost + "/" + xpp.getText());
account.setUuid("https://" + nitterHost + "/" + xpp.getText());
account.setUrl("https://" + nitterHost + "/" + xpp.getText());
if (!mappedProfile.containsKey(xpp.getText())) {
HttpsConnection httpsConnection = new HttpsConnection(context, nitterHost);
try {
String response = httpsConnection.get("https://" + nitterHost + "/" + xpp.getText() + "/rss", 10, null, null);
XmlPullParserFactory factory2 = XmlPullParserFactory.newInstance();
factory2.setNamespaceAware(true);
XmlPullParser xpp2 = factory2.newPullParser();
xpp2.setInput(new StringReader(response));
int eventType2 = xpp2.getEventType();
while (eventType2 != XmlPullParser.END_DOCUMENT) {
if (eventType2 == XmlPullParser.START_TAG) {
if (xpp2.getName().compareTo("url") == 0) {
eventType2 = xpp2.next();
if (eventType2 == XmlPullParser.TEXT) {
mappedProfile.put(xpp.getText(), xpp2.getText());
}
break;
}
}
eventType2 = xpp2.next();
}
} catch (NoSuchAlgorithmException | KeyManagementException | HttpsConnection.HttpsConnectionException e) {
e.printStackTrace();
}
}
account.setAvatar(mappedProfile.get(xpp.getText()));
}
}
} else if (xpp.getName().compareTo("pubDate") == 0) {
eventType = xpp.next();
if (eventType == XmlPullParser.TEXT && status != null) {
if (xpp.getText() != null) {
try {
DateFormat formatter = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
Date date = formatter.parse(xpp.getText());
status.setCreated_at(date);
} catch (ParseException e) {
status.setCreated_at(new Date());
}
}
}
} else if (xpp.getName().compareTo("description") == 0) {
eventType = xpp.next();
if (eventType == XmlPullParser.TEXT && status != null) {
if (xpp.getText() != null) {
String description = xpp.getText();
Pattern imgPattern = Pattern.compile("<img [^>]*src=\"([^\"]+)\"[^>]*>");
Matcher matcher = imgPattern.matcher(description);
List<String> imgs = new ArrayList<>();
int i = 1;
ArrayList<Attachment> attachments = new ArrayList<>();
while (matcher.find()) {
description = description.replaceAll(Pattern.quote(matcher.group()), "");
imgs.add("[media_" + i + "]|" + matcher.group(1));
Attachment attachment = new Attachment();
attachment.setType("image");
attachment.setDescription("");
attachment.setUrl(matcher.group(1));
attachment.setPreview_url(matcher.group(1));
attachment.setId(matcher.group(1));
attachments.add(attachment);
}
status.setMedia_attachments(attachments);
status.setContent(context, description);
}
}
} else if (xpp.getName().compareTo("guid") == 0) {
eventType = xpp.next();
if (eventType == XmlPullParser.TEXT && status != null) {
if (xpp.getText() != null) {
status.setUri(xpp.getText());
Pattern idPattern = Pattern.compile("([0-9])+");
Matcher matcher = idPattern.matcher(xpp.getText());
while (matcher.find()) {
status.setId(matcher.group(0));
}
}
}
} else if (xpp.getName().compareTo("link") == 0) {
eventType = xpp.next();
if (eventType == XmlPullParser.TEXT && status != null) {
if (xpp.getText() != null) {
status.setUrl(xpp.getText());
}
}
}
} else if (eventType == XmlPullParser.END_TAG) {
if (xpp.getName().compareTo("item") == 0) {
if (status != null) {
status.setAccount(account);
statuses.add(status);
}
account = null;
status = null;
}
}
eventType = xpp.next();
}
} catch (XmlPullParserException | IOException e) {
e.printStackTrace();
}
return statuses;
}
private List<IdentityProof> parseIdentityProof(Context context, JSONArray jsonArray) {
List<IdentityProof> identityProofs = new ArrayList<>();
try {
int i = 0;
while (i < jsonArray.length()) {
JSONObject resobj = jsonArray.getJSONObject(i);
IdentityProof identityProof = parseIdentityProof(context, resobj);
i++;
if (identityProof != null) {
identityProofs.add(identityProof);
}
}
} catch (JSONException e) {
e.printStackTrace();
}
return identityProofs;
}
private IdentityProof parseIdentityProof(Context context, JSONObject jsonObject) {
IdentityProof identityProof = new IdentityProof();
try {
identityProof.setProfile_url(jsonObject.getString("profile_url"));
identityProof.setProof_url(jsonObject.getString("proof_url"));
identityProof.setProvider(jsonObject.getString("provider"));
identityProof.setProvider_username(jsonObject.getString("provider_username"));
identityProof.setUpdated_at(Helper.mstStringToDate(context, jsonObject.getString("updated_at")));
} catch (JSONException | ParseException e) {
e.printStackTrace();
}
return identityProof;
}
/**
* Execute admin get actions
*
@ -2080,11 +2078,11 @@ public class API {
String response;
InstanceNodeInfo instanceNodeInfo = new InstanceNodeInfo();
if( domain.startsWith("http://")){
domain = domain.replace("http://","");
if (domain.startsWith("http://")) {
domain = domain.replace("http://", "");
}
if( domain.startsWith("https://")){
domain = domain.replace("https://","");
if (domain.startsWith("https://")) {
domain = domain.replace("https://", "");
}
try {
response = new HttpsConnection(context, domain).get("https://" + domain + "/.well-known/nodeinfo", 30, null, null);
@ -2129,7 +2127,7 @@ public class API {
} catch (NoSuchAlgorithmException | JSONException | KeyManagementException e1) {
e1.printStackTrace();
} catch (HttpsConnection.HttpsConnectionException e1) {
if (e1.getStatusCode() == 404 || e1.getStatusCode() == 501 ) {
if (e1.getStatusCode() == 404 || e1.getStatusCode() == 501) {
instanceNodeInfo.setName("GNU");
instanceNodeInfo.setVersion("unknown");
instanceNodeInfo.setOpenRegistrations(true);
@ -2153,7 +2151,7 @@ public class API {
} catch (NoSuchAlgorithmException | JSONException | KeyManagementException e1) {
e1.printStackTrace();
} catch (HttpsConnection.HttpsConnectionException e1) {
if (e1.getStatusCode() == 404|| e1.getStatusCode() == 501) {
if (e1.getStatusCode() == 404 || e1.getStatusCode() == 501) {
instanceNodeInfo.setName("GNU");
instanceNodeInfo.setVersion("unknown");
instanceNodeInfo.setOpenRegistrations(true);
@ -2170,8 +2168,6 @@ public class API {
}
public InstanceNodeInfo instanceInfo(String domain) {
String response;
@ -2202,7 +2198,7 @@ public class API {
instanceNodeInfo.setName(name);
instanceNodeInfo.setVersion(jsonObject.getString("version"));
instanceNodeInfo.setOpenRegistrations(resobj.getBoolean("openRegistrations"));
if (name.trim().toUpperCase().compareTo("MASTODON") == 0 || name.trim().toUpperCase().compareTo("PLEROMA") == 0 || name.trim().toUpperCase().compareTo("PIXELFED") == 0){
if (name.trim().toUpperCase().compareTo("MASTODON") == 0 || name.trim().toUpperCase().compareTo("PLEROMA") == 0 || name.trim().toUpperCase().compareTo("PIXELFED") == 0) {
APIResponse apiResponse = getInstance(domain);
Instance instanceNode = apiResponse.getInstance();
instanceNodeInfo.setNodeDescription(instanceNode.getDescription());
@ -2214,27 +2210,27 @@ public class API {
instanceNodeInfo.setThumbnail(instanceNode.getThumbnail());
instanceNodeInfo.setVersion(instanceNode.getVersion());
}
if( resobj.has("metadata")){
if (resobj.has("metadata")) {
JSONObject metadata = resobj.getJSONObject("metadata");
if( metadata.has("staffAccounts")){
if (metadata.has("staffAccounts")) {
instanceNodeInfo.setStaffAccountStr(metadata.getString("staffAccounts"));
}
if( metadata.has("nodeName")){
if (metadata.has("nodeName")) {
instanceNodeInfo.setNodeName(metadata.getString("nodeName"));
}
}
if( resobj.has("usage")){
if (resobj.has("usage")) {
JSONObject usage = resobj.getJSONObject("usage");
if( usage.has("users") && usage.getJSONObject("users").has("total")){
if (usage.has("users") && usage.getJSONObject("users").has("total")) {
instanceNodeInfo.setNumberOfUsers(usage.getJSONObject("users").getInt("total"));
}
if( usage.has("localPosts") ){
if (usage.has("localPosts")) {
instanceNodeInfo.setNumberOfPosts(usage.getInt("localPosts"));
}
}
if( instanceNodeInfo.getStaffAccountStr() != null && instanceNodeInfo.getStaffAccount() == null){
if (instanceNodeInfo.getStaffAccountStr() != null && instanceNodeInfo.getStaffAccount() == null) {
APIResponse search = searchAccounts(instanceNodeInfo.getStaffAccountStr(), 1);
if( search != null && search.getAccounts() != null && search.getAccounts().size() > 0 ){
if (search != null && search.getAccounts() != null && search.getAccounts().size() > 0) {
instanceNodeInfo.setStaffAccount(search.getAccounts().get(0));
}
}
@ -2244,7 +2240,7 @@ public class API {
}
} catch (IOException | JSONException | NoSuchAlgorithmException | KeyManagementException e) {
e.printStackTrace();
} catch (HttpsConnection.HttpsConnectionException e){
} catch (HttpsConnection.HttpsConnectionException e) {
APIResponse apiResponse = getInstance(domain);
instanceNodeInfo = new InstanceNodeInfo();
instanceNodeInfo.setName("MASTODON");
@ -2267,7 +2263,7 @@ public class API {
*/
public APIResponse getInstance(String instance) {
try {
String response = new HttpsConnection(context, this.instance).get("https://"+instance+"/api/v1/instance", 30, null, prefKeyOauthTokenT);
String response = new HttpsConnection(context, this.instance).get("https://" + instance + "/api/v1/instance", 30, null, prefKeyOauthTokenT);
Instance instanceEntity = parseInstance(new JSONObject(response));
apiResponse.setInstance(instanceEntity);
} catch (HttpsConnection.HttpsConnectionException e) {
@ -2577,7 +2573,7 @@ public class API {
List<Relationship> relationships;
Relationship relationship = null;
HashMap<String, String> params = new HashMap<>();
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED)
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED)
params.put("id[]", accountId);
else
params.put("id", accountId);
@ -3153,11 +3149,11 @@ public class API {
} else {
statuses = parseStatuses(context, new JSONArray(response));
}
} catch (UnknownHostException e){
if (since_id == null){
} catch (UnknownHostException e) {
if (since_id == null) {
getHomeTimelineCache(max_id);
}
} catch(HttpsConnection.HttpsConnectionException e) {
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
@ -3169,9 +3165,9 @@ public class API {
}
/**
*Get identy proof for an account *synchronously*
* Get identy proof for an account *synchronously*
*
* @param userId user_id String
* @param userId user_id String
* @return APIResponse
*/
public APIResponse getIdentityProof(String userId) {
@ -3181,8 +3177,8 @@ public class API {
String response = httpsConnection.get(getAbsoluteUrl(String.format("/accounts/%s/identity_proofs", userId)), 10, null, prefKeyOauthTokenT);
identityProofs = parseIdentityProof(context, new JSONArray(response));
} catch (UnknownHostException e){
} catch(HttpsConnection.HttpsConnectionException e) {
} catch (UnknownHostException e) {
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
@ -3194,7 +3190,6 @@ public class API {
}
/**
* Retrieves public GNU timeline for the account *synchronously*
*
@ -3344,12 +3339,12 @@ public class API {
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.get("https://" + instance + "/api/v1/videos", 10, params, null);
if( response == null) {
if (response == null) {
apiResponse.setPeertubes(peertubes);
return apiResponse;
}
JSONObject jsonObject = new JSONObject(response);
if( jsonObject.has("data")) {
if (jsonObject.has("data")) {
JSONArray jsonArray = new JSONObject(response).getJSONArray("data");
peertubes = parsePeertube(instance, jsonArray);
}
@ -3494,7 +3489,7 @@ public class API {
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
String nitterHost = sharedpreferences.getString(Helper.SET_NITTER_HOST, Helper.DEFAULT_NITTER_HOST).toLowerCase();
String[] usernames = instance.split(" ");
if( usernames.length == 0 ){
if (usernames.length == 0) {
Error error = new Error();
error.setError(context.getString(R.string.toast_error));
error.setStatusCode(404);
@ -3502,12 +3497,12 @@ public class API {
return apiResponse;
}
StringBuilder urlparams = new StringBuilder();
for(String param: usernames){
for (String param : usernames) {
urlparams.append(param.trim()).append(",");
}
String url = "https://" + nitterHost + "/" + urlparams + "/rss";
if( max_id != null ){
if (max_id != null) {
url += "?max_position=" + max_id;
}
try {
@ -5921,9 +5916,9 @@ public class API {
trend.setName(resobj.getString("name"));
trend.setUrl(resobj.getString("url"));
List<TrendsHistory> historyList = new ArrayList<>();
if( resobj.has("history")) {
if (resobj.has("history")) {
JSONArray histories = resobj.getJSONArray("history");
for(int i = 0 ; i < histories.length() ; i++ ) {
for (int i = 0; i < histories.length(); i++) {
JSONObject hystory = histories.getJSONObject(i);
TrendsHistory trendsHistory = new TrendsHistory();
trendsHistory.setDays(hystory.getLong("day"));
@ -5939,7 +5934,6 @@ public class API {
}
/**
* Parse json response for several conversations
*
@ -6048,22 +6042,22 @@ public class API {
poll_limits.put("max_expiration", polllimits.getInt("max_expiration"));
instance.setPoll_limits(poll_limits);
}
if( resobj.has("thumbnail")){
if (resobj.has("thumbnail")) {
instance.setThumbnail(resobj.getString("thumbnail"));
}
if( resobj.has("stats")){
if (resobj.has("stats")) {
JSONObject stats = resobj.getJSONObject("stats");
if( stats.has("user_count")) {
if (stats.has("user_count")) {
instance.setUserCount(stats.getInt("user_count"));
}
if( stats.has("status_count")) {
if (stats.has("status_count")) {
instance.setStatusCount(stats.getInt("status_count"));
}
if( stats.has("domain_count")) {
if (stats.has("domain_count")) {
instance.setDomainCount(stats.getInt("domain_count"));
}
}
if( resobj.has("contact_account")){
if (resobj.has("contact_account")) {
instance.setContactAccount(parseAccountResponse(context, resobj.getJSONObject("contact_account")));
}
} catch (JSONException e) {

47
app/src/main/java/app/fedilab/android/client/Entities/Attachment.java
View File

@ -24,6 +24,17 @@ import android.os.Parcelable;
public class Attachment implements Parcelable {
public static final Creator<Attachment> CREATOR = new Creator<Attachment>() {
@Override
public Attachment createFromParcel(Parcel source) {
return new Attachment(source);
}
@Override
public Attachment[] newArray(int size) {
return new Attachment[size];
}
};
private String id;
private String type;
private String url;
@ -38,6 +49,18 @@ public class Attachment implements Parcelable {
}
protected Attachment(Parcel in) {
this.id = in.readString();
this.type = in.readString();
this.url = in.readString();
this.remote_url = in.readString();
this.preview_url = in.readString();
this.meta = in.readString();
this.text_url = in.readString();
this.description = in.readString();
this.local_path = in.readString();
}
public String getId() {
return id;
}
@ -127,28 +150,4 @@ public class Attachment implements Parcelable {
dest.writeString(this.description);
dest.writeString(this.local_path);
}
protected Attachment(Parcel in) {
this.id = in.readString();
this.type = in.readString();
this.url = in.readString();
this.remote_url = in.readString();
this.preview_url = in.readString();
this.meta = in.readString();
this.text_url = in.readString();
this.description = in.readString();
this.local_path = in.readString();
}
public static final Creator<Attachment> CREATOR = new Creator<Attachment>() {
@Override
public Attachment createFromParcel(Parcel source) {
return new Attachment(source);
}
@Override
public Attachment[] newArray(int size) {
return new Attachment[size];
}
};
}

15
app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java
View File

@ -60,7 +60,6 @@ import app.fedilab.android.sqlite.TimelinesDAO;
import es.dmoral.toasty.Toasty;
import static app.fedilab.android.activities.BaseMainActivity.mPageReferenceMap;
import static app.fedilab.android.activities.BaseMainActivity.regex_home;
import static app.fedilab.android.sqlite.Sqlite.DB_NAME;
@ -282,13 +281,13 @@ public class ManageTimelines {
icon = tb.getCustomView().findViewById(R.id.tab_icon);
}
Helper.changeDrawableColor(context,R.drawable.ic_home, R.attr.iconColorMenu);
Helper.changeDrawableColor(context,R.drawable.ic_notifications, R.attr.iconColorMenu);
Helper.changeDrawableColor(context,R.drawable.ic_direct_messages, R.attr.iconColorMenu);
Helper.changeDrawableColor(context,R.drawable.ic_people, R.attr.iconColorMenu);
Helper.changeDrawableColor(context,R.drawable.ic_public, R.attr.iconColorMenu);
Helper.changeDrawableColor(context,R.drawable.ic_color_lens, R.attr.iconColorMenu);
Helper.changeDrawableColor(context,R.drawable.ic_video_peertube, R.attr.iconColorMenu);
Helper.changeDrawableColor(context, R.drawable.ic_home, R.attr.iconColorMenu);
Helper.changeDrawableColor(context, R.drawable.ic_notifications, R.attr.iconColorMenu);
Helper.changeDrawableColor(context, R.drawable.ic_direct_messages, R.attr.iconColorMenu);
Helper.changeDrawableColor(context, R.drawable.ic_people, R.attr.iconColorMenu);
Helper.changeDrawableColor(context, R.drawable.ic_public, R.attr.iconColorMenu);
Helper.changeDrawableColor(context, R.drawable.ic_color_lens, R.attr.iconColorMenu);
Helper.changeDrawableColor(context, R.drawable.ic_video_peertube, R.attr.iconColorMenu);
if (icon != null) {
switch (tl.getType()) {
case HOME:

3
app/src/main/java/app/fedilab/android/client/Entities/Notification.java
View File

@ -246,7 +246,8 @@ public class Notification implements Parcelable {
contentSpan.setSpan(
imageSpan, startPosition,
endPosition, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
}catch (Exception ignored){}
} catch (Exception ignored) {
}
}
}
}

10
app/src/main/java/app/fedilab/android/client/Entities/Peertube.java
View File

@ -21,8 +21,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import app.fedilab.android.helper.Helper;
/**
* Created by Thomas on 29/09/2018.
* Manage how to videos
@ -183,9 +181,9 @@ public class Peertube {
resolution = this.getResolution().get(0);
if (resolution == null)
return null;
if( streamService) {
if (streamService) {
return "https://" + this.host + "/static/streaming-playlists/hls/" + getUuid() + "/" + getUuid() + "-" + resolution + "-fragmented.mp4";
}else{
} else {
return "https://" + this.host + "/static/webseed/" + getUuid() + "-" + resolution + ".mp4";
}
@ -215,9 +213,9 @@ public class Peertube {
resolution = this.getResolution().get(0);
if (resolution == null)
return null;
if( streamService) {
if (streamService) {
return "https://" + this.host + "/download/streaming-playlists/hls/videos/" + getUuid() + "/" + getUuid() + "-" + resolution + "-fragmented.mp4";
}else{
} else {
return "https://" + this.host + "/download/videos/" + getUuid() + "-" + resolution + ".mp4";
}

1
app/src/main/java/app/fedilab/android/client/Entities/PollOptions.java
View File

@ -38,6 +38,7 @@ public class PollOptions implements Parcelable {
public PollOptions() {
}
protected PollOptions(Parcel in) {
this.title = in.readString();
this.votes_count = in.readInt();

361
app/src/main/java/app/fedilab/android/client/Entities/Status.java
View File

@ -65,8 +65,6 @@ import com.github.penfeizhou.animation.apng.decode.APNGParser;
import com.github.penfeizhou.animation.gif.GifDrawable;
import com.github.penfeizhou.animation.gif.decode.GifParser;
import net.gotev.uploadservice.http.HttpConnection;
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
@ -81,7 +79,6 @@ import java.util.regex.Pattern;
import app.fedilab.android.R;
import app.fedilab.android.activities.BaseActivity;
import app.fedilab.android.activities.BaseMainActivity;
import app.fedilab.android.activities.GroupActivity;
import app.fedilab.android.activities.HashTagActivity;
import app.fedilab.android.activities.MainActivity;
@ -90,24 +87,19 @@ import app.fedilab.android.activities.ShowAccountActivity;
import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
import app.fedilab.android.client.HttpsConnection;
import app.fedilab.android.fragments.TabLayoutNotificationsFragment;
import app.fedilab.android.helper.CrossActions;
import app.fedilab.android.helper.CustomQuoteSpan;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.LongClickLinkMovementMethod;
import app.fedilab.android.helper.LongClickableSpan;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.interfaces.OnRetrieveEmojiInterface;
import app.fedilab.android.interfaces.OnRetrieveImageInterface;
import app.fedilab.android.sqlite.StatusStoredDAO;
import es.dmoral.toasty.Toasty;
import static android.content.Context.MODE_PRIVATE;
import static app.fedilab.android.activities.BaseMainActivity.mPageReferenceMap;
import static app.fedilab.android.drawers.StatusListAdapter.COMPACT_STATUS;
import static app.fedilab.android.drawers.StatusListAdapter.CONSOLE_STATUS;
import static app.fedilab.android.drawers.StatusListAdapter.DISPLAYED_STATUS;
import static app.fedilab.android.helper.Helper.THEME_BLACK;
import static app.fedilab.android.helper.Helper.drawableToBitmap;
/**
@ -463,7 +455,7 @@ public class Status implements Parcelable {
uri = new URI(url);
instance = uri.getHost();
} catch (URISyntaxException e) {
if( url.contains("|")) {
if (url.contains("|")) {
try {
uri = new URI(url.split("\\|")[0]);
instance = uri.getHost();
@ -482,7 +474,7 @@ public class Status implements Parcelable {
account.setInstance(instance);
account.setUrl(url);
String accountId = null;
if( mentions != null) {
if (mentions != null) {
for (Mention mention : mentions) {
String[] accountMentionAcct = mention.getAcct().split("@");
//Different isntance
@ -632,187 +624,186 @@ public class Status implements Parcelable {
if (endPosition <= spannableStringT.toString().length() && endPosition >= startPosition) {
spannableStringT.setSpan(new LongClickableSpan() {
@Override
public void onClick(@NonNull View textView) {
String finalUrl = url;
Pattern link = Pattern.compile("https?:\\/\\/([\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/(@[\\w._-]*[0-9]*)(\\/[0-9]{1,})?$");
Matcher matcherLink = link.matcher(url);
if (matcherLink.find() && !url.contains("medium.com")) {
if (matcherLink.group(3) != null && matcherLink.group(3).length() > 0) { //It's a toot
CrossActions.doCrossConversation(context, finalUrl);
} else {//It's an account
Account account = new Account();
String acct = matcherLink.group(2);
if (acct != null) {
if (acct.startsWith("@"))
acct = acct.substring(1);
account.setAcct(acct);
account.setInstance(matcherLink.group(1));
CrossActions.doCrossProfile(context, account);
@Override
public void onClick(@NonNull View textView) {
String finalUrl = url;
Pattern link = Pattern.compile("https?:\\/\\/([\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/(@[\\w._-]*[0-9]*)(\\/[0-9]{1,})?$");
Matcher matcherLink = link.matcher(url);
if (matcherLink.find() && !url.contains("medium.com")) {
if (matcherLink.group(3) != null && matcherLink.group(3).length() > 0) { //It's a toot
CrossActions.doCrossConversation(context, finalUrl);
} else {//It's an account
Account account = new Account();
String acct = matcherLink.group(2);
if (acct != null) {
if (acct.startsWith("@"))
acct = acct.substring(1);
account.setAcct(acct);
account.setInstance(matcherLink.group(1));
CrossActions.doCrossProfile(context, account);
}
}
} else {
link = Pattern.compile("(https?:\\/\\/[\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/videos\\/watch\\/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
matcherLink = link.matcher(url);
if (matcherLink.find()) { //Peertubee video
Intent intent = new Intent(context, PeertubeActivity.class);
Bundle b = new Bundle();
String url = matcherLink.group(1) + "/videos/watch/" + matcherLink.group(2);
b.putString("peertubeLinkToFetch", url);
b.putString("peertube_instance", matcherLink.group(1).replace("https://", "").replace("http://", ""));
b.putString("video_id", matcherLink.group(2));
intent.putExtras(b);
context.startActivity(intent);
} else {
if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
finalUrl = "http://" + url;
Helper.openBrowser(context, finalUrl);
}
}
}
} else {
link = Pattern.compile("(https?:\\/\\/[\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/videos\\/watch\\/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
matcherLink = link.matcher(url);
if (matcherLink.find()) { //Peertubee video
Intent intent = new Intent(context, PeertubeActivity.class);
Bundle b = new Bundle();
String url = matcherLink.group(1) + "/videos/watch/" + matcherLink.group(2);
b.putString("peertubeLinkToFetch", url);
b.putString("peertube_instance", matcherLink.group(1).replace("https://", "").replace("http://", ""));
b.putString("video_id", matcherLink.group(2));
intent.putExtras(b);
context.startActivity(intent);
} else {
if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
finalUrl = "http://" + url;
Helper.openBrowser(context, finalUrl);
@Override
public void onLongClick(@NonNull View textView) {
PopupMenu popup = new PopupMenu(context, textView);
popup.getMenuInflater()
.inflate(R.menu.links_popup, popup.getMenu());
int style;
if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark;
} else if (theme == Helper.THEME_BLACK) {
style = R.style.DialogBlack;
} else {
style = R.style.Dialog;
}
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_show_link:
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
AlertDialog.Builder builder = new AlertDialog.Builder(context, style);
builder.setMessage(url);
builder.setTitle(context.getString(R.string.display_full_link));
builder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
})
.show();
break;
case R.id.action_share_link:
Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
sendIntent.putExtra(Intent.EXTRA_TEXT, url);
sendIntent.setType("text/plain");
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
break;
case R.id.action_open_other_app:
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(url));
try {
context.startActivity(intent);
} catch (Exception e) {
Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
}
break;
case R.id.action_copy_link:
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, url);
if (clipboard != null) {
clipboard.setPrimaryClip(clip);
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
}
break;
case R.id.action_unshorten:
Thread thread = new Thread() {
@Override
public void run() {
String response = new HttpsConnection(context, null).checkUrl(url);
Handler mainHandler = new Handler(context.getMainLooper());
Runnable myRunnable = new Runnable() {
@Override
public void run() {
AlertDialog.Builder builder = new AlertDialog.Builder(context, style);
if (response != null) {
builder.setMessage(context.getString(R.string.redirect_detected, url, response));
builder.setNegativeButton(R.string.copy_link, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, response);
if (clipboard != null) {
clipboard.setPrimaryClip(clip);
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
}
dialog.dismiss();
}
});
builder.setNeutralButton(R.string.share_link, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
sendIntent.putExtra(Intent.EXTRA_TEXT, url);
sendIntent.setType("text/plain");
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
dialog.dismiss();
}
});
} else {
builder.setMessage(R.string.no_redirect);
}
builder.setTitle(context.getString(R.string.check_redirect));
builder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
})
.show();
}
};
mainHandler.post(myRunnable);
}
};
thread.start();
break;
}
return true;
}
});
popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
@Override
public void onDismiss(PopupMenu menu) {
BaseActivity.canShowActionMode = true;
}
});
popup.show();
textView.clearFocus();
BaseActivity.canShowActionMode = false;
}
}
}
@Override
public void onLongClick(@NonNull View textView) {
PopupMenu popup = new PopupMenu(context, textView);
popup.getMenuInflater()
.inflate(R.menu.links_popup, popup.getMenu());
int style;
if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark;
} else if (theme == Helper.THEME_BLACK) {
style = R.style.DialogBlack;
} else {
style = R.style.Dialog;
}
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_show_link:
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
AlertDialog.Builder builder = new AlertDialog.Builder(context, style);
builder.setMessage(url);
builder.setTitle(context.getString(R.string.display_full_link));
builder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
})
.show();
break;
case R.id.action_share_link:
Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
sendIntent.putExtra(Intent.EXTRA_TEXT, url);
sendIntent.setType("text/plain");
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
break;
case R.id.action_open_other_app:
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(url));
try {
context.startActivity(intent);
} catch (Exception e) {
Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
}
break;
case R.id.action_copy_link:
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, url);
if (clipboard != null) {
clipboard.setPrimaryClip(clip);
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
}
break;
case R.id.action_unshorten:
Thread thread = new Thread() {
@Override
public void run() {
String response = new HttpsConnection(context, null).checkUrl(url);
Handler mainHandler = new Handler(context.getMainLooper());
Runnable myRunnable = new Runnable() {
@Override
public void run() {
AlertDialog.Builder builder = new AlertDialog.Builder(context, style);
if( response != null ) {
builder.setMessage(context.getString(R.string.redirect_detected,url,response));
builder.setNegativeButton(R.string.copy_link, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, response);
if (clipboard != null) {
clipboard.setPrimaryClip(clip);
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
}
dialog.dismiss();
}
});
builder.setNeutralButton(R.string.share_link, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
sendIntent.putExtra(Intent.EXTRA_TEXT, url);
sendIntent.setType("text/plain");
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
dialog.dismiss();
}
});
}else{
builder.setMessage(R.string.no_redirect);
}
builder.setTitle(context.getString(R.string.check_redirect));
builder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
})
.show();
}
};
mainHandler.post(myRunnable);
}
};
thread.start();
break;
}
return true;
}
});
popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
@Override
public void onDismiss(PopupMenu menu) {
BaseActivity.canShowActionMode = true;
}
});
popup.show();
textView.clearFocus();
BaseActivity.canShowActionMode = false;
}
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setUnderlineText(false);
ds.setColor(link_color);
}
},
startPosition, endPosition,
Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setUnderlineText(false);
ds.setColor(link_color);
}
},
startPosition, endPosition,
Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
}
@ -1069,7 +1060,7 @@ public class Status implements Parcelable {
resource.setBounds(0, 0, (int) Helper.convertDpToPixel(20, context), (int) Helper.convertDpToPixel(20, context));
resource.setVisible(true, true);
imageSpan = new ImageSpan(resource);
}catch (Exception e) {
} catch (Exception e) {
Bitmap bitmap = drawableToBitmap(resource.getCurrent());
imageSpan = new ImageSpan(context,
Bitmap.createScaledBitmap(bitmap, (int) Helper.convertDpToPixel(20, context),

38
app/src/main/java/app/fedilab/android/client/Entities/Tag.java
View File

@ -27,12 +27,31 @@ import java.util.List;
public class Tag implements Parcelable {
public static final Creator<Tag> CREATOR = new Creator<Tag>() {
@Override
public Tag createFromParcel(Parcel source) {
return new Tag(source);
}
@Override
public Tag[] newArray(int size) {
return new Tag[size];
}
};
private String name;
private String url;
private List<TrendsHistory> trendsHistory;
public Tag() {
}
protected Tag(Parcel in) {
this.name = in.readString();
this.url = in.readString();
this.trendsHistory = new ArrayList<TrendsHistory>();
in.readList(this.trendsHistory, TrendsHistory.class.getClassLoader());
}
public List<TrendsHistory> getTrendsHistory() {
return trendsHistory;
}
@ -68,23 +87,4 @@ public class Tag implements Parcelable {
dest.writeString(this.url);
dest.writeList(this.trendsHistory);
}
protected Tag(Parcel in) {
this.name = in.readString();
this.url = in.readString();
this.trendsHistory = new ArrayList<TrendsHistory>();
in.readList(this.trendsHistory, TrendsHistory.class.getClassLoader());
}
public static final Creator<Tag> CREATOR = new Creator<Tag>() {
@Override
public Tag createFromParcel(Parcel source) {
return new Tag(source);
}
@Override
public Tag[] newArray(int size) {
return new Tag[size];
}
};
}

41
app/src/main/java/app/fedilab/android/client/Entities/TrendsHistory.java
View File

@ -25,10 +25,30 @@ import android.os.Parcelable;
public class TrendsHistory implements Parcelable {
public static final Parcelable.Creator<TrendsHistory> CREATOR = new Parcelable.Creator<TrendsHistory>() {
@Override
public TrendsHistory createFromParcel(Parcel source) {
return new TrendsHistory(source);
}
@Override
public TrendsHistory[] newArray(int size) {
return new TrendsHistory[size];
}
};
private long days;
private int uses;
private int accounts;
public TrendsHistory() {
}
protected TrendsHistory(Parcel in) {
this.days = in.readLong();
this.uses = in.readInt();
this.accounts = in.readInt();
}
public long getDays() {
return days;
}
@ -64,25 +84,4 @@ public class TrendsHistory implements Parcelable {
dest.writeInt(this.uses);
dest.writeInt(this.accounts);
}
public TrendsHistory() {
}
protected TrendsHistory(Parcel in) {
this.days = in.readLong();
this.uses = in.readInt();
this.accounts = in.readInt();
}
public static final Parcelable.Creator<TrendsHistory> CREATOR = new Parcelable.Creator<TrendsHistory>() {
@Override
public TrendsHistory createFromParcel(Parcel source) {
return new TrendsHistory(source);
}
@Override
public TrendsHistory[] newArray(int size) {
return new TrendsHistory[size];
}
};
}

12
app/src/main/java/app/fedilab/android/client/GNUAPI.java
View File

@ -268,7 +268,7 @@ public class GNUAPI {
}
//Retrieves mentions
List<Mention> mentions = new ArrayList<>();
Helper.largeLog( resobj.toString());
Helper.largeLog(resobj.toString());
if (resobj.has("attentions")) {
JSONArray arrayMention = resobj.getJSONArray("attentions");
if (arrayMention != null) {
@ -397,17 +397,17 @@ public class GNUAPI {
Account account = new Account();
try {
if( resobj.has("id_str")){
if (resobj.has("id_str")) {
account.setId(resobj.getString("id_str"));
}else{
} else {
account.setId(resobj.get("id").toString());
}
if (resobj.has("ostatus_uri")) {
account.setUuid(resobj.get("ostatus_uri").toString());
}else {
if( resobj.has("id_str")){
} else {
if (resobj.has("id_str")) {
account.setUuid(resobj.getString("id_str"));
}else{
} else {
account.setUuid(resobj.get("id").toString());
}
}

30
app/src/main/java/app/fedilab/android/client/HttpsConnection.java
View File

@ -21,7 +21,6 @@ import android.os.Build;
import android.text.Html;
import android.text.SpannableString;
import com.google.gson.JsonObject;
import net.gotev.uploadservice.MultipartUploadRequest;
@ -141,10 +140,11 @@ public class HttpsConnection {
/**
* Get calls
*
* @param urlConnection String url
* @param timeout int timeout
* @param paramaters HashMap<String, String> paramaters
* @param token String token
* @param timeout int timeout
* @param paramaters HashMap<String, String> paramaters
* @param token String token
* @return String
* @throws IOException
* @throws NoSuchAlgorithmException
@ -165,7 +165,7 @@ public class HttpsConnection {
}
StringBuilder postData = new StringBuilder();
URL url;
if( params.size() > 0 ) {
if (params.size() > 0) {
for (Map.Entry<String, Object> param : params.entrySet()) {
if (postData.length() != 0) postData.append('&');
postData.append(param.getKey());
@ -173,7 +173,7 @@ public class HttpsConnection {
postData.append(param.getValue());
}
url = new URL(urlConnection + "?" + postData);
}else{
} else {
url = new URL(urlConnection);
}
@ -228,10 +228,11 @@ public class HttpsConnection {
/**
* Will check if the current url is redirecting
*
* @param urlConnection String the url to check
* @return String null|string url redirection
*/
public String checkUrl(String urlConnection){
public String checkUrl(String urlConnection) {
URL url;
String redirect = null;
try {
@ -244,7 +245,7 @@ public class HttpsConnection {
httpsURLConnection.setInstanceFollowRedirects(false);
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
httpsURLConnection.setRequestMethod("HEAD");
if( httpsURLConnection.getResponseCode() == 301) {
if (httpsURLConnection.getResponseCode() == 301) {
Map<String, List<String>> map = httpsURLConnection.getHeaderFields();
for (Map.Entry<String, List<String>> entry : map.entrySet()) {
if (entry.toString().toLowerCase().startsWith("location")) {
@ -256,11 +257,11 @@ public class HttpsConnection {
}
}
httpsURLConnection.getInputStream().close();
if (redirect != null && redirect.compareTo(urlConnection)!=0){
if (redirect != null && redirect.compareTo(urlConnection) != 0) {
URL redirectURL = new URL(redirect);
String host = redirectURL.getHost();
String protocol = redirectURL.getProtocol();
if( protocol == null || host == null){
if (protocol == null || host == null) {
redirect = null;
}
}
@ -833,7 +834,8 @@ public class HttpsConnection {
return httpsURLConnection.getInputStream();
}
httpsURLConnection.getInputStream().close();
} catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) {}
} catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) {
}
if (httpsURLConnection != null)
try {
httpsURLConnection.getInputStream().close();
@ -1372,7 +1374,7 @@ public class HttpsConnection {
return max_id;
}
private void getOKHttpHeader(Map<String, List<String>> headers){
private void getOKHttpHeader(Map<String, List<String>> headers) {
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
if (entry.toString().startsWith("Link") || entry.toString().startsWith("link")) {
Pattern patternMaxId = Pattern.compile("max_id=([0-9a-zA-Z]{1,}).*");
@ -1388,7 +1390,7 @@ public class HttpsConnection {
}
}
}else if (entry.toString().startsWith("Min-Id") || entry.toString().startsWith("min-id")) {
} else if (entry.toString().startsWith("Min-Id") || entry.toString().startsWith("min-id")) {
Pattern patternMaxId = Pattern.compile("min-id=\\[([0-9a-zA-Z]{1,}).*\\]");
Matcher matcherMaxId = patternMaxId.matcher(entry.toString());
if (matcherMaxId.find()) {
@ -1421,7 +1423,7 @@ public class HttpsConnection {
}
}
}else if (entry.toString().startsWith("Min-Id") || entry.toString().startsWith("min-id")) {
} else if (entry.toString().startsWith("Min-Id") || entry.toString().startsWith("min-id")) {
Pattern patternMaxId = Pattern.compile("min-id=\\[([0-9a-zA-Z]{1,}).*\\]");
Matcher matcherMaxId = patternMaxId.matcher(entry.toString());
if (matcherMaxId.find()) {

16
app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
View File

@ -344,7 +344,7 @@ public class PeertubeAPI {
e.printStackTrace();
}
ArrayList<String> resolutions = new ArrayList<>();
if( resobj.has("streamingPlaylists") && resobj.getJSONArray("streamingPlaylists").length() > 0){
if (resobj.has("streamingPlaylists") && resobj.getJSONArray("streamingPlaylists").length() > 0) {
JSONArray files = resobj.getJSONArray("streamingPlaylists").getJSONObject(0).getJSONArray("files");
for (int j = 0; j < files.length(); j++) {
@ -353,7 +353,7 @@ public class PeertubeAPI {
}
peertube.setResolution(resolutions);
peertube.setStreamService(true);
}else {
} else {
JSONArray files = resobj.getJSONArray("files");
for (int j = 0; j < files.length(); j++) {
JSONObject attObj = files.getJSONObject(j);
@ -413,11 +413,14 @@ public class PeertubeAPI {
type.put(resobj.getJSONObject("type").getInt("id"), resobj.getJSONObject("type").get("label").toString());
playlist.setType(type);
playlist.setPrivacy(privacy);
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
try {
playlist.setUpdatedAt(Helper.stringToDate(context, resobj.getString("updatedAt")));
} catch (Exception ignored) {}
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
} catch (Exception ignored) {
}
return playlist;
}
@ -692,7 +695,7 @@ public class PeertubeAPI {
e1.printStackTrace();
setError(e.getStatusCode(), e);
}
}else{
} else {
setError(e.getStatusCode(), e);
}
e.printStackTrace();
@ -1142,7 +1145,6 @@ public class PeertubeAPI {
}
/**
* Retrieves home timeline for the account *synchronously*
*

279
app/src/main/java/app/fedilab/android/client/PixelfedAPI.java
View File

@ -28,7 +28,6 @@ import app.fedilab.android.client.Entities.Attachment;
import app.fedilab.android.client.Entities.Error;
import app.fedilab.android.client.Entities.PixelFedStory;
import app.fedilab.android.client.Entities.PixelFedStoryItem;
import app.fedilab.android.client.Entities.PollOptions;
import app.fedilab.android.client.Entities.Status;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.sqlite.AccountDAO;
@ -77,147 +76,6 @@ public class PixelfedAPI {
APIError = null;
}
/**
* Retrieves Pixelfed Own Stories *synchronously*
*
* @return APIResponse
*/
public APIResponse getMyStories() {
pixelFedStories = new ArrayList<>();
PixelFedStory pixelFedStory;
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.get(getAbsoluteUrl("/me"), 10, null, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
pixelFedStory = parseStory(new JSONObject(response));
pixelFedStories.add(pixelFedStory);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
e.printStackTrace();
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
if (apiResponse == null)
apiResponse = new APIResponse();
apiResponse.setPixelFedStories(pixelFedStories);
return apiResponse;
}
/**
* Retrieves Pixelfed Own Stories *synchronously*
*
* @return APIResponse
*/
public APIResponse getFriendStories(String max_id) {
pixelFedStories = new ArrayList<>();
HashMap<String, String> params = new HashMap<>();
if (max_id != null)
params.put("max_id", max_id);
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.get(getAbsoluteUrl("/recent"), 10, params, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
pixelFedStories = parseStories(new JSONArray(response));
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
e.printStackTrace();
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
if (apiResponse == null)
apiResponse = new APIResponse();
apiResponse.setPixelFedStories(pixelFedStories);
return apiResponse;
}
/**
* Posts a story
*
* @param status Status object related to the status
* @return APIResponse
*/
public APIResponse postStory(Status status) {
JsonObject jsonObject = new JsonObject();
if (status.getMedia_attachments() != null && status.getMedia_attachments().size() > 0) {
JsonArray mediaArray = new JsonArray();
for (Attachment attachment : status.getMedia_attachments())
mediaArray.add(attachment.getId());
jsonObject.add("media_ids", mediaArray);
}
ArrayList<PixelFedStory> statuses = new ArrayList<>();
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.postJson(getAbsoluteUrl("/add"), 30, jsonObject, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
PixelFedStory statusreturned = parseStory(new JSONObject(response));
statuses.add(statusreturned);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
e.printStackTrace();
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
apiResponse.setPixelFedStories(statuses);
return apiResponse;
}
/**
* Retrieves an item from its ID
*
* @return APIResponse
*/
public APIResponse getStoryItem(String id) {
pixelFedStoryItems = new ArrayList<>();
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.get(getAbsoluteUrl(String.format("/item/%s", id)), 10, null, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
PixelFedStoryItem pixelFedStoryItem = parseStoryItem(new JSONObject(response));
pixelFedStoryItems.add(pixelFedStoryItem);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
if (apiResponse == null)
apiResponse = new APIResponse();
apiResponse.setPixelFedStoryItems(pixelFedStoryItems);
return apiResponse;
}
/**
* Delete a Pixelfed Story *synchronously*
*
* @return APIResponse
*/
public int deleteStory(String id) {
HashMap<String, String> params = new HashMap<>();
params.put("id", id);
HttpsConnection httpsConnection;
try {
httpsConnection = new HttpsConnection(context, this.instance);
httpsConnection.delete(getAbsoluteUrl("/delete"), 10, params, prefKeyOauthTokenT);
actionCode = httpsConnection.getActionCode();
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException | IOException | KeyManagementException e) {
e.printStackTrace();
}
return actionCode;
}
/**
* Parse json response for several stories
*
@ -242,8 +100,6 @@ public class PixelfedAPI {
return pixelFedStories;
}
/**
* Parse a single item for stories
*
@ -313,7 +169,140 @@ public class PixelfedAPI {
return pixelFedStoryItem;
}
/**
* Retrieves Pixelfed Own Stories *synchronously*
*
* @return APIResponse
*/
public APIResponse getMyStories() {
pixelFedStories = new ArrayList<>();
PixelFedStory pixelFedStory;
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.get(getAbsoluteUrl("/me"), 10, null, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
pixelFedStory = parseStory(new JSONObject(response));
pixelFedStories.add(pixelFedStory);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
e.printStackTrace();
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
if (apiResponse == null)
apiResponse = new APIResponse();
apiResponse.setPixelFedStories(pixelFedStories);
return apiResponse;
}
/**
* Retrieves Pixelfed Own Stories *synchronously*
*
* @return APIResponse
*/
public APIResponse getFriendStories(String max_id) {
pixelFedStories = new ArrayList<>();
HashMap<String, String> params = new HashMap<>();
if (max_id != null)
params.put("max_id", max_id);
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.get(getAbsoluteUrl("/recent"), 10, params, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
pixelFedStories = parseStories(new JSONArray(response));
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
e.printStackTrace();
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
if (apiResponse == null)
apiResponse = new APIResponse();
apiResponse.setPixelFedStories(pixelFedStories);
return apiResponse;
}
/**
* Posts a story
*
* @param status Status object related to the status
* @return APIResponse
*/
public APIResponse postStory(Status status) {
JsonObject jsonObject = new JsonObject();
if (status.getMedia_attachments() != null && status.getMedia_attachments().size() > 0) {
JsonArray mediaArray = new JsonArray();
for (Attachment attachment : status.getMedia_attachments())
mediaArray.add(attachment.getId());
jsonObject.add("media_ids", mediaArray);
}
ArrayList<PixelFedStory> statuses = new ArrayList<>();
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.postJson(getAbsoluteUrl("/add"), 30, jsonObject, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
PixelFedStory statusreturned = parseStory(new JSONObject(response));
statuses.add(statusreturned);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
e.printStackTrace();
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
apiResponse.setPixelFedStories(statuses);
return apiResponse;
}
/**
* Retrieves an item from its ID
*
* @return APIResponse
*/
public APIResponse getStoryItem(String id) {
pixelFedStoryItems = new ArrayList<>();
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.get(getAbsoluteUrl(String.format("/item/%s", id)), 10, null, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
PixelFedStoryItem pixelFedStoryItem = parseStoryItem(new JSONObject(response));
pixelFedStoryItems.add(pixelFedStoryItem);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
if (apiResponse == null)
apiResponse = new APIResponse();
apiResponse.setPixelFedStoryItems(pixelFedStoryItems);
return apiResponse;
}
/**
* Delete a Pixelfed Story *synchronously*
*
* @return APIResponse
*/
public int deleteStory(String id) {
HashMap<String, String> params = new HashMap<>();
params.put("id", id);
HttpsConnection httpsConnection;
try {
httpsConnection = new HttpsConnection(context, this.instance);
httpsConnection.delete(getAbsoluteUrl("/delete"), 10, params, prefKeyOauthTokenT);
actionCode = httpsConnection.getActionCode();
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException | IOException | KeyManagementException e) {
e.printStackTrace();
}
return actionCode;
}
/**
* Set the error message
@ -354,8 +343,6 @@ public class PixelfedAPI {
}
public Error getError() {
return APIError;
}

1
app/src/main/java/app/fedilab/android/client/Tls12SocketFactory.java
View File

@ -3,7 +3,6 @@ package app.fedilab.android.client;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;

4
app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java
View File

@ -132,13 +132,13 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction
//Profile picture
if (account.getAvatar().startsWith("http")) {
if( !((Activity)context).isFinishing() && !((Activity)context).isDestroyed()) {
if (!((Activity) context).isFinishing() && !((Activity) context).isDestroyed()) {
Glide.with(context)
.load(account.getAvatar())
.into(holder.account_pp);
}
} else if (account.getSocial() != null && account.getSocial().contains("OPENCOLLECTIVE")) {
if( !((Activity)context).isFinishing() && !((Activity)context).isDestroyed()) {
if (!((Activity) context).isFinishing() && !((Activity) context).isDestroyed()) {
Glide.with(context)
.load(R.drawable.missing)
.into(holder.account_pp);

2
app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java
View File

@ -83,7 +83,7 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement
holder.btn_authorize.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.green_1), PorterDuff.Mode.MULTIPLY);
holder.btn_reject.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.red_1), PorterDuff.Mode.MULTIPLY);
//TODO: check if Friendica has a way to accept/deny follow requests
if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
holder.btn_authorize.setVisibility(View.GONE);
holder.btn_reject.setVisibility(View.GONE);
}

2
app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java
View File

@ -96,7 +96,7 @@ public class AccountsListAdapter extends RecyclerView.Adapter implements OnPostA
API.StatusAction doAction = null;
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA|| MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED) {
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED) {
holder.account_mute_notification.hide();
if (action == RetrieveAccountsAsyncTask.Type.BLOCKED)
account.setFollowType(Account.followAction.BLOCK);

3
app/src/main/java/app/fedilab/android/drawers/AccountsReplyAdapter.java
View File

@ -101,7 +101,8 @@ public class AccountsReplyAdapter extends BaseAdapter {
try {
((TootActivity) activityWeakReference.get()).changeAccountReply(isChecked, "@" + account.getAcct());
checked[position] = isChecked;
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
});
holder.checkbox.setChecked(checked[position]);
holder.account_dn.setText(String.format("@%s", account.getAcct()));

52
app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
View File

@ -85,37 +85,37 @@ public class CustomEmojiAdapter extends BaseAdapter {
//if (!emoji.isDrawableFound()) {
emoji.setDrawableFound(true);
Glide.with(parent.getContext())
.asFile()
.load(emoji.getUrl())
.thumbnail(0.1f)
.into(new SimpleTarget<File>() {
@Override
public void onResourceReady(@NonNull File resourceFile, @Nullable Transition<? super File> transition) {
Drawable resource;
SharedPreferences sharedpreferences = parent.getContext().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
if (!disableAnimatedEmoji) {
if (GifParser.isGif(resourceFile.getAbsolutePath())) {
resource = GifDrawable.fromFile(resourceFile.getAbsolutePath());
emoji.setDrawable(resource);
} else if (APNGParser.isAPNG(resourceFile.getAbsolutePath())) {
resource = APNGDrawable.fromFile(resourceFile.getAbsolutePath());
emoji.setDrawable(resource);
} else {
resource = Drawable.createFromPath(resourceFile.getAbsolutePath());
emoji.setDrawable(resource);
}
emoji.setDrawableFound(true);
Glide.with(parent.getContext())
.asFile()
.load(emoji.getUrl())
.thumbnail(0.1f)
.into(new SimpleTarget<File>() {
@Override
public void onResourceReady(@NonNull File resourceFile, @Nullable Transition<? super File> transition) {
Drawable resource;
SharedPreferences sharedpreferences = parent.getContext().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
if (!disableAnimatedEmoji) {
if (GifParser.isGif(resourceFile.getAbsolutePath())) {
resource = GifDrawable.fromFile(resourceFile.getAbsolutePath());
emoji.setDrawable(resource);
} else if (APNGParser.isAPNG(resourceFile.getAbsolutePath())) {
resource = APNGDrawable.fromFile(resourceFile.getAbsolutePath());
emoji.setDrawable(resource);
} else {
resource = Drawable.createFromPath(resourceFile.getAbsolutePath());
emoji.setDrawable(resource);
}
imageView.setImageDrawable(emoji.getDrawable());
} else {
resource = Drawable.createFromPath(resourceFile.getAbsolutePath());
emoji.setDrawable(resource);
}
});
// }
imageView.setImageDrawable(emoji.getDrawable());
}
});
// }
return convertView;
}
}

7
app/src/main/java/app/fedilab/android/drawers/IdentityProofsAdapter.java
View File

@ -18,11 +18,14 @@ import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.constraintlayout.widget.ConstraintLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.RecyclerView;
import java.util.List;
import app.fedilab.android.R;
import app.fedilab.android.client.Entities.IdentityProof;
import app.fedilab.android.helper.Helper;
@ -59,7 +62,7 @@ public class IdentityProofsAdapter extends RecyclerView.Adapter {
final IdentityProof identityProof = getItem(i);
holder.proof_name.setText(String.format("@%s", identityProof.getProvider_username()));
holder.proof_name.setOnClickListener(v -> Helper.openBrowser(context, identityProof.getProfile_url()));
holder.proof_name_network.setText(context.getString(R.string.verified_by, identityProof.getProvider(),Helper.shortDateToString(identityProof.getUpdated_at())));
holder.proof_name_network.setText(context.getString(R.string.verified_by, identityProof.getProvider(), Helper.shortDateToString(identityProof.getUpdated_at())));
holder.proof_container.setOnClickListener(v -> Helper.openBrowser(context, identityProof.getProfile_url()));
holder.proof_name_network.setOnClickListener(v -> Helper.openBrowser(context, identityProof.getProof_url()));
}

29
app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
View File

@ -233,7 +233,6 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, iconColor);
holder.status_reply_count.setTextColor(iconColor);
holder.status_favorite_count.setTextColor(iconColor);
holder.status_reblog_count.setTextColor(iconColor);
@ -341,15 +340,15 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
}
holder.notification_type.setCompoundDrawables(imgH, null, null, null);
holder.status_privacy.getLayoutParams().height = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100), context);
holder.status_privacy.getLayoutParams().width = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent)/ 100), context);
holder.status_reply.getLayoutParams().height = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent)/ 100), context);
holder.status_reply.getLayoutParams().width = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100), context);
holder.status_spoiler.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.status_privacy.getLayoutParams().height = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_privacy.getLayoutParams().width = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_reply.getLayoutParams().height = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_reply.getLayoutParams().width = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_spoiler.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
holder.notification_status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.notification_type.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.status_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(12 * textSizePercent)/ 100);
holder.notification_status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
holder.notification_type.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
holder.status_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (12 * textSizePercent) / 100);
int theme_text_header_1_line = prefs.getInt("theme_text_header_1_line", -1);
if (theme_text_header_1_line == -1) {
theme_text_header_1_line = ThemeHelper.getAttColor(context, R.attr.textColor);
@ -366,11 +365,11 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
holder.spark_button_reblog.setInActiveImageTintColor(iconColor);
holder.spark_button_fav.setColors(R.color.marked_icon, R.color.marked_icon);
holder.spark_button_fav.setImageSize((int) (20 * iconSizePercent / 100 * scale + 0.5f));
holder.spark_button_fav.setMinimumWidth((int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100 * scale + 0.5f), context));
holder.spark_button_fav.setMinimumWidth((int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100 * scale + 0.5f), context));
holder.spark_button_reblog.setColors(R.color.boost_icon, R.color.boost_icon);
holder.spark_button_reblog.setImageSize((int) (20 * iconSizePercent / 100 * scale + 0.5f));
holder.spark_button_reblog.setMinimumWidth((int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100 * scale + 0.5f), context));
holder.spark_button_reblog.setMinimumWidth((int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100 * scale + 0.5f), context));
final Status status = notification.getStatus();
if (status != null) {
@ -394,7 +393,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
holder.status_privacy.setOnClickListener(view -> {
String v = status.getVisibility();
holder.status_privacy.setContentDescription(context.getString(R.string.toot_visibility_tilte) + ": " + v);
holder.status_privacy.setContentDescription(context.getString(R.string.toot_visibility_tilte) + ": " + v);
});
holder.notification_status_content.setText(status.getContentSpan(), TextView.BufferType.SPANNABLE);
holder.status_spoiler.setText(status.getContentSpanCW(), TextView.BufferType.SPANNABLE);
@ -534,7 +533,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
}
if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON ) {
if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
holder.rated.setVisibility(View.GONE);
holder.poll_container.setVisibility(View.GONE);
holder.multiple_choice.setVisibility(View.GONE);
@ -633,9 +632,9 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
holder.refresh_poll.setOnClickListener(v -> new ManagePollAsyncTask(context, ManagePollAsyncTask.type_s.REFRESH, status, null, NotificationsListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR));
holder.poll_container.setVisibility(View.VISIBLE);
holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_voters, status.getPoll().getVoters_count(), status.getPoll().getVoters_count()));
if( poll.isExpired()){
if (poll.isExpired()) {
holder.remaining_time.setText(context.getString(R.string.poll_finish_at, Helper.dateToStringPoll(poll.getExpires_at())));
}else{
} else {
holder.remaining_time.setText(context.getString(R.string.poll_finish_in, Helper.dateDiffPoll(context, poll.getExpires_at())));
}
} else {

1
app/src/main/java/app/fedilab/android/drawers/PeertubeNotificationsListAdapter.java
View File

@ -191,7 +191,6 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter {
}
static class ViewHolder extends RecyclerView.ViewHolder {
ImageView peertube_notif_pp;

2
app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java
View File

@ -1032,7 +1032,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
if (trans == Helper.TRANS_DEEPL) {
et = MyTransL.translatorEngine.DEEPL;
}else if (trans == Helper.TRANS_SYSTRAN) {
} else if (trans == Helper.TRANS_SYSTRAN) {
et = MyTransL.translatorEngine.SYSTRAN;
}
final MyTransL myTransL = MyTransL.getInstance(et);

73
app/src/main/java/app/fedilab/android/drawers/PixelfedStoriesListAdapter.java
View File

@ -52,16 +52,15 @@ import app.fedilab.android.client.Entities.PixelFedStoryItem;
import app.fedilab.android.helper.Helper;
/**
* Created by Thomas on 02/11/2019.
* Adapter for pixelfed stories drawer
*/
public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
private static final int DISPLAYED_STATUS = 1;
private Context context;
private List<PixelFedStory> stories;
private static final int DISPLAYED_STATUS = 1;
private ArrayList<Attachment> attachments;
public PixelfedStoriesListAdapter(List<PixelFedStory> stories) {
@ -70,8 +69,6 @@ public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
}
@Override
public long getItemId(int position) {
return position;
@ -82,30 +79,6 @@ public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
return stories.size();
}
private static class ViewHolderPixelfed extends RecyclerView.ViewHolder {
SliderView imageSlider;
ImageView art_media, art_media_play, pf_pp;
SparkButton pf_share;
TextView pf_username, pf_date;
CardView pf_cardview;
ViewHolderPixelfed(View itemView) {
super(itemView);
art_media = itemView.findViewById(R.id.art_media);
art_media_play = itemView.findViewById(R.id.art_media_play);
imageSlider = itemView.findViewById(R.id.imageSlider);
pf_pp = itemView.findViewById(R.id.pf_pp);
pf_username = itemView.findViewById(R.id.pf_username);
pf_date = itemView.findViewById(R.id.pf_date);
pf_share = itemView.findViewById(R.id.pf_share);
pf_cardview = itemView.findViewById(R.id.pf_cardview);
}
}
public PixelFedStory getItem(int position) {
if (stories.size() > position && position >= 0)
return stories.get(position);
@ -125,7 +98,6 @@ public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
return new ViewHolderPixelfed(layoutInflater.inflate(R.layout.drawer_pixelfed_story, parent, false));
}
@SuppressLint("SetJavaScriptEnabled")
@Override
public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder, int i) {
@ -136,12 +108,12 @@ public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
attachments = new ArrayList<>();
for(PixelFedStoryItem pixelFedStoryItem: pixelFedStory.getPixelFedStoryItems()){
for (PixelFedStoryItem pixelFedStoryItem : pixelFedStory.getPixelFedStoryItems()) {
Attachment attachment = new Attachment();
if( pixelFedStoryItem.getPreview() != null){
if (pixelFedStoryItem.getPreview() != null) {
attachment.setPreview_url(pixelFedStoryItem.getPreview());
}else{
} else {
attachment.setPreview_url(pixelFedStoryItem.getSrc());
}
attachment.setUrl(pixelFedStoryItem.getSrc());
@ -157,7 +129,6 @@ public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
.into(holder.pf_pp);
holder.art_media.setOnClickListener(v -> {
Intent intent = new Intent(context, SlideMediaActivity.class);
Bundle b = new Bundle();
@ -168,27 +139,25 @@ public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
});
holder.art_media_play.setVisibility(View.GONE);
if (attachments != null && attachments.size() > 1){
SliderAdapter sliderAdapter = new SliderAdapter(new WeakReference<>((Activity)context), false, attachments);
if (attachments != null && attachments.size() > 1) {
SliderAdapter sliderAdapter = new SliderAdapter(new WeakReference<>((Activity) context), false, attachments);
holder.imageSlider.setSliderAdapter(sliderAdapter);
holder.imageSlider.setIndicatorAnimation(IndicatorAnimations.WORM);
holder.imageSlider.setSliderTransformAnimation(SliderAnimations.SIMPLETRANSFORMATION);
holder.art_media.setVisibility(View.GONE);
holder.imageSlider.setVisibility(View.VISIBLE);
}else if(attachments != null ){
} else if (attachments != null) {
holder.art_media.setVisibility(View.VISIBLE);
holder.imageSlider.setVisibility(View.GONE);
if( attachments.get(0).getType().toLowerCase().equals("video")){
if (attachments.get(0).getType().toLowerCase().equals("video")) {
holder.art_media_play.setVisibility(View.VISIBLE);
}
String url;
if(attachments.get(0).getPreview_url().endsWith("no-preview.png") ){
if (attachments.get(0).getPreview_url().endsWith("no-preview.png")) {
url = attachments.get(0).getUrl();
}else{
} else {
url = attachments.get(0).getPreview_url();
}
Glide.with(holder.itemView.getContext())
@ -199,7 +168,6 @@ public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
}
holder.pf_date.setText(Helper.longDateToString(pixelFedStory.getLastUpdated()));
@ -223,4 +191,25 @@ public class PixelfedStoriesListAdapter extends RecyclerView.Adapter {
}
private static class ViewHolderPixelfed extends RecyclerView.ViewHolder {
SliderView imageSlider;
ImageView art_media, art_media_play, pf_pp;
SparkButton pf_share;
TextView pf_username, pf_date;
CardView pf_cardview;
ViewHolderPixelfed(View itemView) {
super(itemView);
art_media = itemView.findViewById(R.id.art_media);
art_media_play = itemView.findViewById(R.id.art_media_play);
imageSlider = itemView.findViewById(R.id.imageSlider);
pf_pp = itemView.findViewById(R.id.pf_pp);
pf_username = itemView.findViewById(R.id.pf_username);
pf_date = itemView.findViewById(R.id.pf_date);
pf_share = itemView.findViewById(R.id.pf_share);
pf_cardview = itemView.findViewById(R.id.pf_cardview);
}
}
}

1
app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java
View File

@ -16,7 +16,6 @@ package app.fedilab.android.drawers;
import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Bitmap;

114
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -190,11 +190,11 @@ import static app.fedilab.android.activities.BaseMainActivity.social;
*/
public class StatusListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveFeedsInterface, OnRetrieveImageInterface, OnRetrieveEmojiInterface, OnRetrieveRepliesInterface, OnRetrieveCardInterface, OnPollInterface, OnRefreshCachedStatusInterface, OnRetrieveSearcAccountshInterface, OnRetrieveSearchInterface, OnPostStatusActionInterface, OnRetrieveRelationshipQuickReplyInterface {
private static final int HIDDEN_STATUS = 0;
public static final int DISPLAYED_STATUS = 1;
private static final int FOCUSED_STATUS = 2;
public static final int COMPACT_STATUS = 3;
public static final int CONSOLE_STATUS = 4;
private static final int HIDDEN_STATUS = 0;
private static final int FOCUSED_STATUS = 2;
public static boolean fetch_all_more = false;
private final Object lock = new Object();
private Context context;
@ -222,27 +222,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
private List<Emojis> emojisPicker;
private Status statusForQuickReply;
private String instanceType;
public StatusListAdapter(StatusDrawerParams statusDrawerParams){
statuses = statusDrawerParams.getStatuses();
isOnWifi = statusDrawerParams.isOnWifi();
statusListAdapter = this;
type = statusDrawerParams.getType();
targetedId = statusDrawerParams.getTargetedId();
tagTimeline = statusDrawerParams.getTagTimeline();
conversationPosition = statusDrawerParams.getPosition();
redraft = false;
lstHolders = new ArrayList<>();
toot_content = null;
toot_cw_content = null;
tootReply = null;
currentToId = -1;
instanceType = statusDrawerParams.getInstanceType();
}
private Runnable updateAnimatedEmoji = new Runnable() {
@Override
public void run() {
@ -263,9 +242,25 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
}
};
private Handler mHandler = new Handler();
public StatusListAdapter(StatusDrawerParams statusDrawerParams) {
statuses = statusDrawerParams.getStatuses();
isOnWifi = statusDrawerParams.isOnWifi();
statusListAdapter = this;
type = statusDrawerParams.getType();
targetedId = statusDrawerParams.getTargetedId();
tagTimeline = statusDrawerParams.getTagTimeline();
conversationPosition = statusDrawerParams.getPosition();
redraft = false;
lstHolders = new ArrayList<>();
toot_content = null;
toot_cw_content = null;
tootReply = null;
currentToId = -1;
instanceType = statusDrawerParams.getInstanceType();
}
@Override
public void onAttachedToRecyclerView(@NotNull RecyclerView recyclerView) {
super.onAttachedToRecyclerView(recyclerView);
@ -578,9 +573,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if (social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED && type == RetrieveFeedsAsyncTask.Type.CONTEXT) {
return COMPACT_STATUS;
} else {
if( instanceType == null || instanceType.compareTo("NITTER") != 0 ) {
if (instanceType == null || instanceType.compareTo("NITTER") != 0) {
return statuses.get(position).getViewType();
}else{
} else {
return COMPACT_STATUS;
}
}
@ -636,7 +631,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_privacy.setOnClickListener(view -> {
String v = status.getVisibility();
holder.status_privacy.setContentDescription(context.getString(R.string.toot_visibility_tilte)+": " + v);
holder.status_privacy.setContentDescription(context.getString(R.string.toot_visibility_tilte) + ": " + v);
});
if (type == RetrieveFeedsAsyncTask.Type.CONTEXT && holder.status_reply_indicator_top != null) {
@ -845,9 +840,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.refresh_poll.setOnClickListener(v -> new ManagePollAsyncTask(context, ManagePollAsyncTask.type_s.REFRESH, status, null, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR));
holder.poll_container.setVisibility(View.VISIBLE);
holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_voters, poll.getVoters_count(), poll.getVoters_count()));
if( poll.isExpired()){
if (poll.isExpired()) {
holder.remaining_time.setText(context.getString(R.string.poll_finish_at, Helper.dateToStringPoll(poll.getExpires_at())));
}else{
} else {
holder.remaining_time.setText(context.getString(R.string.poll_finish_in, Helper.dateDiffPoll(context, poll.getExpires_at())));
}
} else {
@ -958,29 +953,29 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.new_element.setVisibility(View.GONE);
holder.status_reply.getLayoutParams().height = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100), context);
holder.status_reply.getLayoutParams().width = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100), context);
holder.status_more.getLayoutParams().height = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100), context);
holder.status_more.getLayoutParams().width = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100), context);
holder.status_privacy.getLayoutParams().height = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100), context);
holder.status_privacy.getLayoutParams().width = (int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100), context);
holder.status_reply.getLayoutParams().height = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_reply.getLayoutParams().width = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_more.getLayoutParams().height = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_more.getLayoutParams().width = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_privacy.getLayoutParams().height = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
holder.status_privacy.getLayoutParams().width = (int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100), context);
if (getItemViewType(viewHolder.getAdapterPosition()) == FOCUSED_STATUS) {
holder.status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(16 * textSizePercent) / 100);
holder.status_account_displayname.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(16 * textSizePercent) / 100);
holder.status_account_username.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.status_toot_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.status_content_translated.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(16 * textSizePercent) / 100);
holder.status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (16 * textSizePercent) / 100);
holder.status_account_displayname.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (16 * textSizePercent) / 100);
holder.status_account_username.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
holder.status_toot_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
holder.status_content_translated.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (16 * textSizePercent) / 100);
} else {
holder.status_account_displayname.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.status_account_username.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(12 * textSizePercent) / 100);
holder.status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.status_toot_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(12 * textSizePercent) / 100);
holder.status_content_translated.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.status_account_displayname.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
holder.status_account_username.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (12 * textSizePercent) / 100);
holder.status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
holder.status_toot_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (12 * textSizePercent) / 100);
holder.status_content_translated.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
}
holder.status_spoiler.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float)(14 * textSizePercent) / 100);
holder.status_spoiler.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) (14 * textSizePercent) / 100);
switch (translator) {
case Helper.TRANS_NONE:
@ -1043,7 +1038,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_account_displayname.setTextColor(theme_text_header_2_line);
holder.status_toot_date.setTextColor(theme_text_header_2_line);
if( holder.status_boosted_date != null ) {
if (holder.status_boosted_date != null) {
holder.status_boosted_date.setTextColor(theme_text_header_2_line);
}
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot, theme_text_header_2_line);
@ -1056,7 +1051,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
Helper.changeDrawableColor(context, holder.cached_status, theme_text_header_1_line);
if (holder.cached_status != null && holder.getItemViewType() == DISPLAYED_STATUS) {
if (status.iscached()) {
holder.cached_status.setVisibility(View.VISIBLE);
@ -1178,16 +1172,16 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.spark_button_reblog.setColors(R.color.boost_icon, R.color.boost_icon);
holder.spark_button_reblog.setImageSize((int) (20 * iconSizePercent / 100 * scale + 0.5f));
holder.spark_button_reblog.setMinimumWidth((int) Helper.convertDpToPixel(((float)(20 * iconSizePercent) / 100 * scale + 0.5f), context));
holder.spark_button_reblog.setMinimumWidth((int) Helper.convertDpToPixel(((float) (20 * iconSizePercent) / 100 * scale + 0.5f), context));
Drawable imgConversation = null;
if( social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
if (social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
if (type != RetrieveFeedsAsyncTask.Type.CONTEXT && ((status.getIn_reply_to_account_id() != null && status.getIn_reply_to_account_id().equals(status.getAccount().getId()))
|| (status.getReblog() != null && status.getReblog().getIn_reply_to_account_id() != null && status.getReblog().getIn_reply_to_account_id().equals(status.getReblog().getAccount().getId())))) {
imgConversation = ContextCompat.getDrawable(context, R.drawable.ic_conversation);
imgConversation.setBounds(0, 0, (int) (15 * iconSizePercent / 100 * scale + 0.5f), (int) (15 * iconSizePercent / 100 * scale + 0.5f));
}
}else {
} else {
if (type != RetrieveFeedsAsyncTask.Type.CONTEXT && status.getIn_reply_to_id() != null) {
imgConversation = ContextCompat.getDrawable(context, R.drawable.ic_conversation);
imgConversation.setBounds(0, 0, (int) (15 * iconSizePercent / 100 * scale + 0.5f), (int) (15 * iconSizePercent / 100 * scale + 0.5f));
@ -1230,12 +1224,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
if (instanceType != null && instanceType.compareTo("NITTER") == 0) {
holder.status_action_container.setVisibility(View.GONE);
if( holder.status_action_container_twitter != null){
if (holder.status_action_container_twitter != null) {
holder.status_action_container_twitter.setVisibility(View.VISIBLE);
holder.status_action_container_twitter.setOnClickListener(v -> {
Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
String url = status.getUrl();
String url = status.getUrl();
String extra_text;
extra_text = (status.getReblog() != null) ? status.getReblog().getAccount().getAcct() : status.getAccount().getAcct();
@ -1277,7 +1271,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
});
//Click on a conversation
if (( instanceType == null || instanceType.compareTo("NITTER") != 0) && (getItemViewType(viewHolder.getAdapterPosition()) == DISPLAYED_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == COMPACT_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == CONSOLE_STATUS)) {
if ((instanceType == null || instanceType.compareTo("NITTER") != 0) && (getItemViewType(viewHolder.getAdapterPosition()) == DISPLAYED_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == COMPACT_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == CONSOLE_STATUS)) {
holder.status_spoiler.setOnClickListener(v -> {
if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS) {
@ -2184,7 +2178,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_cardview.setVisibility(View.GONE);
holder.status_cardview_video.setVisibility(View.VISIBLE);
String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
if( user_agent != null) {
if (user_agent != null) {
holder.status_cardview_webview.getSettings().setUserAgentString(user_agent);
}
holder.status_cardview_webview.getSettings().setJavaScriptEnabled(true);
@ -2951,7 +2945,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
});
} else if( instanceType == null || instanceType.compareTo("NITTER") != 0){
} else if (instanceType == null || instanceType.compareTo("NITTER") != 0) {
holder.status_account_profile.setOnClickListener(v -> {
if (status.getReblog() != null) {
@ -3038,8 +3032,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_horizontal_document_container.setVisibility(View.VISIBLE);
else
holder.status_document_container.setVisibility(View.VISIBLE);
if (attachments.size() == 1 ) {
if ((status.getCard() == null || status.getCard().getType().compareTo("video") != 0|| status.getCard().getImage() == null)) {
if (attachments.size() == 1) {
if ((status.getCard() == null || status.getCard().getType().compareTo("video") != 0 || status.getCard().getImage() == null)) {
if (!fullAttachement)
holder.status_container2.setVisibility(View.GONE);
else {
@ -3055,7 +3049,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
else
holder.status_document_container.setVisibility(View.GONE);
}
}else {
} else {
if (fullAttachement)
holder.status_horizontal_document_container.setVisibility(View.GONE);
else
@ -3615,7 +3609,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
toot.setSpoiler_text(toot_cw_content.getText().toString().trim());
toot.setVisibility(status.getQuickReplyPrivacy());
toot.setIn_reply_to_id(in_reply_to_status);
if( content == null) {
if (content == null) {
content = status.getQuickReplyContent();
}
toot.setContent(context, content);

9
app/src/main/java/app/fedilab/android/drawers/TrendsAdapter.java
View File

@ -28,7 +28,6 @@ import androidx.core.content.ContextCompat;
import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.components.Description;
import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData;
@ -45,7 +44,6 @@ import app.fedilab.android.R;
import app.fedilab.android.activities.HashTagActivity;
import app.fedilab.android.client.Entities.Trends;
import app.fedilab.android.client.Entities.TrendsHistory;
import app.fedilab.android.helper.Helper;
/**
@ -106,9 +104,9 @@ public class TrendsAdapter extends BaseAdapter {
int uses = 0;
LinkedHashMap<Long, Integer> tendency = new LinkedHashMap<>();
for(TrendsHistory _th : trendsHistory) {
for (TrendsHistory _th : trendsHistory) {
people += _th.getAccounts();
days ++;
days++;
uses += _th.getUses();
tendency.put(_th.getDays(), _th.getUses());
}
@ -134,7 +132,7 @@ public class TrendsAdapter extends BaseAdapter {
trendsEntry.add(0, new Entry((long) pair.getKey(), (int) pair.getValue()));
it.remove();
}
LineDataSet dataTrending = new LineDataSet(trendsEntry,context.getString(R.string.trending));
LineDataSet dataTrending = new LineDataSet(trendsEntry, context.getString(R.string.trending));
dataTrending.setColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
dataTrending.setValueTextColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
dataTrending.setFillColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
@ -162,7 +160,6 @@ public class TrendsAdapter extends BaseAdapter {
}
private static class ViewHolderTag {
LinearLayout trends_container;
TextView tag_name;

8
app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java
View File

@ -176,14 +176,14 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
if (key.compareTo("base_theme") == 0) {
SharedPreferences sharedpreferences = getActivity().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor appEditor = sharedpreferences.edit();
if( value != null && value.matches("-?\\d+")) {
if (value != null && value.matches("-?\\d+")) {
appEditor.putInt(Helper.SET_THEME, Integer.parseInt(value));
}
appEditor.commit();
} else if (key.compareTo("pref_color_navigation_bar") == 0 || key.compareTo("pref_color_status_bar") == 0) {
editor.putBoolean(key, Boolean.parseBoolean(value));
} else {
if( value != null && value.matches("-?\\d+")) {
if (value != null && value.matches("-?\\d+")) {
editor.putInt(key, Integer.parseInt(value));
}
}
@ -248,7 +248,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
PreferenceScreen preferenceScreen = getPreferenceScreen();
FragmentActivity context = getActivity();
assert context != null;
if( preferenceScreen == null){
if (preferenceScreen == null) {
Toasty.error(getActivity(), getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
return;
}
@ -269,7 +269,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
Preference pref_import = findPreference("pref_import");
Preference pref_export = findPreference("pref_export");
Preference reset_pref = findPreference("reset_pref");
if (!sharedpreferences.getBoolean("use_custom_theme", false) ) {
if (!sharedpreferences.getBoolean("use_custom_theme", false)) {
preferenceScreen.removePreference(theme_link_color);
preferenceScreen.removePreference(theme_boost_header_color);
preferenceScreen.removePreference(theme_text_header_1_line);

5
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -923,7 +923,6 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
});
TextView set_user_agent = rootView.findViewById(R.id.set_user_agent);
String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
@ -934,9 +933,11 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
SharedPreferences.Editor editor = sharedpreferences.edit();
@ -1368,7 +1369,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
notification_container.setVisibility(View.VISIBLE);
notification_container.setVisibility(View.VISIBLE);
Helper.startStreaming(context);
}else {
} else {
context.sendBroadcast(new Intent(context, StopLiveNotificationReceiver.class));
context.sendBroadcast(new Intent(context, StopDelayedNotificationReceiver.class));
ApplicationJob.cancelAllJob(NotificationsSyncJob.NOTIFICATION_REFRESH);

2
app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java
View File

@ -36,7 +36,9 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;

27
app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
View File

@ -41,7 +41,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.bumptech.glide.Glide;
import com.bumptech.glide.ListPreloader;
import com.bumptech.glide.RequestBuilder;
@ -143,8 +142,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_status, container, false);
@ -208,7 +205,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
new FixedPreloadSizeProvider(640, 480);
ListPreloader.PreloadModelProvider modelProvider = new MyPreloadModelProvider();
RecyclerViewPreloader preloader =
new RecyclerViewPreloader<>(Glide.with(context), modelProvider, sizeProvider, 20 );
new RecyclerViewPreloader<>(Glide.with(context), modelProvider, sizeProvider, 20);
lv_status.addOnScrollListener(preloader);
mainLoader = rootView.findViewById(R.id.loader);
@ -388,7 +385,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
}
});
}else if(instanceType.equals("PEERTUBE")){
} else if (instanceType.equals("PEERTUBE")) {
swipeRefreshLayout.setOnRefreshListener(() -> {
if (peertubes.size() > 0) {
int size = peertubes.size();
@ -404,7 +401,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
}
}
});
}else {
} else {
swipeRefreshLayout.setOnRefreshListener(() -> {
if (statuses.size() > 0) {
int size = statuses.size();
@ -555,7 +552,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
}
flag_loading = false;
firstLoad = false;
}else if (instanceType.equals("NITTER")) {
} else if (instanceType.equals("NITTER")) {
int previousPosition = this.statuses.size();
//max_id needs to work like an offset
this.statuses.addAll(apiResponse.getStatuses());
@ -647,7 +644,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
}
//Let's deal with statuses
if (statuses != null && statuses.size() > 0) {
if (statusListAdapter != null && (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU"))) {
if (statusListAdapter != null && (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU"))) {
this.statuses.addAll(statuses);
statusListAdapter.notifyItemRangeInserted(previousPosition, statuses.size());
} else if (artListAdapter != null && instanceType.equals("ART")) {
@ -897,7 +894,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
public void scrollToTop() {
if( mLayoutManager != null ) {
if (mLayoutManager != null) {
mLayoutManager.scrollToPositionWithOffset(0, 0);
}
}
@ -1152,7 +1149,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
if (context instanceof BaseMainActivity) {
boolean remember_position_home = sharedpreferences.getBoolean(Helper.SET_REMEMBER_POSITION_HOME, true);
if (remember_position_home)
asyncTask = new RetrieveFeedsAsyncTask(context, type, initialBookMark, true,DisplayStatusFragment.this).execute();
asyncTask = new RetrieveFeedsAsyncTask(context, type, initialBookMark, true, DisplayStatusFragment.this).execute();
else
asyncTask = new RetrieveFeedsAsyncTask(context, type, null, DisplayStatusFragment.this).execute();
}
@ -1179,7 +1176,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
return;
}
if (apiResponse.getError() != null) {
if (!apiResponse.getError().getError().startsWith("404 -")&&!apiResponse.getError().getError().startsWith("501 -"))
if (!apiResponse.getError().getError().startsWith("404 -") && !apiResponse.getError().getError().startsWith("501 -"))
if (apiResponse.getError().getError().length() < 100) {
Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
} else {
@ -1269,18 +1266,18 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
@Override
@NonNull
public List<String> getPreloadItems(int position) {
if( statuses == null || statuses.size() == 0){
if (statuses == null || statuses.size() == 0) {
return Collections.emptyList();
}
Status status = statuses.get(position);
if (status.getMedia_attachments() == null || status.getMedia_attachments().size() ==0) {
if (status.getMedia_attachments() == null || status.getMedia_attachments().size() == 0) {
return Collections.emptyList();
}
List<String> preloaded_urls = new ArrayList<>();
for(Attachment attachment: status.getMedia_attachments()) {
for (Attachment attachment : status.getMedia_attachments()) {
preloaded_urls.add(attachment.getPreview_url());
}
return preloaded_urls;
return preloaded_urls;
}
@Nullable

24
app/src/main/java/app/fedilab/android/fragments/DisplayStoriesFragment.java
View File

@ -48,7 +48,6 @@ import app.fedilab.android.interfaces.OnRetrieveStoriesInterface;
import es.dmoral.toasty.Toasty;
/**
* Created by Thomas on 02/11/2019.
* Fragment to display PixelfFed Stories
@ -56,6 +55,7 @@ import es.dmoral.toasty.Toasty;
public class DisplayStoriesFragment extends Fragment implements OnRetrieveStoriesInterface {
LinearLayoutManager mLayoutManager;
private boolean flag_loading;
private Context context;
private AsyncTask<Void, Void, Void> asyncTask;
@ -67,15 +67,12 @@ public class DisplayStoriesFragment extends Fragment implements OnRetrieveStorie
private SwipeRefreshLayout swipeRefreshLayout;
private boolean swiped;
private RecyclerView lv_stories;
LinearLayoutManager mLayoutManager;
private RetrieveStoriesAsyncTask.type type;
public DisplayStoriesFragment() {
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -113,7 +110,7 @@ public class DisplayStoriesFragment extends Fragment implements OnRetrieveStorie
if (firstVisibleItem + visibleItemCount == totalItemCount && context != null) {
if (!flag_loading) {
flag_loading = true;
asyncTask = new RetrieveStoriesAsyncTask(context, max_id, type,DisplayStoriesFragment.this).execute();
asyncTask = new RetrieveStoriesAsyncTask(context, max_id, type, DisplayStoriesFragment.this).execute();
nextElementLoader.setVisibility(View.VISIBLE);
}
} else {
@ -124,7 +121,6 @@ public class DisplayStoriesFragment extends Fragment implements OnRetrieveStorie
});
swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
@ -134,7 +130,7 @@ public class DisplayStoriesFragment extends Fragment implements OnRetrieveStorie
if (pixelFedStories != null && pixelFedStories.size() > 0)
sinceId = pixelFedStories.get(0).getId();
if (context != null)
asyncTask = new RetrieveStoriesAsyncTask(context, null, type,DisplayStoriesFragment.this).execute();
asyncTask = new RetrieveStoriesAsyncTask(context, null, type, DisplayStoriesFragment.this).execute();
}
});
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@ -160,13 +156,13 @@ public class DisplayStoriesFragment extends Fragment implements OnRetrieveStorie
break;
}
if (context != null)
asyncTask = new RetrieveStoriesAsyncTask(context, max_id, type,DisplayStoriesFragment.this).execute();
asyncTask = new RetrieveStoriesAsyncTask(context, max_id, type, DisplayStoriesFragment.this).execute();
else
new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
@Override
public void run() {
if (context != null)
asyncTask = new RetrieveStoriesAsyncTask(context, max_id, type,DisplayStoriesFragment.this).execute();
asyncTask = new RetrieveStoriesAsyncTask(context, max_id, type, DisplayStoriesFragment.this).execute();
}
}, 500);
return rootView;
@ -180,10 +176,10 @@ public class DisplayStoriesFragment extends Fragment implements OnRetrieveStorie
if (apiResponse.getError() != null) {
if(apiResponse.getError().getError().length() < 100) {
if (apiResponse.getError().getError().length() < 100) {
Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
}else{
Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show();
} else {
Toasty.error(context, getString(R.string.long_api_error, "\ud83d\ude05"), Toast.LENGTH_LONG).show();
}
flag_loading = false;
swipeRefreshLayout.setRefreshing(false);
@ -277,7 +273,7 @@ public class DisplayStoriesFragment extends Fragment implements OnRetrieveStorie
* @param sinceId String
*/
void retrieveMissingNotifications(String sinceId) {
asyncTask = new RetrieveStoriesAsyncTask(context, null, type,DisplayStoriesFragment.this).execute();
asyncTask = new RetrieveStoriesAsyncTask(context, null, type, DisplayStoriesFragment.this).execute();
}
@Override
@ -297,6 +293,4 @@ public class DisplayStoriesFragment extends Fragment implements OnRetrieveStorie
}
}

2
app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
View File

@ -295,7 +295,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
webview_video.getSettings().setDomStorageEnabled(true);
webview_video.getSettings().setAppCacheEnabled(true);
String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
if( user_agent != null) {
if (user_agent != null) {
webview_video.getSettings().setUserAgentString(user_agent);
}
webview_video.getSettings().setMediaPlaybackRequiresUserGesture(false);

2
app/src/main/java/app/fedilab/android/fragments/TabLayoutNotificationsFragment.java
View File

@ -210,7 +210,7 @@ public class TabLayoutNotificationsFragment extends Fragment {
int mNumOfTabs;
private PagerAdapter(FragmentManager fm, int NumOfTabs) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
this.mNumOfTabs = NumOfTabs;
}

2
app/src/main/java/app/fedilab/android/fragments/TabLayoutScheduleFragment.java
View File

@ -86,7 +86,7 @@ public class TabLayoutScheduleFragment extends Fragment {
int mNumOfTabs;
private PagerAdapter(FragmentManager fm, int NumOfTabs) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
this.mNumOfTabs = NumOfTabs;
}

2
app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java
View File

@ -101,7 +101,7 @@ public class TabLayoutTootsFragment extends Fragment {
int mNumOfTabs;
private PagerAdapter(FragmentManager fm, int NumOfTabs) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
this.mNumOfTabs = NumOfTabs;
}

13
app/src/main/java/app/fedilab/android/helper/CrossActions.java
View File

@ -106,7 +106,7 @@ public class CrossActions {
Account tootOwner = status.getAccount();
String mentionAcct = (tootOwner.getAcct().contains("@")) ? tootOwner.getAcct() : tootOwner.getAcct() + "@" + currentAccount.getInstance();
if ((account.getAcct() + "@" + account.getInstance()).equals(mentionAcct) && !addedAccount.contains(account.getId() + "|" + account.getAcct())) {
if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA")|| account.getSocial().equals("FRIENDICA"))
if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA") || account.getSocial().equals("FRIENDICA"))
accounts.add(account);
}
}
@ -341,9 +341,9 @@ public class CrossActions {
url = "https://" + remoteAccount.getInstance() + "/@" + remoteAccount.getAcct();
}
APIResponse apiResponse;
if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
GNUAPI api = new GNUAPI(contextReference.get(), account.getInstance(), account.getToken());
apiResponse = api.search(remoteAccount.getAcct()+"@"+remoteAccount.getInstance());
apiResponse = api.search(remoteAccount.getAcct() + "@" + remoteAccount.getInstance());
} else {
API api = new API(contextReference.get(), account.getInstance(), account.getToken());
apiResponse = api.search2(url, null, null);
@ -426,7 +426,7 @@ public class CrossActions {
protected Void doInBackground(Void... voids) {
APIResponse apiResponse;
if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
GNUAPI api = new GNUAPI(contextReference.get(), account.getInstance(), account.getToken());
apiResponse = api.search2(remoteStatus.getUrl());
} else {
@ -643,7 +643,6 @@ public class CrossActions {
protected Void doInBackground(Void... voids) {
String uri;
if (status.getReblog() != null) {
if (status.getReblog().getUri().startsWith("http"))
@ -656,13 +655,13 @@ public class CrossActions {
else
uri = status.getUrl();
}
if( account.getSocial().compareTo("FRIENDICA") != 0 ) {
if (account.getSocial().compareTo("FRIENDICA") != 0) {
API api = new API(contextReference.get(), account.getInstance(), account.getToken());
APIResponse search = api.search(uri);
if (search != null && search.getResults() != null) {
remoteStatuses = search.getResults().getStatuses();
}
}else{
} else {
GNUAPI api = new GNUAPI(contextReference.get(), account.getInstance(), account.getToken());
APIResponse search = api.search2(uri);
if (search != null && search.getResults() != null) {

60
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -58,7 +58,6 @@ import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Environment;
import android.os.Looper;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.provider.OpenableColumns;
@ -184,7 +183,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.Random;
import java.util.TimeZone;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -2467,9 +2465,9 @@ public class Helper {
public static CustomWebview initializeWebview(Activity activity, int webviewId, View rootView) {
CustomWebview webView;
if( rootView == null) {
if (rootView == null) {
webView = activity.findViewById(webviewId);
}else{
} else {
webView = rootView.findViewById(webviewId);
}
final SharedPreferences sharedpreferences = activity.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@ -2486,7 +2484,7 @@ public class Helper {
webView.getSettings().setSupportMultipleWindows(false);
webView.getSettings().setMediaPlaybackRequiresUserGesture(true);
String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
if( user_agent != null) {
if (user_agent != null) {
webView.getSettings().setUserAgentString(user_agent);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@ -3160,7 +3158,7 @@ public class Helper {
SQLiteDatabase db = Sqlite.getInstance(activity, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
Account account = new AccountDAO(activity, db).getUniqAccount(userID, instance);
if (account != null) {
if( social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA && social != UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
if (social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA && social != UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
if (account.isLocked()) {
if (navigationView.getMenu().findItem(R.id.nav_follow_request) != null)
navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true);
@ -4143,7 +4141,7 @@ public class Helper {
String cleaned_content = original_content;
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean utm_parameters = sharedpreferences.getBoolean(Helper.SET_FILTER_UTM, true);
if( utm_parameters ) {
if (utm_parameters) {
for (String utm : UTM_PARAMS) {
cleaned_content = cleaned_content.replaceAll("&amp;" + utm + "=[0-9a-zA-Z._-]*", "");
cleaned_content = cleaned_content.replaceAll("&" + utm + "=[0-9a-zA-Z._-]*", "");
@ -4258,10 +4256,11 @@ public class Helper {
/**
* Download from Glid cache
*
* @param context
* @param url
*/
public static void manageMove(Context context, String url, boolean share){
public static void manageMove(Context context, String url, boolean share) {
Glide.with(context)
.asFile()
.load(url)
@ -4275,11 +4274,12 @@ public class Helper {
/**
* Notify after moving a file from Glide cache
*
* @param context
* @param url
* @param sourceFile
*/
private static void notifyDownload(Context context, String url, File sourceFile, boolean share){
private static void notifyDownload(Context context, String url, File sourceFile, boolean share) {
final String fileName = URLUtil.guessFileName(url, null, null);
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@ -4289,9 +4289,8 @@ public class Helper {
FileOutputStream fos = null;
FileChannel in = null;
FileChannel out = null;
try
{
File backupFile = new File(targeted_folder+"/"+fileName);
try {
File backupFile = new File(targeted_folder + "/" + fileName);
backupFile.createNewFile();
fis = new FileInputStream(sourceFile);
fos = new FileOutputStream(backupFile);
@ -4324,25 +4323,28 @@ public class Helper {
}
} catch (Throwable e) {
e.printStackTrace();
}
finally {
} finally {
try {
if (fis != null)
fis.close();
} catch (Throwable ignore) {}
} catch (Throwable ignore) {
}
try {
if (fos != null)
fos.close();
} catch (Throwable ignore) {}
} catch (Throwable ignore) {
}
try {
if (in != null && in.isOpen())
in.close();
} catch (Throwable ignore) {}
} catch (Throwable ignore) {
}
try {
if (out != null && out.isOpen())
out.close();
} catch (Throwable ignore) {}
} catch (Throwable ignore) {
}
}
}
@ -4386,7 +4388,7 @@ public class Helper {
public static OkHttpClient getHttpClient(Context context) {
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean proxyEnabled = sharedpreferences.getBoolean(Helper.SET_PROXY_ENABLED, false);
int cacheSize = 30*1024*1024;
int cacheSize = 30 * 1024 * 1024;
Cache cache = new Cache(context.getCacheDir(), cacheSize);
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
.followRedirects(true)
@ -4716,7 +4718,8 @@ public class Helper {
} else {
context.startService(streamingIntent);
}
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
}
}
@ -4763,6 +4766,13 @@ public class Helper {
return socialNetwork;
}
public static Thread getThreadByName(String threadName) {
for (Thread t : Thread.getAllStackTraces().keySet()) {
if (t.getName().equals(threadName)) return t;
}
return null;
}
//Event Type
public enum EventStreaming {
UPDATE,
@ -4771,6 +4781,7 @@ public class Helper {
NONE
}
public enum NotifType {
FOLLLOW,
MENTION,
@ -4782,7 +4793,6 @@ public class Helper {
TOOT
}
public enum MediaType {
MEDIA,
PROFILE
@ -4883,12 +4893,4 @@ public class Helper {
.show();
}
}
public static Thread getThreadByName(String threadName) {
for (Thread t : Thread.getAllStackTraces().keySet()) {
if (t.getName().equals(threadName)) return t;
}
return null;
}
}

32
app/src/main/java/app/fedilab/android/helper/LongClickLinkMovementMethod.java
View File

@ -14,17 +14,26 @@ import android.widget.TextView;
//https://stackoverflow.com/a/20435892
public class LongClickLinkMovementMethod extends LinkMovementMethod {
private Handler mLongClickHandler;
private static int LONG_CLICK_TIME = 1000;
private static LongClickLinkMovementMethod sInstance;
private Handler mLongClickHandler;
private boolean mIsLongPressed = false;
public static MovementMethod getInstance() {
if (sInstance == null) {
sInstance = new LongClickLinkMovementMethod();
sInstance.mLongClickHandler = new Handler();
}
return sInstance;
}
@Override
public boolean onTouchEvent(final TextView widget, Spannable buffer,
MotionEvent event) {
int action = event.getAction();
if(action == MotionEvent.ACTION_CANCEL){
if(mLongClickHandler!=null){
if (action == MotionEvent.ACTION_CANCEL) {
if (mLongClickHandler != null) {
mLongClickHandler.removeCallbacksAndMessages(null);
}
}
@ -48,10 +57,10 @@ public class LongClickLinkMovementMethod extends LinkMovementMethod {
if (link.length != 0) {
if (action == MotionEvent.ACTION_UP) {
if(mLongClickHandler!=null){
if (mLongClickHandler != null) {
mLongClickHandler.removeCallbacksAndMessages(null);
}
if(!mIsLongPressed) {
if (!mIsLongPressed) {
link[0].onClick(widget);
}
mIsLongPressed = false;
@ -66,7 +75,7 @@ public class LongClickLinkMovementMethod extends LinkMovementMethod {
mIsLongPressed = true;
widget.invalidate();
}
},LONG_CLICK_TIME);
}, LONG_CLICK_TIME);
}
return true;
}
@ -76,15 +85,4 @@ public class LongClickLinkMovementMethod extends LinkMovementMethod {
}
public static MovementMethod getInstance() {
if (sInstance == null) {
sInstance = new LongClickLinkMovementMethod();
sInstance.mLongClickHandler = new Handler();
}
return sInstance;
}
private static LongClickLinkMovementMethod sInstance;
}

4
app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java
View File

@ -141,10 +141,10 @@ public class NotificationsSyncJob extends Job {
//Retrieve users in db that owner has.
for (Account account : accounts) {
APIResponse apiResponse;
if(account.getSocial().compareTo("FRIENDICA") != 0 && account.getSocial().compareTo("GNU") != 0 ) {
if (account.getSocial().compareTo("FRIENDICA") != 0 && account.getSocial().compareTo("GNU") != 0) {
API api = new API(getContext(), account.getInstance(), account.getToken());
apiResponse = api.getNotificationsSince(DisplayNotificationsFragment.Type.ALL, null, false);
}else{
} else {
GNUAPI gnuApi = new GNUAPI(getContext(), account.getInstance(), account.getToken());
apiResponse = gnuApi.getNotificationsSince(DisplayNotificationsFragment.Type.ALL, null, false);
}

23
app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
View File

@ -102,7 +102,7 @@ public class LiveNotificationDelayedService extends Service {
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
List<Account> accountStreams = new AccountDAO(getApplicationContext(), db).getAllAccountCrossAction();
totalAccount = 0;
if( accountStreams != null) {
if (accountStreams != null) {
for (Account account : accountStreams) {
boolean allowStream = sharedpreferences.getBoolean(Helper.SET_ALLOW_STREAM + account.getId() + account.getInstance(), true);
if (allowStream) {
@ -129,7 +129,7 @@ public class LiveNotificationDelayedService extends Service {
}
if( !notify ){
if (!notify) {
stopSelf();
return;
}
@ -146,7 +146,7 @@ public class LiveNotificationDelayedService extends Service {
public void onDestroy() {
super.onDestroy();
for (Thread t : Thread.getAllStackTraces().keySet()) {
if (t.getName().startsWith("notif_delayed_")){
if (t.getName().startsWith("notif_delayed_")) {
t.interrupt();
}
}
@ -154,7 +154,6 @@ public class LiveNotificationDelayedService extends Service {
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@ -163,7 +162,7 @@ public class LiveNotificationDelayedService extends Service {
totalAccount = 0;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
stopForeground(STOP_FOREGROUND_DETACH);
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
assert notificationManager != null;
notificationManager.deleteNotificationChannel(CHANNEL_ID);
}
@ -196,10 +195,10 @@ public class LiveNotificationDelayedService extends Service {
if (!sleeps.containsKey(key)) {
sleeps.put(key, 30000);
}
Thread thread = Helper.getThreadByName("notif_delayed_"+key);
if( thread == null){
Thread thread = Helper.getThreadByName("notif_delayed_" + key);
if (thread == null) {
startThread(accountStream, key);
} else if(thread.getState() != Thread.State.RUNNABLE) {
} else if (thread.getState() != Thread.State.RUNNABLE) {
thread.interrupt();
startThread(accountStream, key);
}
@ -208,7 +207,7 @@ public class LiveNotificationDelayedService extends Service {
}
}
private void startThread(Account accountStream, String key){
private void startThread(Account accountStream, String key) {
Thread thread = new Thread() {
@Override
public void run() {
@ -225,7 +224,7 @@ public class LiveNotificationDelayedService extends Service {
}
}
};
thread.setName("notif_delayed_"+key);
thread.setName("notif_delayed_" + key);
thread.start();
}
@ -246,11 +245,11 @@ public class LiveNotificationDelayedService extends Service {
}
apiResponse = null;
try {
if(account.getSocial().compareTo("FRIENDICA") != 0 && account.getSocial().compareTo("GNU") != 0 ) {
if (account.getSocial().compareTo("FRIENDICA") != 0 && account.getSocial().compareTo("GNU") != 0) {
API api;
api = new API(getApplicationContext(), account.getInstance(), account.getToken());
apiResponse = api.getNotificationsSince(DisplayNotificationsFragment.Type.ALL, last_notifid, false);
}else{
} else {
GNUAPI gnuApi;
gnuApi = new GNUAPI(getApplicationContext(), account.getInstance(), account.getToken());
apiResponse = gnuApi.getNotificationsSince(DisplayNotificationsFragment.Type.ALL, last_notifid, false);

26
app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
View File

@ -120,7 +120,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
List<Account> accountStreams = new AccountDAO(getApplicationContext(), db).getAllAccountCrossAction();
totalAccount = 0;
if( accountStreams != null) {
if (accountStreams != null) {
for (Account account : accountStreams) {
if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA")) {
boolean allowStream = sharedpreferences.getBoolean(Helper.SET_ALLOW_STREAM + account.getId() + account.getInstance(), true);
@ -145,7 +145,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece
startForeground(1, notification);
}
if( !notify ){
if (!notify) {
stopSelf();
return;
}
@ -179,7 +179,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece
totalAccount = 0;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
stopForeground(STOP_FOREGROUND_DETACH);
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
assert notificationManager != null;
notificationManager.deleteNotificationChannel(CHANNEL_ID);
}
@ -198,13 +198,13 @@ public class LiveNotificationService extends Service implements NetworkStateRece
public void onDestroy() {
super.onDestroy();
for (Thread t : Thread.getAllStackTraces().keySet()) {
if (t.getName().startsWith("notif_live_")){
if (t.getName().startsWith("notif_live_")) {
t.interrupt();
t = null;
};
}
}
Thread.currentThread().interrupt();
if( networkStateReceiver != null) {
if (networkStateReceiver != null) {
networkStateReceiver.removeListener(this);
unregisterReceiver(networkStateReceiver);
}
@ -283,17 +283,17 @@ public class LiveNotificationService extends Service implements NetworkStateRece
private void startWork(Account accountStream) {
String key = accountStream.getAcct() + "@" + accountStream.getInstance();
Thread thread = Helper.getThreadByName("notif_live_"+key);
if( thread == null){
Thread thread = Helper.getThreadByName("notif_live_" + key);
if (thread == null) {
thread = new Thread() {
@Override
public void run() {
taks(accountStream);
}
};
thread.setName("notif_live_"+key);
thread.setName("notif_live_" + key);
thread.start();
} else if(thread.getState() != Thread.State.RUNNABLE) {
} else if (thread.getState() != Thread.State.RUNNABLE) {
thread.interrupt();
thread = new Thread() {
@Override
@ -301,7 +301,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece
taks(accountStream);
}
};
thread.setName("notif_live_"+key);
thread.setName("notif_live_" + key);
thread.start();
}
@ -534,10 +534,10 @@ public class LiveNotificationService extends Service implements NetworkStateRece
@Override
public void networkUnavailable() {
for (Thread t : Thread.getAllStackTraces().keySet()) {
if (t.getName().startsWith("notif_live_")){
if (t.getName().startsWith("notif_live_")) {
t.interrupt();
t = null;
};
}
}
Thread.currentThread().interrupt();
}

2
app/src/main/java/app/fedilab/android/services/RestartLiveNotificationReceiver.java
View File

@ -46,7 +46,7 @@ public class RestartLiveNotificationReceiver extends BroadcastReceiver {
context.startService(streamingServiceIntent);
} catch (Exception ignored) {
}
}else{
} else {
NotificationsSyncJob.schedule(false);
}
}

3
app/src/main/java/app/fedilab/android/services/StopDelayedNotificationReceiver.java
View File

@ -34,7 +34,8 @@ public class StopDelayedNotificationReceiver extends BroadcastReceiver {
streamingServiceIntent.putExtra("stop", true);
try {
context.startService(streamingServiceIntent);
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
}
}

4
app/src/main/java/app/fedilab/android/services/StopLiveNotificationReceiver.java
View File

@ -20,7 +20,6 @@ import android.content.Context;
import android.content.Intent;
/**
* Created by Thomas on 22/09/2017.
* BroadcastReceiver for restarting the service
@ -35,7 +34,8 @@ public class StopLiveNotificationReceiver extends BroadcastReceiver {
streamingServiceIntent.putExtra("stop", true);
try {
context.startService(streamingServiceIntent);
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
}
}

1
app/src/main/java/app/fedilab/android/services/StreamingFederatedTimelineService.java
View File

@ -72,6 +72,7 @@ public class StreamingFederatedTimelineService extends IntentService {
public StreamingFederatedTimelineService(String name) {
super(name);
}
@SuppressWarnings("unused")
public StreamingFederatedTimelineService() {
super("StreamingFederatedTimelineService");

1
app/src/main/java/app/fedilab/android/services/StreamingHomeTimelineService.java
View File

@ -72,6 +72,7 @@ public class StreamingHomeTimelineService extends IntentService {
public StreamingHomeTimelineService(String name) {
super(name);
}
@SuppressWarnings("unused")
public StreamingHomeTimelineService() {
super("StreamingHomeTimelineService");

1
app/src/main/java/app/fedilab/android/services/StreamingLocalTimelineService.java
View File

@ -72,6 +72,7 @@ public class StreamingLocalTimelineService extends IntentService {
public StreamingLocalTimelineService(String name) {
super(name);
}
@SuppressWarnings("unused")
public StreamingLocalTimelineService() {
super("StreamingLocalTimelineService");

2
app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java
View File

@ -255,7 +255,7 @@ public class AccountDAO {
public List<Account> getAllAccountCrossAction() {
try {
Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, Sqlite.COL_SOCIAL + " != 'PEERTUBE' AND " + Sqlite.COL_SOCIAL + " != 'GNU' AND " +Sqlite.COL_OAUTHTOKEN + " != 'null'", null, null, null, Sqlite.COL_INSTANCE + " ASC", null);
Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, Sqlite.COL_SOCIAL + " != 'PEERTUBE' AND " + Sqlite.COL_SOCIAL + " != 'GNU' AND " + Sqlite.COL_OAUTHTOKEN + " != 'null'", null, null, null, Sqlite.COL_INSTANCE + " ASC", null);
return cursorToListUser(c);
} catch (Exception e) {
return null;

2
app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
View File

@ -83,7 +83,7 @@ public class MastalabWebViewClient extends WebViewClient {
}
} catch (URISyntaxException e) {
try {
if ( url.length() > 50) {
if (url.length() > 50) {
url = url.substring(0, 50);
}
uri = new URI(url);

1
app/src/main/java/app/fedilab/android/webview/ProxyHelper.java
View File

@ -18,7 +18,6 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.net.Proxy;
import android.os.Build;
import android.util.ArrayMap;
import java.lang.reflect.Constructor;