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

clean

This commit is contained in:
Thomas 2024-01-23 16:02:28 +01:00
parent dc72d9a8b0
commit 067fc68402
26 changed files with 114 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java
View File

@ -28,7 +28,6 @@ import java.lang.ref.WeakReference;
import java.util.Date;
import java.util.List;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.SpannableHelper;
import de.timfreiheit.mathjax.android.MathJaxView;

6
app/src/main/java/app/fedilab/android/mastodon/client/entities/app/CachedBundle.java
View File

@ -108,7 +108,8 @@ public class CachedBundle {
Account account = null;
try {
account = (Account) bundle.getSerializable(Helper.ARG_ACCOUNT);
}catch (ClassCastException ignored){}
} catch (ClassCastException ignored) {
}
if (account != null) {
bundleAccount.putSerializable(Helper.ARG_ACCOUNT, account);
valuesAccount.put(Sqlite.COL_BUNDLE, serializeBundle(bundleAccount));
@ -127,7 +128,8 @@ public class CachedBundle {
Status status = null;
try {
status = (Status) bundle.getSerializable(Helper.ARG_STATUS);
}catch (ClassCastException ignored){}
} catch (ClassCastException ignored) {
}
if (status != null) {
bundleStatus.putSerializable(Helper.ARG_STATUS, status);
valuesAccount.put(Sqlite.COL_BUNDLE, serializeBundle(bundleStatus));

5
app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java
View File

@ -19,9 +19,6 @@ import android.content.SharedPreferences;
import androidx.annotation.NonNull;
import androidx.media3.database.ExoDatabaseProvider;
import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter;
import androidx.preference.PreferenceManager;
import androidx.media3.datasource.DataSource;
import androidx.media3.datasource.DefaultDataSourceFactory;
import androidx.media3.datasource.DefaultHttpDataSource;
@ -30,6 +27,8 @@ import androidx.media3.datasource.cache.CacheDataSink;
import androidx.media3.datasource.cache.CacheDataSource;
import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor;
import androidx.media3.datasource.cache.SimpleCache;
import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter;
import androidx.preference.PreferenceManager;
import java.io.File;

2
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
View File

@ -76,7 +76,6 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.OptIn;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.LinearLayoutCompat;
@ -91,7 +90,6 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelStoreOwner;
import androidx.media3.common.MediaItem;
import androidx.media3.common.Player;
import androidx.media3.common.util.UnstableApi;
import androidx.media3.datasource.DataSource;
import androidx.media3.datasource.DefaultDataSource;
import androidx.media3.exoplayer.ExoPlayer;

1
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java
View File

@ -61,7 +61,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.RequestBuilder;
import org.jetbrains.annotations.NotNull;
import java.lang.ref.WeakReference;

2
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagsSearchAdapter.java
View File

@ -11,8 +11,6 @@ import android.widget.Filterable;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.github.mikephil.charting.data.Entry;
import java.util.ArrayList;
import java.util.List;

8
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java
View File

@ -21,8 +21,6 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -241,9 +239,7 @@ public class FragmentMedia extends Fragment {
);
}
switch (type.toLowerCase()) {
case "video":
case "audio":
case "gifv":
case "video", "audio", "gifv" -> {
if (attachment.peertubeId != null) {
//It's a peertube video, we are fetching data
TimelinesVM timelinesVM = new ViewModelProvider(requireActivity()).get(TimelinesVM.class);
@ -258,7 +254,7 @@ public class FragmentMedia extends Fragment {
} else {
loadVideo(url, type);
}
break;
}
}
}

3
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMediaProfile.java
View File

@ -65,6 +65,7 @@ public class FragmentMediaProfile extends Fragment {
private boolean checkRemotely;
private String accountId;
private Bundle arguments;
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -98,7 +99,6 @@ public class FragmentMediaProfile extends Fragment {
}
private void initializeAfterBundle(Bundle bundle) {
if (bundle != null) {
@ -148,7 +148,6 @@ public class FragmentMediaProfile extends Fragment {
}
/**
* Intialize the common view for statuses on different timelines
*

3
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java
View File

@ -138,6 +138,7 @@ public class FragmentMastodonContext extends Fragment {
private Status firstStatus;
private boolean pullToRefresh;
private String user_token, user_instance;
private Bundle arguments;
/**
* Return the position of the status in the ArrayList
@ -158,8 +159,6 @@ public class FragmentMastodonContext extends Fragment {
return found ? position : -1;
}
private Bundle arguments;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {

4
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java
View File

@ -91,7 +91,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
private StatusAdapter statusAdapter;
private Timeline.TimeLineEnum timelineType;
private List<Status> timelineStatuses;
private Bundle arguments;
//Handle actions that can be done in other fragments
private final BroadcastReceiver receive_action = new BroadcastReceiver() {
@Override
@ -184,6 +183,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
}
}
};
private Bundle arguments;
private boolean retry_for_home_done;
private String lemmy_post_id;
private boolean checkRemotely;
@ -351,7 +351,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -393,6 +392,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
}
}
}
private void initializeAfterBundle(Bundle bundle) {
if (bundle != null) {
timelineType = (Timeline.TimeLineEnum) bundle.get(Helper.ARG_TIMELINE_TYPE);

3
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentProfileTimeline.java
View File

@ -48,12 +48,14 @@ public class FragmentProfileTimeline extends Fragment {
private boolean checkRemotely;
private boolean show_boosts = true, show_replies = true;
private Bundle arguments;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
binding = FragmentProfileTimelinesBinding.inflate(inflater, container, false);
arguments = getArguments();
return binding.getRoot();
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
@ -169,5 +171,4 @@ public class FragmentProfileTimeline extends Fragment {
}
}

1
app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java
View File

@ -32,7 +32,6 @@ import java.util.List;
import app.fedilab.android.R;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.mastodon.activities.ProfileActivity;
import app.fedilab.android.mastodon.client.endpoints.MastodonAccountsService;
import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.mastodon.client.entities.api.Accounts;

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

@ -105,10 +105,9 @@ import androidx.media3.exoplayer.source.SingleSampleMediaSource;
import androidx.media3.exoplayer.trackselection.AdaptiveTrackSelection;
import androidx.media3.exoplayer.trackselection.DefaultTrackSelector;
import androidx.media3.exoplayer.trackselection.TrackSelector;
import androidx.media3.session.MediaSession;
import androidx.media3.ui.AspectRatioFrameLayout;
import androidx.media3.ui.PlayerControlView;
import androidx.media3.ui.DefaultTimeBar;
import androidx.media3.ui.PlayerControlView;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -209,6 +208,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
private Status status;
private int flags;
private boolean humanInteraction;
public static void hideKeyboard(Activity activity) {
if (activity != null && activity.getWindow() != null) {
activity.getWindow().getDecorView();

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

@ -40,7 +40,6 @@ import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@ -513,7 +512,8 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
Intent notificationIntent = new Intent(this, RetrieveInfoService.class);
try {
startService(notificationIntent);
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
}
@Override

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

@ -18,7 +18,6 @@ import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID;
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
import static app.fedilab.android.peertube.helper.Helper.peertubeInformation;
import android.app.Activity;
import android.content.Context;

1
app/src/main/java/app/fedilab/android/peertube/helper/TrackSelectionDialog.java
View File

@ -31,7 +31,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import app.fedilab.android.R;
import app.fedilab.android.databinding.TrackSelectionDialogBinding;