Change classes

app/build.gradle

@@ -10,8 +10,8 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 11
+        versionCode 10
-        versionName "1.1.1"
+        versionName "1.1.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -117,4 +117,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.8.6"
     implementation 'androidx.media:media:1.2.0'
 
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+
 }

app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java

@@ -43,14 +43,14 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.drawer.OwnAccountsAdapter;
 import app.fedilab.fedilabtube.fragment.DisplayAccountsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayNotificationsFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
-import app.fedilab.fedilabtube.viewmodel.AccountsVM;
 
 
 public class AccountActivity extends AppCompatActivity {
@@ -96,19 +96,19 @@ public class AccountActivity extends AppCompatActivity {
         TextView username = findViewById(R.id.username);
         TextView displayname = findViewById(R.id.displayname);
 
-        setTitle(String.format("@%s", account.getUsername()));
+        setTitle(String.format("@%s", account.getName()));
 
-        Helper.loadGiF(AccountActivity.this, account, profile_picture);
+        Helper.loadGiF(AccountActivity.this, account.getAvatar().getPath(), profile_picture);
-        username.setText(String.format("@%s", account.getUsername()));
+        username.setText(String.format("@%s", account.getName()));
-        displayname.setText(account.getDisplay_name());
+        displayname.setText(account.getDisplayName());
 
-        instanceView.setText(account.getInstance());
+        instanceView.setText(account.getHost());
 
         Button logout_button = findViewById(R.id.logout_button);
         Account finalAccount = account;
         logout_button.setOnClickListener(v -> {
             AlertDialog.Builder dialogBuilderLogoutAccount = new AlertDialog.Builder(AccountActivity.this);
-            dialogBuilderLogoutAccount.setMessage(getString(R.string.logout_account_confirmation, finalAccount.getUsername(), finalAccount.getInstance()));
+            dialogBuilderLogoutAccount.setMessage(getString(R.string.logout_account_confirmation, finalAccount.getName(), finalAccount.getHost()));
             dialogBuilderLogoutAccount.setPositiveButton(R.string.action_logout, (dialog, id) -> {
                 Helper.logoutCurrentUser(AccountActivity.this, finalAccount);
                 dialog.dismiss();
@@ -233,7 +233,7 @@ public class AccountActivity extends AppCompatActivity {
                 SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
                 SharedPreferences.Editor editor = sharedpreferences.edit();
                 editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, account.getToken());
-                editor.putString(Helper.PREF_INSTANCE, account.getInstance());
+                editor.putString(Helper.PREF_INSTANCE, account.getHost());
                 editor.putString(Helper.PREF_KEY_ID, account.getId());
                 editor.apply();
                 dialog.dismiss();
@@ -270,15 +270,15 @@ public class AccountActivity extends AppCompatActivity {
                 case 2:
                     DisplayAccountsFragment displayAccountsFragment = new DisplayAccountsFragment();
                     if (position == 1) {
-                        bundle.putSerializable("accountFetch", AccountsVM.accountFetch.MUTED);
+                        bundle.putSerializable("accountFetch", RetrofitPeertubeAPI.DataType.MUTED);
                     } else {
                         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
                         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                         String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
                         String instance = Helper.getLiveInstance(AccountActivity.this);
                         Account account = new AccountDAO(AccountActivity.this, db).getUniqAccount(userId, instance);
-                        bundle.putString("name", account.getUsername() + "@" + account.getInstance());
+                        bundle.putString("name", account.getName() + "@" + account.getHost());
-                        bundle.putSerializable("accountFetch", AccountsVM.accountFetch.CHANNEL);
+                        bundle.putSerializable("accountFetch", RetrofitPeertubeAPI.DataType.CHANNEL);
                     }
                     displayAccountsFragment.setArguments(bundle);
                     return displayAccountsFragment;

app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java

@@ -15,6 +15,7 @@ package app.fedilab.fedilabtube;
  * see <http://www.gnu.org/licenses>. */
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -48,12 +49,13 @@ import java.util.List;
 import java.util.Map;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.HttpsConnection;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
-import app.fedilab.fedilabtube.client.entities.Playlist;
+import app.fedilab.fedilabtube.client.entities.Item;
-import app.fedilab.fedilabtube.client.entities.PlaylistElement;
+import app.fedilab.fedilabtube.client.entities.PlaylistParams;
 import app.fedilab.fedilabtube.drawer.PlaylistAdapter;
+import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import es.dmoral.toasty.Toasty;
@@ -93,7 +95,7 @@ public class AllPlaylistsActivity extends AppCompatActivity {
         idChannel = null;
 
         PlaylistsVM viewModel = new ViewModelProvider(AllPlaylistsActivity.this).get(PlaylistsVM.class);
-        viewModel.manage(PlaylistsVM.action.GET_PLAYLIST, null, null, null).observe(AllPlaylistsActivity.this, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_PLAYLIST, apiResponse));
+        viewModel.manage(PlaylistsVM.action.GET_PLAYLISTS, null, null).observe(AllPlaylistsActivity.this, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_PLAYLISTS, apiResponse));
 
         FloatingActionButton add_new = findViewById(R.id.add_new);
 
@@ -135,7 +137,7 @@ public class AllPlaylistsActivity extends AppCompatActivity {
             Toasty.error(AllPlaylistsActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             return;
         }
-        if (actionType == PlaylistsVM.action.GET_PLAYLIST) {
+        if (actionType == PlaylistsVM.action.GET_PLAYLISTS) {
             if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {
                 playlists.addAll(apiResponse.getPlaylists());
                 playlistAdapter.notifyDataSetChanged();
@@ -158,9 +160,10 @@ public class AllPlaylistsActivity extends AppCompatActivity {
         set_upload_channel = dialogView.findViewById(R.id.set_upload_channel);
         set_upload_privacy = dialogView.findViewById(R.id.set_upload_privacy);
 
-
+        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+        String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
         ChannelsVM viewModelC = new ViewModelProvider(AllPlaylistsActivity.this).get(ChannelsVM.class);
-        viewModelC.get().observe(AllPlaylistsActivity.this, this::manageVIewChannels);
+        viewModelC.get(RetrofitPeertubeAPI.DataType.CHANNELS_FOR_ACCOUNT, userId).observe(AllPlaylistsActivity.this, this::manageVIewChannels);
 
         display_name.setFilters(new InputFilter[]{new InputFilter.LengthFilter(120)});
         description.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1000)});
@@ -178,32 +181,32 @@ public class AllPlaylistsActivity extends AppCompatActivity {
             Button button = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
             button.setOnClickListener(view -> {
                 if (display_name.getText() != null && display_name.getText().toString().trim().length() > 0) {
-                    PlaylistElement playlistElement = new PlaylistElement();
+                    PlaylistParams playlistElement = new PlaylistParams();
                     playlistElement.setDisplayName(display_name.getText().toString().trim());
                     if (description.getText() != null && description.getText().toString().trim().length() > 0) {
                         playlistElement.setDescription(description.getText().toString().trim());
                     }
                     playlistElement.setVideoChannelId(idChannel);
-                    String idPrivacy;
                     String label;
                     Map.Entry<Integer, String> privacyM = privacyToSend.entrySet().iterator().next();
-                    idPrivacy = String.valueOf(privacyM.getKey());
+                    Item privacyItem = new Item();
+                    privacyItem.setId(privacyM.getKey());
+                    privacyItem.setLabel(privacyM.getValue());
                     label = privacyM.getValue();
                     if ((label.trim().compareTo("Public") == 0 && (playlistElement.getVideoChannelId() == null || playlistElement.getVideoChannelId().trim().compareTo("null") == 0))) {
                         Toasty.error(AllPlaylistsActivity.this, getString(R.string.error_channel_mandatory), Toast.LENGTH_LONG).show();
                     } else {
                         if (privacyToSend != null) {
-                            playlistElement.setPrivacy(idPrivacy);
+                            playlistElement.setPrivacy((int) privacyItem.getId());
                         }
                         new Thread(() -> {
-                            try {
                             String playlistId;
                             if (playlistToEdit == null) {
-                                    playlistId = new PeertubeAPI(AllPlaylistsActivity.this).createPlaylist(playlistElement);
+                                APIResponse apiResponse = new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.CREATE_PLAYLIST, null, playlistElement, null);
+                                playlistId = apiResponse.getActionReturn();
                             } else {
                                 playlistId = playlistToEdit.getId();
-                                    playlistElement.setPlaylistId(playlistId);
+                                new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.UPDATE_PLAYLIST, playlistId, playlistElement, null);
-                                    new PeertubeAPI(AllPlaylistsActivity.this).updatePlaylist(playlistElement);
                             }
                             Handler mainHandler = new Handler(Looper.getMainLooper());
                             Runnable myRunnable = () -> {
@@ -216,26 +219,13 @@ public class AllPlaylistsActivity extends AppCompatActivity {
                                 playlist.setId(playlistId);
                                 playlist.setDescription(playlistElement.getDescription());
                                 playlist.setDisplayName(playlistElement.getDisplayName());
-                                    playlist.setVideoChannelId(playlistElement.getVideoChannelId());
+                                playlist.setPrivacy(privacyItem);
-                                    playlist.setPrivacy(privacyToSend);
                                 if (playlistToEdit == null) {
                                     playlists.add(playlist);
                                 }
                                 playlistAdapter.notifyDataSetChanged();
                             };
                             mainHandler.post(myRunnable);
-                            } catch (HttpsConnection.HttpsConnectionException e) {
-                                e.printStackTrace();
-                                Handler mainHandler = new Handler(Looper.getMainLooper());
-                                Runnable myRunnable = () -> {
-                                    if (e.getMessage() != null) {
-                                        Toasty.error(AllPlaylistsActivity.this, e.getMessage(), Toast.LENGTH_LONG).show();
-                                    } else {
-                                        Toasty.error(AllPlaylistsActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                                    }
-                                };
-                                mainHandler.post(myRunnable);
-                            }
                         }).start();
                         alertDialog.dismiss();
                     }
@@ -280,7 +270,7 @@ public class AllPlaylistsActivity extends AppCompatActivity {
         channelId[0] = "null";
 
         for (Account account : channels) {
-            channelName[i] = account.getUsername();
+            channelName[i] = account.getName();
             channelId[i] = account.getId();
             i++;
         }
@@ -318,13 +308,9 @@ public class AllPlaylistsActivity extends AppCompatActivity {
         set_upload_privacy.setAdapter(adapterPrivacies);
 
         if (playlistToEdit != null) {
-            it = playlistToEdit.getPrivacy().entrySet().iterator();
+            Item privacy = playlistToEdit.getPrivacy();
-            Map.Entry<Integer, String> pair = null;
+            if (privacy.getId() > 0) {
-            while (it.hasNext()) {
+                set_upload_privacy.setSelection((int) privacy.getId() - 1);
-                pair = it.next();
-            }
-            if (pair != null) {
-                set_upload_privacy.setSelection(pair.getKey() - 1);
             }
         } else {
             set_upload_privacy.setSelection(2);
@@ -356,13 +342,10 @@ public class AllPlaylistsActivity extends AppCompatActivity {
         });
 
         if (playlistToEdit != null) {
-            it = playlistToEdit.getPrivacy().entrySet().iterator();
+            Item privacy = playlistToEdit.getPrivacy();
-            Map.Entry<Integer, String> pair = null;
+
-            while (it.hasNext()) {
+            if (privacy.getId() > 0) {
-                pair = it.next();
+                set_upload_privacy.setSelection((int) privacy.getId() - 1);
-            }
-            if (pair != null) {
-                set_upload_privacy.setSelection(pair.getKey() - 1);
             }
         }
 
@@ -383,7 +366,7 @@ public class AllPlaylistsActivity extends AppCompatActivity {
             int position = 0;
             int k = 1;
             for (Account ac : channels) {
-                if (playlistToEdit.getVideoChannelId() != null && ac.getId().compareTo(playlistToEdit.getVideoChannelId()) == 0) {
+                if (playlistToEdit.getId() != null && ac.getId().compareTo(playlistToEdit.getId()) == 0) {
                     position = k;
                     break;
                 }

app/src/main/java/app/fedilab/fedilabtube/InstancePickerActivity.java

@@ -41,21 +41,19 @@ import java.util.List;
 import java.util.Map;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.entities.Instance;
+import app.fedilab.fedilabtube.client.data.InstanceData;
 import app.fedilab.fedilabtube.client.entities.InstanceParams;
 import app.fedilab.fedilabtube.drawer.InstanceAdapter;
 import app.fedilab.fedilabtube.helper.RoundedBackgroundSpan;
 import app.fedilab.fedilabtube.viewmodel.InstancesVM;
 import es.dmoral.toasty.Toasty;
 
-
 import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
 
 
 public class InstancePickerActivity extends AppCompatActivity {
 
 
-    private RelativeLayout mainLoader, textviewNoAction;
     boolean[] checkedItemsCategory;
     int[] itemsKeyCategory;
     String[] itemsLabelCategory;
@@ -63,6 +61,7 @@ public class InstancePickerActivity extends AppCompatActivity {
     String[] itemsKeyLanguage;
     String[] itemsLabelLanguage;
     InstanceParams instanceParams;
+    private RelativeLayout mainLoader, textviewNoAction;
     private TextView categories_view, languages_view;
     private InstancesVM viewModel;
 
@@ -270,7 +269,7 @@ public class InstancePickerActivity extends AppCompatActivity {
                 Toasty.error(InstancePickerActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             return;
         }
-        List<Instance> instances = apiResponse.getInstances();
+        List<InstanceData.Instance> instances = apiResponse.getInstances();
         RecyclerView lv_instances = findViewById(R.id.lv_instances);
         if ((instances == null || instances.size() == 0)) {
             textviewNoAction.setVisibility(View.VISIBLE);

app/src/main/java/app/fedilab/fedilabtube/MainActivity.java

@@ -43,15 +43,14 @@ import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import org.jetbrains.annotations.NotNull;
 
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
-import app.fedilab.fedilabtube.client.entities.InstanceNodeInfo;
 import app.fedilab.fedilabtube.client.entities.PeertubeInformation;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.services.RetrieveInfoService;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
-import app.fedilab.fedilabtube.viewmodel.FeedsVM;
+import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
 import static app.fedilab.fedilabtube.helper.Helper.academies;
@@ -165,7 +164,7 @@ public class MainActivity extends AppCompatActivity {
             SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
             Account account = new AccountDAO(MainActivity.this, db).getUniqAccount(userId, instance);
             if (account != null) {
-                new Thread(() -> new PeertubeAPI(MainActivity.this).refreshToken(account.getToken(), account.getInstance())).start();
+                new Thread(() -> new RetrofitPeertubeAPI(MainActivity.this).refreshToken(account.getToken(), account.getHost())).start();
             }
         } else {
             instanceItem.setVisible(true);
@@ -206,14 +205,14 @@ public class MainActivity extends AppCompatActivity {
         } else if (item.getItemId() == R.id.action_myvideos) {
             Intent intent = new Intent(MainActivity.this, MyVideosActivity.class);
             Bundle bundle = new Bundle();
-            bundle.putSerializable("type", FeedsVM.Type.MYVIDEOS);
+            bundle.putSerializable("type", TimelineVM.Type.MYVIDEOS);
             intent.putExtras(bundle);
             startActivity(intent);
             return true;
         } else if (item.getItemId() == R.id.action_history) {
             Intent intent = new Intent(MainActivity.this, MyVideosActivity.class);
             Bundle bundle = new Bundle();
-            bundle.putSerializable("type", FeedsVM.Type.PEERTUBE_HISTORY);
+            bundle.putSerializable("type", TimelineVM.Type.PEERTUBE_HISTORY);
             intent.putExtras(bundle);
             startActivity(intent);
             return true;
@@ -286,7 +285,7 @@ public class MainActivity extends AppCompatActivity {
                 (dialog, which) -> new Thread(() -> {
                     try {
                         String newInstance = input.getText().toString().trim();
-                        InstanceNodeInfo instanceNodeInfo = new PeertubeAPI(MainActivity.this).displayNodeInfo(newInstance);
+                        InstanceNodeInfo instanceNodeInfo = new RetrofitPeertubeAPI(MainActivity.this).displayNodeInfo(newInstance);
                         if (instanceNodeInfo.getName() != null && instanceNodeInfo.getName().trim().toLowerCase().compareTo("peertube") == 0) {
                             SharedPreferences.Editor editor = sharedpreferences.edit();
                             editor.putString(Helper.PREF_INSTANCE, newInstance);

app/src/main/java/app/fedilab/fedilabtube/MyVideosActivity.java

@@ -20,13 +20,13 @@ import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
 
-import app.fedilab.fedilabtube.fragment.DisplayStatusFragment;
+import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
-import app.fedilab.fedilabtube.viewmodel.FeedsVM;
+import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 
 
 public class MyVideosActivity extends AppCompatActivity {
 
-    private FeedsVM.Type type;
+    private TimelineVM.Type type;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -39,23 +39,23 @@ public class MyVideosActivity extends AppCompatActivity {
 
         Bundle b = getIntent().getExtras();
         if (b != null)
-            type = (FeedsVM.Type) b.get("type");
+            type = (TimelineVM.Type) b.get("type");
 
-        if (type == FeedsVM.Type.MYVIDEOS) {
+        if (type == TimelineVM.Type.MYVIDEOS) {
             setTitle(R.string.my_videos);
-        } else if (type == FeedsVM.Type.PSUBSCRIPTIONS) {
+        } else if (type == TimelineVM.Type.PSUBSCRIPTIONS) {
             setTitle(R.string.subscriptions);
-        } else if (type == FeedsVM.Type.PEERTUBE_HISTORY) {
+        } else if (type == TimelineVM.Type.PEERTUBE_HISTORY) {
             setTitle(R.string.my_history);
         }
 
         if (savedInstanceState == null) {
-            DisplayStatusFragment displayStatusFragment = new DisplayStatusFragment();
+            DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
             Bundle bundle = new Bundle();
             bundle.putSerializable("type", type);
-            displayStatusFragment.setArguments(bundle);
+            displayVideosFragment.setArguments(bundle);
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.add(R.id.container, displayStatusFragment).commit();
+            ft.add(R.id.container, displayVideosFragment).commit();
         }
     }
 

app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java

@@ -81,6 +81,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 
 import org.jetbrains.annotations.NotNull;
+
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
@@ -93,24 +94,24 @@ import javax.net.ssl.HttpsURLConnection;
 
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.TLSSocketFactory;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData;
+import app.fedilab.fedilabtube.client.data.CommentData;
+import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.client.entities.Caption;
-import app.fedilab.fedilabtube.client.entities.Peertube;
+import app.fedilab.fedilabtube.client.entities.File;
 import app.fedilab.fedilabtube.client.entities.Playlist;
 import app.fedilab.fedilabtube.client.entities.PlaylistElement;
-import app.fedilab.fedilabtube.client.entities.Status;
+import app.fedilab.fedilabtube.drawer.CommentListAdapter;
-import app.fedilab.fedilabtube.client.entities.StatusDrawerParams;
-import app.fedilab.fedilabtube.drawer.StatusListAdapter;
 import app.fedilab.fedilabtube.helper.CacheDataSourceFactory;
 import app.fedilab.fedilabtube.helper.FullScreenMediaController;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
-import app.fedilab.fedilabtube.sqlite.PeertubeFavoritesDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.viewmodel.CaptionsVM;
 import app.fedilab.fedilabtube.viewmodel.CommentVM;
-import app.fedilab.fedilabtube.viewmodel.FeedsVM;
+import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import app.fedilab.fedilabtube.webview.CustomWebview;
@@ -133,7 +134,7 @@ public class PeertubeActivity extends AppCompatActivity {
     private RelativeLayout loader;
     private TextView peertube_view_count, peertube_playlist, peertube_bookmark, peertube_like_count, peertube_dislike_count, peertube_description, peertube_title, more_actions;
     private ScrollView peertube_information_container;
-    private Peertube peertube;
+    private VideoData.Video peertube;
     private PlayerView playerView;
     private SimpleExoPlayer player;
     private boolean fullScreenMode;
@@ -189,8 +190,8 @@ public class PeertubeActivity extends AppCompatActivity {
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
         String instance = Helper.getLiveInstance(PeertubeActivity.this);
-        Account account = new AccountDAO(PeertubeActivity.this, db).getUniqAccount(userId, instance);
+        AccountData.Account account = new AccountDAO(PeertubeActivity.this, db).getUniqAccount(userId, instance);
-        Helper.loadGiF(PeertubeActivity.this, account, my_pp);
+        Helper.loadGiF(PeertubeActivity.this, account.getAvatar().getPath(), my_pp);
 
 
         if (Helper.isTablet(PeertubeActivity.this)) {
@@ -306,7 +307,7 @@ public class PeertubeActivity extends AppCompatActivity {
         peertube_bookmark.setVisibility(View.GONE);
 
 
-        FeedsVM feedsViewModel = new ViewModelProvider(PeertubeActivity.this).get(FeedsVM.class);
+        TimelineVM feedsViewModel = new ViewModelProvider(PeertubeActivity.this).get(TimelineVM.class);
         feedsViewModel.getVideo(peertubeInstance, videoId).observe(PeertubeActivity.this, this::manageVIewVideo);
 
         CaptionsVM captionsViewModel = new ViewModelProvider(PeertubeActivity.this).get(CaptionsVM.class);
@@ -394,12 +395,12 @@ public class PeertubeActivity extends AppCompatActivity {
             } else {
                 if (type == PeertubeAPI.reportType.VIDEO) {
                     PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
-                    viewModel.post(PeertubeAPI.StatusAction.REPORT_VIDEO, peertube.getId(), report_content.getText().toString(), null).observe(PeertubeActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.REPORT_VIDEO, apiResponse));
+                    viewModel.post(RetrofitPeertubeAPI.ActionType.REPORT_VIDEO, peertube.getId(), report_content.getText().toString(), null).observe(PeertubeActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.REPORT_VIDEO, apiResponse));
                     alertDialog.dismiss();
                     dialog.dismiss();
                 } else if (type == PeertubeAPI.reportType.ACCOUNT) {
                     PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
-                    viewModel.post(PeertubeAPI.StatusAction.REPORT_ACCOUNT, peertube.getAccount().getId(), report_content.getText().toString(), null).observe(PeertubeActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.REPORT_ACCOUNT, apiResponse));
+                    viewModel.post(RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT, peertube.getAccount().getId(), report_content.getText().toString(), null).observe(PeertubeActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.REPORT_ACCOUNT, apiResponse));
                     alertDialog.dismiss();
                     dialog.dismiss();
                 }
@@ -461,7 +462,7 @@ public class PeertubeActivity extends AppCompatActivity {
                 String comment = add_comment_write.getText().toString();
                 if (comment.trim().length() > 0) {
                     PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
-                    viewModel.post(PeertubeAPI.StatusAction.PEERTUBECOMMENT, peertube.getAccount().getId(), comment, null).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.PEERTUBECOMMENT, apiResponse1));
+                    viewModel.post(RetrofitPeertubeAPI.ActionType.PEERTUBECOMMENT, peertube.getAccount().getId(), comment, null).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.PEERTUBECOMMENT, apiResponse1));
                     add_comment_write.setText("");
                     add_comment_read.setVisibility(View.VISIBLE);
                     add_comment_write.setVisibility(View.GONE);
@@ -549,9 +550,9 @@ public class PeertubeActivity extends AppCompatActivity {
         setTitle(peertube.getName());
         peertube_description.setText(peertube.getDescription());
         peertube_title.setText(peertube.getName());
-        peertube_dislike_count.setText(String.valueOf(peertube.getDislike()));
+        peertube_dislike_count.setText(String.valueOf(peertube.getDislikes()));
-        peertube_like_count.setText(String.valueOf(peertube.getLike()));
+        peertube_like_count.setText(String.valueOf(peertube.getLikes()));
-        peertube_view_count.setText(String.valueOf(peertube.getView()));
+        peertube_view_count.setText(String.valueOf(peertube.getViews()));
         video_id = peertube.getId();
 
         changeColor();
@@ -561,7 +562,7 @@ public class PeertubeActivity extends AppCompatActivity {
             if (isLoggedIn(PeertubeActivity.this)) {
                 String newState = peertube.getMyRating().equals("like") ? "none" : "like";
                 PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
-                viewModel.post(PeertubeAPI.StatusAction.RATEVIDEO, peertube.getId(), newState, null).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.RATEVIDEO, apiResponse1));
+                viewModel.post(RetrofitPeertubeAPI.ActionType.RATEVIDEO, peertube.getId(), newState, null).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.RATEVIDEO, apiResponse1));
                 peertube.setMyRating(newState);
                 int count = Integer.parseInt(peertube_like_count.getText().toString());
                 if (newState.compareTo("none") == 0) {
@@ -582,7 +583,7 @@ public class PeertubeActivity extends AppCompatActivity {
             if (isLoggedIn(PeertubeActivity.this)) {
                 String newState = peertube.getMyRating().equals("dislike") ? "none" : "dislike";
                 PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
-                viewModel.post(PeertubeAPI.StatusAction.RATEVIDEO, peertube.getId(), newState, null).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.RATEVIDEO, apiResponse1));
+                viewModel.post(RetrofitPeertubeAPI.ActionType.RATEVIDEO, peertube.getId(), newState, null).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.RATEVIDEO, apiResponse1));
                 peertube.setMyRating(newState);
                 int count = Integer.parseInt(peertube_dislike_count.getText().toString());
                 if (newState.compareTo("none") == 0) {
@@ -644,10 +645,10 @@ public class PeertubeActivity extends AppCompatActivity {
                             if (ContextCompat.checkSelfPermission(PeertubeActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(PeertubeActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                                 ActivityCompat.requestPermissions(PeertubeActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE);
                             } else {
-                                Helper.manageDownloads(PeertubeActivity.this, peertube.getFileDownloadUrl(null, PeertubeActivity.this));
+                                Helper.manageDownloads(PeertubeActivity.this, peertube.getFileDownloadUrl(null));
                             }
                         } else {
-                            Helper.manageDownloads(PeertubeActivity.this, peertube.getFileDownloadUrl(null, PeertubeActivity.this));
+                            Helper.manageDownloads(PeertubeActivity.this, peertube.getFileDownloadUrl(null));
                         }
                         break;
                     case R.id.action_share:
@@ -655,7 +656,7 @@ public class PeertubeActivity extends AppCompatActivity {
                         sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.shared_via));
                         String url;
 
-                        url = "https://" + peertube.getInstance() + "/videos/watch/" + peertube.getUuid();
+                        url = peertube.getFiles().get(0).getFileDownloadUrl();
                         boolean share_details = sharedpreferences.getBoolean(Helper.SET_SHARE_DETAILS, true);
                         String extra_text;
                         if (share_details) {
@@ -767,31 +768,6 @@ public class PeertubeActivity extends AppCompatActivity {
             popup.show();
         });
 
-        SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-        List<Peertube> peertubes = new PeertubeFavoritesDAO(PeertubeActivity.this, db).getSinglePeertube(peertube);
-
-        Drawable img;
-
-        if (peertubes == null || peertubes.size() == 0)
-            img = ContextCompat.getDrawable(PeertubeActivity.this, R.drawable.ic_baseline_bookmark_border_24);
-        else
-            img = ContextCompat.getDrawable(PeertubeActivity.this, R.drawable.ic_baseline_bookmark_24);
-        peertube_bookmark.setCompoundDrawablesWithIntrinsicBounds(null, img, null, null);
-
-        peertube_bookmark.setOnClickListener(v -> {
-            List<Peertube> peertubes1 = new PeertubeFavoritesDAO(PeertubeActivity.this, db).getSinglePeertube(peertube);
-            if (peertubes1 == null || peertubes1.size() == 0) {
-                new PeertubeFavoritesDAO(PeertubeActivity.this, db).insert(peertube);
-                Toasty.success(PeertubeActivity.this, getString(R.string.bookmark_add_peertube), Toast.LENGTH_SHORT).show();
-            } else {
-                new PeertubeFavoritesDAO(PeertubeActivity.this, db).remove(peertube);
-                Toasty.success(PeertubeActivity.this, getString(R.string.bookmark_remove_peertube), Toast.LENGTH_SHORT).show();
-            }
-            if (peertubes1 != null && peertubes1.size() > 0) //Was initially in cache
-                peertube_bookmark.setCompoundDrawablesWithIntrinsicBounds(null, ContextCompat.getDrawable(PeertubeActivity.this, R.drawable.ic_baseline_bookmark_border_24), null, null);
-            else
-                peertube_bookmark.setCompoundDrawablesWithIntrinsicBounds(null, ContextCompat.getDrawable(PeertubeActivity.this, R.drawable.ic_baseline_bookmark_24), null, null);
-        });
 
     }
 
@@ -821,25 +797,20 @@ public class PeertubeActivity extends AppCompatActivity {
                 Toasty.error(PeertubeActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             return;
         }
-        List<Status> statuses = new ArrayList<>();
+        List<CommentData.Comment> comments = new ArrayList<>();
-        for (Status status : apiResponse.getStatuses()) {
+        for (CommentData.Comment comment : apiResponse.getComments()) {
-            if (status.getContent() != null && status.getContent().trim().length() > 0) {
+            if (comment.getDescription() != null && comment.getDescription().trim().length() > 0) {
-                statuses.add(status);
+                comments.add(comment);
             }
         }
         RecyclerView lv_comments = findViewById(R.id.peertube_comments);
-        if (statuses.size() > 0) {
+        if (comments.size() > 0) {
             lv_comments.setVisibility(View.VISIBLE);
-            SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+            CommentListAdapter commentListAdapter = new CommentListAdapter(comments);
-            String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
-            StatusDrawerParams statusDrawerParams = new StatusDrawerParams();
-            statusDrawerParams.setTargetedId(userId);
-            statusDrawerParams.setStatuses(statuses);
-            StatusListAdapter statusListAdapter = new StatusListAdapter(statusDrawerParams);
             LinearLayoutManager mLayoutManager = new LinearLayoutManager(PeertubeActivity.this);
             lv_comments.setLayoutManager(mLayoutManager);
             lv_comments.setNestedScrollingEnabled(false);
-            lv_comments.setAdapter(statusListAdapter);
+            lv_comments.setAdapter(commentListAdapter);
 
         }
     }
@@ -926,8 +897,11 @@ public class PeertubeActivity extends AppCompatActivity {
         AlertDialog.Builder builderSingle = new AlertDialog.Builder(PeertubeActivity.this);
         builderSingle.setTitle(R.string.pickup_resolution);
         final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(PeertubeActivity.this, android.R.layout.select_dialog_item);
-        for (String resolution : peertube.getResolution())
+        for (File file : peertube.getFiles()) {
-            arrayAdapter.add(resolution + "p");
+            if (file.getResolutions() != null) {
+                arrayAdapter.add(file.getResolutions().getLabel() + "p");
+            }
+        }
         builderSingle.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
         builderSingle.setAdapter(arrayAdapter, (dialog, which) -> {
             String res = Objects.requireNonNull(arrayAdapter.getItem(which)).substring(0, Objects.requireNonNull(arrayAdapter.getItem(which)).length() - 1);

app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java

@@ -58,11 +58,11 @@ import java.util.UUID;
 
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.PeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.client.entities.Peertube;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
-import app.fedilab.fedilabtube.viewmodel.FeedsVM;
+import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import es.dmoral.toasty.Toasty;
 import mabbas007.tagsedittext.TagsEditText;
@@ -219,7 +219,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
 
 
         String peertubeInstance = Helper.getLiveInstance(PeertubeEditUploadActivity.this);
-        FeedsVM feedsViewModel = new ViewModelProvider(PeertubeEditUploadActivity.this).get(FeedsVM.class);
+        TimelineVM feedsViewModel = new ViewModelProvider(PeertubeEditUploadActivity.this).get(TimelineVM.class);
         feedsViewModel.getVideo(peertubeInstance, videoId).observe(PeertubeEditUploadActivity.this, this::manageVIewVideo);
         channels = new LinkedHashMap<>();
 
@@ -525,7 +525,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
             List<String> tags = p_video_tags.getTags();
             peertube.setTags(tags);
             set_upload_submit.setEnabled(false);
-            FeedsVM feedsViewModel = new ViewModelProvider(PeertubeEditUploadActivity.this).get(FeedsVM.class);
+            TimelineVM feedsViewModel = new ViewModelProvider(PeertubeEditUploadActivity.this).get(TimelineVM.class);
             feedsViewModel.updateVideo(peertube).observe(PeertubeEditUploadActivity.this, this::manageVIewVideo);
         });
 

app/src/main/java/app/fedilab/fedilabtube/PeertubeUploadActivity.java

@@ -54,7 +54,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import es.dmoral.toasty.Toasty;

app/src/main/java/app/fedilab/fedilabtube/SearchActivity.java

@@ -21,7 +21,7 @@ import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
 
-import app.fedilab.fedilabtube.fragment.DisplayStatusFragment;
+import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import es.dmoral.toasty.Toasty;
 
 
@@ -48,12 +48,12 @@ public class SearchActivity extends AppCompatActivity {
 
 
         if (savedInstanceState == null) {
-            DisplayStatusFragment displayStatusFragment = new DisplayStatusFragment();
+            DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
             Bundle bundle = new Bundle();
             bundle.putString("search_peertube", search);
-            displayStatusFragment.setArguments(bundle);
+            displayVideosFragment.setArguments(bundle);
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.add(R.id.container, displayStatusFragment).commit();
+            ft.add(R.id.container, displayVideosFragment).commit();
         }
     }
 

app/src/main/java/app/fedilab/fedilabtube/ShowAccountActivity.java

@@ -52,13 +52,13 @@ import java.util.List;
 
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.PeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.client.entities.Relationship;
 import app.fedilab.fedilabtube.fragment.DisplayAccountsFragment;
-import app.fedilab.fedilabtube.fragment.DisplayStatusFragment;
+import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.AccountsVM;
-import app.fedilab.fedilabtube.viewmodel.FeedsVM;
+import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import app.fedilab.fedilabtube.viewmodel.RelationshipVM;
 import es.dmoral.toasty.Toasty;
@@ -231,8 +231,8 @@ public class ShowAccountActivity extends AppCompatActivity {
                 switch (tab.getPosition()) {
                     case 0:
                         if (fragment != null) {
-                            DisplayStatusFragment displayStatusFragment = ((DisplayStatusFragment) fragment);
+                            DisplayVideosFragment displayVideosFragment = ((DisplayVideosFragment) fragment);
-                            displayStatusFragment.scrollToTop();
+                            displayVideosFragment.scrollToTop();
                         }
                         break;
                     case 1:
@@ -433,13 +433,13 @@ public class ShowAccountActivity extends AppCompatActivity {
         public Fragment getItem(int position) {
             Bundle bundle = new Bundle();
             if (position == 0) {
-                DisplayStatusFragment displayStatusFragment = new DisplayStatusFragment();
+                DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
                 bundle = new Bundle();
-                bundle.putSerializable("type", FeedsVM.Type.USER);
+                bundle.putSerializable("type", TimelineVM.Type.USER);
                 bundle.putString("targetedid", account.getAcct());
                 bundle.putBoolean("ischannel", ischannel);
-                displayStatusFragment.setArguments(bundle);
+                displayVideosFragment.setArguments(bundle);
-                return displayStatusFragment;
+                return displayVideosFragment;
             }
             DisplayAccountsFragment displayAccountsFragment = new DisplayAccountsFragment();
             bundle.putString("targetedid", account.getId());

app/src/main/java/app/fedilab/fedilabtube/client/APIResponse.java

@@ -15,43 +15,48 @@ package app.fedilab.fedilabtube.client;
  * see <http://www.gnu.org/licenses>. */
 
 import java.util.List;
+import java.util.Map;
 
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData;
-import app.fedilab.fedilabtube.client.entities.Caption;
+import app.fedilab.fedilabtube.client.data.CaptionData;
+import app.fedilab.fedilabtube.client.data.ChannelData;
+import app.fedilab.fedilabtube.client.data.CommentData;
+import app.fedilab.fedilabtube.client.data.InstanceData;
+import app.fedilab.fedilabtube.client.data.NotificationData;
+import app.fedilab.fedilabtube.client.data.PlaylistData;
+import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.client.entities.Error;
-import app.fedilab.fedilabtube.client.entities.Instance;
+import app.fedilab.fedilabtube.client.entities.OverviewVideo;
-import app.fedilab.fedilabtube.client.entities.Peertube;
+import app.fedilab.fedilabtube.client.entities.Rating;
-import app.fedilab.fedilabtube.client.entities.PeertubeNotification;
-import app.fedilab.fedilabtube.client.entities.Playlist;
-import app.fedilab.fedilabtube.client.entities.PlaylistElement;
-import app.fedilab.fedilabtube.client.entities.Relationship;
-import app.fedilab.fedilabtube.client.entities.Status;
 
 @SuppressWarnings({"unused", "RedundantSuppression"})
 public class APIResponse {
 
-    private List<Account> accounts = null;
+    private List<AccountData.Account> accounts = null;
-    private List<Status> statuses = null;
+    private List<ChannelData.Channel> channels = null;
     private String targetedId = null;
-    private List<Peertube> peertubes = null;
+    private String actionReturn = null;
-    private List<PeertubeNotification> peertubeNotifications = null;
+    private Rating rating;
-    private List<Playlist> playlists = null;
+    private OverviewVideo overviewVideo = null;
+    private List<VideoData.Video> peertubes = null;
+    private List<CommentData.Comment> comments = null;
+    private List<NotificationData.Notification> peertubeNotifications = null;
+    private List<PlaylistData.Playlist> playlists = null;
     private List<String> domains = null;
-    private List<Relationship> relationships = null;
+    private List<Map<String, Boolean>> relationships = null;
-    private List<Caption> captions = null;
+    private List<CaptionData.Caption> captions = null;
     private Error error = null;
     private String since_id, max_id;
-    private List<PlaylistElement> playlistForVideos;
+    private List<InstanceData.Instance> instances;
-    private List<Instance> instances;
     private String stringData;
     private int statusCode;
     private String captionText;
 
-    public List<Account> getAccounts() {
+    public List<AccountData.Account> getAccounts() {
         return accounts;
     }
 
-    public void setAccounts(List<Account> accounts) {
+    public void setAccounts(List<AccountData.Account> accounts) {
         this.accounts = accounts;
     }
 
@@ -89,40 +94,32 @@ public class APIResponse {
     }
 
 
-    public List<Peertube> getPeertubes() {
+    public List<VideoData.Video> getPeertubes() {
         return peertubes;
     }
 
-    public void setPeertubes(List<Peertube> peertubes) {
+    public void setPeertubes(List<VideoData.Video> peertubes) {
         this.peertubes = peertubes;
     }
 
 
-    public List<PeertubeNotification> getPeertubeNotifications() {
+    public List<NotificationData.Notification> getPeertubeNotifications() {
         return peertubeNotifications;
     }
 
-    public void setPeertubeNotifications(List<PeertubeNotification> peertubeNotifications) {
+    public void setPeertubeNotifications(List<NotificationData.Notification> peertubeNotifications) {
         this.peertubeNotifications = peertubeNotifications;
     }
 
 
-    public List<Playlist> getPlaylists() {
+    public List<PlaylistData.Playlist> getPlaylists() {
         return playlists;
     }
 
-    public void setPlaylists(List<Playlist> playlists) {
+    public void setPlaylists(List<PlaylistData.Playlist> playlists) {
         this.playlists = playlists;
     }
 
-    public List<PlaylistElement> getPlaylistForVideos() {
-        return playlistForVideos;
-    }
-
-    public void setPlaylistForVideos(List<PlaylistElement> playlistForVideos) {
-        this.playlistForVideos = playlistForVideos;
-    }
-
 
     public String getTargetedId() {
         return targetedId;
@@ -133,15 +130,6 @@ public class APIResponse {
     }
 
 
-
-    public List<Status> getStatuses() {
-        return statuses;
-    }
-
-    public void setStatuses(List<Status> statuses) {
-        this.statuses = statuses;
-    }
-
     public String getStringData() {
         return stringData;
     }
@@ -158,27 +146,27 @@ public class APIResponse {
         this.statusCode = statusCode;
     }
 
-    public List<Relationship> getRelationships() {
+    public List<Map<String, Boolean>> getRelationships() {
         return relationships;
     }
 
-    public void setRelationships(List<Relationship> relationships) {
+    public void setRelationships(List<Map<String, Boolean>> relationships) {
         this.relationships = relationships;
     }
 
-    public List<Instance> getInstances() {
+    public List<InstanceData.Instance> getInstances() {
         return instances;
     }
 
-    public void setInstances(List<Instance> instances) {
+    public void setInstances(List<InstanceData.Instance> instances) {
         this.instances = instances;
     }
 
-    public List<Caption> getCaptions() {
+    public List<CaptionData.Caption> getCaptions() {
         return captions;
     }
 
-    public void setCaptions(List<Caption> captions) {
+    public void setCaptions(List<CaptionData.Caption> captions) {
         this.captions = captions;
     }
 
@@ -189,4 +177,44 @@ public class APIResponse {
     public void setCaptionText(String captionText) {
         this.captionText = captionText;
     }
+
+    public List<ChannelData.Channel> getChannels() {
+        return channels;
+    }
+
+    public void setChannels(List<ChannelData.Channel> channels) {
+        this.channels = channels;
+    }
+
+    public List<CommentData.Comment> getComments() {
+        return comments;
+    }
+
+    public void setComments(List<CommentData.Comment> comments) {
+        this.comments = comments;
+    }
+
+    public Rating getRating() {
+        return rating;
+    }
+
+    public void setRating(Rating rating) {
+        this.rating = rating;
+    }
+
+    public OverviewVideo getOverviewVideo() {
+        return overviewVideo;
+    }
+
+    public void setOverviewVideo(OverviewVideo overviewVideo) {
+        this.overviewVideo = overviewVideo;
+    }
+
+    public String getActionReturn() {
+        return actionReturn;
+    }
+
+    public void setActionReturn(String actionReturn) {
+        this.actionReturn = actionReturn;
+    }
 }

app/src/main/java/app/fedilab/fedilabtube/client/HttpsConnection.java

@@ -53,7 +53,7 @@ import javax.net.ssl.HttpsURLConnection;
 
 import app.fedilab.fedilabtube.MainActivity;
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;

app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java

@@ -0,0 +1,260 @@
+package app.fedilab.fedilabtube.client;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import java.util.List;
+import java.util.Map;
+
+import app.fedilab.fedilabtube.client.data.AccountData;
+import app.fedilab.fedilabtube.client.data.CaptionData;
+import app.fedilab.fedilabtube.client.data.ChannelData;
+import app.fedilab.fedilabtube.client.data.CommentData;
+import app.fedilab.fedilabtube.client.data.InstanceData;
+import app.fedilab.fedilabtube.client.data.NotificationData;
+import app.fedilab.fedilabtube.client.data.PlaylistData;
+import app.fedilab.fedilabtube.client.data.VideoData;
+import app.fedilab.fedilabtube.client.entities.CaptionsParams;
+import app.fedilab.fedilabtube.client.entities.ChannelParams;
+import app.fedilab.fedilabtube.client.entities.OverviewVideo;
+import app.fedilab.fedilabtube.client.entities.PlaylistExist;
+import app.fedilab.fedilabtube.client.entities.PlaylistParams;
+import app.fedilab.fedilabtube.client.entities.Rating;
+import app.fedilab.fedilabtube.client.entities.RefreshToken;
+import app.fedilab.fedilabtube.client.entities.Report;
+import app.fedilab.fedilabtube.client.entities.VideoParams;
+import okhttp3.MultipartBody;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.DELETE;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Part;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.QueryMap;
+
+
+public interface PeertubeService {
+    @GET("instances")
+    Call<InstanceData> getInstances(@QueryMap Map<String, String> params, @Query("nsfwPolicy[]") String nsfwPolicy, @Query("categoriesOr[]") List<Integer> categories, @Query("languagesOr[]") List<String> languages);
+
+    //Server settings
+    @GET("videos/categories")
+    Call<Map<Integer, String>> getCategories();
+
+    @GET("videos/languages")
+    Call<Map<String, String>> getLanguages();
+
+    @GET("videos/privacies")
+    Call<Map<Integer, String>> getPrivacies();
+
+    @GET("video-playlists/privacies")
+    Call<Map<Integer, String>> getPlaylistsPrivacies();
+
+    @GET("videos/licences")
+    Call<Map<Integer, String>> getLicences();
+
+    //This one doesn't use api/v1 path
+    @GET("client/locales/{local}/server.json")
+    Call<Map<String, String>> getTranslations(@Path("local") String local);
+
+    //TOKEN
+    //Refresh
+    @POST("users/token")
+    Call<RefreshToken> refreshToken(@Query("grant_type") String grantType, @Query("client_id") String clientId, @Query("client_secret") String clientSecret, @Query("refresh_token") String refreshToken);
+
+    @GET("users/me")
+    Call<AccountData.Account> verifyCredentials(@Header("Authorization") String credentials);
+
+    //Timelines Authenticated
+    //Subscriber timeline
+    @GET("users/me/subscriptions/videos?sort=-publishedAt")
+    Call<List<VideoData.Video>> getSubscriptionVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+
+    //Overview videos
+    @GET("overviews/videos")
+    Call<OverviewVideo> getOverviewVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+
+    //Most liked videos
+    @GET("videos?sort=-likes")
+    Call<List<VideoData.Video>> getMostLikedVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+
+    //Most liked videos
+    @GET("videos?sort=-trending")
+    Call<List<VideoData.Video>> getTrendingVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+
+    //Recently added videos
+    @GET("videos?sort=-publishedAt")
+    Call<List<VideoData.Video>> getRecentlyAddedVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+
+    //Local videos
+    @GET("videos?sort=-publishedAt&filter=local")
+    Call<List<VideoData.Video>> getLocalVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+
+    //History
+    @GET("users/me/history/videos")
+    Call<List<VideoData.Video>> getHistory(@Query("start") String maxId);
+
+    //Search
+    @GET("search/videos")
+    Call<List<VideoData.Video>> searchVideos(@Query("search") String search, @Query("start") String maxId);
+
+    //Get notifications
+    @GET("users/me/notifications")
+    Call<List<NotificationData.Notification>> getNotifications(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("since_id") String sinceId);
+
+    //Get/Post/Update/Delete video
+    //Get a video
+    @GET("videos/{id}")
+    Call<VideoData.Video> getVideo(@Path("id") String id);
+
+    //Get my video
+    @GET("users/me/videos?sort=-publishedAt")
+    Call<VideoData.Video> getMyVideo(@Header("Authorization") String credentials, @Query("start") String maxId);
+
+    //Get my video
+    @GET("accounts/{name}/videos?sort=-publishedAt")
+    Call<VideoData.Video> getVideosForAccount(@Query("start") String maxId);
+
+    @POST("videos/upload")
+    Call<String> addVideo(@Header("Authorization") String credentials, @Body VideoParams videoParams, @Part MultipartBody.Part videofile, @Part MultipartBody.Part thumbnailfile, @Part MultipartBody.Part previewfile);
+
+    @PUT("videos/{id}")
+    Call<String> updateVideo(@Header("Authorization") String credentials, @Path("id") String videoId, @Body VideoParams videoParams, @Part MultipartBody.Part thumbnailfile, @Part MultipartBody.Part previewfile);
+
+    @DELETE("videos/{id}")
+    Call<String> deleteVideo(@Header("Authorization") String credentials, @Path("id") String videoId);
+
+
+    //Post/Update/Delete channel
+    //Channels for account
+    @GET("accounts/{accountId}/video-channels")
+    Call<ChannelData> getChannelsForAccount(@Path("accountId") String accountId);
+
+    //Get a channel
+    @GET("video-channels/{name}")
+    Call<ChannelData.Channel> getChannel(@Path("name") String name);
+
+    @GET("video-channels/{channelHandle}/videos")
+    Call<List<VideoData.Video>> getChannelVideos(@Path("channelHandle") String channelHandle, @Query("start") String maxId);
+
+    @POST("video-channels")
+    Call<String> addChannel(@Header("Authorization") String credentials, @Body ChannelParams channelParams);
+
+    @PUT("video-channels/{channelHandle}")
+    Call<String> updateChannel(@Header("Authorization") String credentials, @Path("channelHandle") String channelHandle, @Body ChannelParams channelParams);
+
+    @DELETE("video-channels/{channelHandle}")
+    Call<String> deleteChannel(@Header("Authorization") String credentials, @Path("channelHandle") String channelHandle);
+
+
+    //Get/Post/Update/Delete playlist
+    @GET("video-playlists")
+    Call<List<PlaylistData.Playlist>> getPlaylists();
+
+    @GET("video-playlists/{id}")
+    Call<PlaylistData.Playlist> getPlaylist(@Path("id") String id);
+
+    @GET("video-playlists/{id}/videos")
+    Call<List<VideoData.Video>> getVideosPlayList(@Path("id") String id);
+
+    @GET("users/me/video-playlists/videos-exist")
+    Call<List<PlaylistExist>> getVideoExistsInPlaylist(@Query("videoIds") List<String> videoIds);
+
+    @POST("video-playlists")
+    Call<String> addPlaylist(@Header("Authorization") String credentials, @Body PlaylistParams playlistParams, @Part MultipartBody.Part thumbnailfile);
+
+    @POST("video-playlists/{id}/videos")
+    Call<String> addVideoInPlaylist(@Header("Authorization") String credentials, @Path("id") String id, @Query("videoId") String videoId);
+
+    @PUT("video-playlists/{id}")
+    Call<String> updatePlaylist(@Header("Authorization") String credentials, @Path("id") String videoId, @Body PlaylistParams playlistParams, @Part MultipartBody.Part thumbnailfil);
+
+    @DELETE("video-playlists/{id}")
+    Call<String> deletePlaylist(@Header("Authorization") String credentials, @Path("id") String playlistId);
+
+    @DELETE("video-playlists/{id}/videos/{playlistElementId}")
+    Call<String> deleteVideoInPlaylist(@Header("Authorization") String credentials, @Path("id") String videoId, @Path("playlistElementId") String playlistElementId);
+
+    //Get/Update/Delete captions
+    @GET("videos/{id}/captions")
+    Call<List<CaptionData.Caption>> getCaptions(@Path("id") String videoId);
+
+    @PUT("videos/{id}/captions/{captionLanguage}")
+    Call<String> updateCaptions(@Header("Authorization") String credentials, @Path("id") String videoId, @Path("captionLanguage") String captionLanguage, @Body CaptionsParams captionsParams, @Part MultipartBody.Part captionfile);
+
+    @DELETE("videos/{id}/captions/{captionLanguage}")
+    Call<String> deleteCaptions(@Header("Authorization") String credentials, @Path("id") String videoId, @Path("captionLanguage") String captionLanguage);
+
+
+    //Subscribe/Unsubscribe
+    //subscribers
+    @GET("users/me/subscriptions")
+    Call<AccountData> getSubscription(@Header("Authorization") String credentials, @Query("start") String maxId);
+
+    @GET("users/me/subscriptions/exist")
+    Call<List<Map<String, Boolean>>> getSubscriptionsExist(@Header("Authorization") String credentials, @Query("uris") List<String> uris);
+
+    @POST("users/me/subscriptions")
+    Call<String> follow(@Header("Authorization") String credentials, @Query("uri") String uri);
+
+    @DELETE("users/me/subscriptions/{subscriptionHandle}")
+    Call<String> unfollow(@Header("Authorization") String credentials, @Path("subscriptionHandle") String subscriptionHandle);
+
+    //Mute/Unmute
+    //Muted accounts
+    @GET("users/me/blocklist/accounts")
+    Call<AccountData> getMuted(@Header("Authorization") String credentials, @Query("start") String maxId);
+
+    @POST("users/me/blocklist/accounts")
+    Call<String> mute(@Header("Authorization") String credentials, @Query("accountName") String accountName);
+
+    @DELETE("users/me/blocklist/accounts/{accountName}")
+    Call<String> unmute(@Header("Authorization") String credentials, @Path("accountName") String accountName);
+
+
+    //Get video rating
+    @GET("users/me/videos/{id}/rating")
+    Call<Rating> getRating(@Header("Authorization") String credentials, @Path("id") String id);
+
+    //Like/unlike
+    @PUT("videos/{id}/rate")
+    Call<String> rate(@Header("Authorization") String credentials, @Path("id") String id, @Query("rating") String rating);
+
+
+    //Comment
+    @GET("videos/{id}/comment-threads")
+    Call<List<CommentData.Comment>> getComments(String credentials, @Path("id") String id);
+
+    @GET("videos/{id}/comment-threads/{threadId}")
+    Call<List<CommentData.Comment>> getReplies(String credentials, @Path("id") String id, @Path("threadId") String threadId);
+
+    @POST("videos/{id}/comment-threads")
+    Call<String> postComment(@Header("Authorization") String credentials, @Path("id") String id, @Query("text") String text);
+
+    @POST("videos/{id}/comments/{commentId}")
+    Call<String> postReply(@Header("Authorization") String credentials, @Path("id") String id, @Path("commentId") String commentId, @Query("text") String text);
+
+    @DELETE("videos/{id}/comments/{commentId}")
+    Call<String> deleteComment(@Header("Authorization") String credentials, @Path("id") String id, @Path("commentId") String commentId);
+
+    @POST("abuse")
+    Call<String> report(@Header("Authorization") String credentials, @Body Report report);
+
+    @POST("abuse")
+    Call<String> register(@Query("email") String email, @Query("password") String password, @Query("username") String username, @Query("displayName") String displayName);
+}

app/src/main/java/app/fedilab/fedilabtube/client/TLSSocketFactory.java

@@ -1,93 +0,0 @@
-package app.fedilab.fedilabtube.client;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-
-public class TLSSocketFactory extends SSLSocketFactory {
-
-    private SSLSocketFactory sSLSocketFactory;
-    private SSLContext sslContext;
-
-
-    public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException {
-
-        sslContext = SSLContext.getInstance("TLS");
-        sslContext.init(null, null, null);
-        sSLSocketFactory = sslContext.getSocketFactory();
-
-    }
-
-    public SSLContext getSSLContext() {
-        return this.sslContext;
-    }
-
-
-    @Override
-    public String[] getDefaultCipherSuites() {
-        return sSLSocketFactory.getDefaultCipherSuites();
-    }
-
-    @Override
-    public String[] getSupportedCipherSuites() {
-        return sSLSocketFactory.getSupportedCipherSuites();
-    }
-
-    @Override
-    public Socket createSocket() throws IOException {
-        return enableTLSOnSocket(sSLSocketFactory.createSocket());
-    }
-
-    @Override
-    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
-        return enableTLSOnSocket(sSLSocketFactory.createSocket(s, host, port, autoClose));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port) throws IOException {
-        return enableTLSOnSocket(sSLSocketFactory.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException {
-        return enableTLSOnSocket(sSLSocketFactory.createSocket(host, port, localHost, localPort));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress host, int port) throws IOException {
-        return enableTLSOnSocket(sSLSocketFactory.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
-        return enableTLSOnSocket(sSLSocketFactory.createSocket(address, port, localAddress, localPort));
-    }
-
-    private Socket enableTLSOnSocket(Socket socket) {
-        if ((socket instanceof SSLSocket)) {
-            ((SSLSocket) socket).setEnabledProtocols(new String[]{"TLSv1.1", "TLSv1.2",});
-        }
-        return socket;
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/data/AccountData.java

@@ -0,0 +1,264 @@
+package app.fedilab.fedilabtube.client.data;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+import java.util.List;
+
+import app.fedilab.fedilabtube.client.entities.Avatar;
+
+
+@SuppressWarnings("unused")
+public class AccountData {
+
+    @SerializedName("total")
+    public int total;
+    @SerializedName("data")
+    public List<Account> data;
+
+    public static class Account implements Parcelable {
+        public static final Parcelable.Creator<Account> CREATOR = new Parcelable.Creator<Account>() {
+            @Override
+            public Account createFromParcel(Parcel source) {
+                return new Account(source);
+            }
+
+            @Override
+            public Account[] newArray(int size) {
+                return new Account[size];
+            }
+        };
+        @SerializedName("avatar")
+        private Avatar avatar;
+        @SerializedName("createdAt")
+        private Date createdAt;
+        @SerializedName("description")
+        private String description;
+        @SerializedName("displayName")
+        private String displayName;
+        @SerializedName("followersCount")
+        private int followersCount;
+        @SerializedName("followingCount")
+        private int followingCount;
+        @SerializedName("host")
+        private String host;
+        @SerializedName("hostRedundancyAllowed")
+        private boolean hostRedundancyAllowed;
+        @SerializedName("id")
+        private String id;
+        @SerializedName("name")
+        private String name;
+        @SerializedName("updatedAt")
+        private Date updatedAt;
+        @SerializedName("url")
+        private String url;
+        private String acct;
+        private String token;
+        private String client_id;
+        private String client_secret;
+        private String refresh_token;
+        private boolean selected;
+
+        public Account() {
+        }
+
+        protected Account(Parcel in) {
+            this.avatar = in.readParcelable(Avatar.class.getClassLoader());
+            long tmpCreatedAt = in.readLong();
+            this.createdAt = tmpCreatedAt == -1 ? null : new Date(tmpCreatedAt);
+            this.description = in.readString();
+            this.displayName = in.readString();
+            this.followersCount = in.readInt();
+            this.followingCount = in.readInt();
+            this.host = in.readString();
+            this.hostRedundancyAllowed = in.readByte() != 0;
+            this.id = in.readString();
+            this.name = in.readString();
+            long tmpUpdatedAt = in.readLong();
+            this.updatedAt = tmpUpdatedAt == -1 ? null : new Date(tmpUpdatedAt);
+            this.url = in.readString();
+        }
+
+        public Avatar getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(Avatar avatar) {
+            this.avatar = avatar;
+        }
+
+        public Date getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(Date createdAt) {
+            this.createdAt = createdAt;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getDisplayName() {
+            return displayName;
+        }
+
+        public void setDisplayName(String displayName) {
+            this.displayName = displayName;
+        }
+
+        public int getFollowersCount() {
+            return followersCount;
+        }
+
+        public void setFollowersCount(int followersCount) {
+            this.followersCount = followersCount;
+        }
+
+        public int getFollowingCount() {
+            return followingCount;
+        }
+
+        public void setFollowingCount(int followingCount) {
+            this.followingCount = followingCount;
+        }
+
+        public String getHost() {
+            return host;
+        }
+
+        public void setHost(String host) {
+            this.host = host;
+        }
+
+        public boolean isHostRedundancyAllowed() {
+            return hostRedundancyAllowed;
+        }
+
+        public void setHostRedundancyAllowed(boolean hostRedundancyAllowed) {
+            this.hostRedundancyAllowed = hostRedundancyAllowed;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Date getUpdatedAt() {
+            return updatedAt;
+        }
+
+        public void setUpdatedAt(Date updatedAt) {
+            this.updatedAt = updatedAt;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public boolean isSelected() {
+            return selected;
+        }
+
+        public void setSelected(boolean selected) {
+            this.selected = selected;
+        }
+
+        public String getAcct() {
+            return acct;
+        }
+
+        public void setAcct(String acct) {
+            this.acct = acct;
+        }
+
+        public String getToken() {
+            return token;
+        }
+
+        public void setToken(String token) {
+            this.token = token;
+        }
+
+        public String getClient_id() {
+            return client_id;
+        }
+
+        public void setClient_id(String client_id) {
+            this.client_id = client_id;
+        }
+
+        public String getClient_secret() {
+            return client_secret;
+        }
+
+        public void setClient_secret(String client_secret) {
+            this.client_secret = client_secret;
+        }
+
+        public String getRefresh_token() {
+            return refresh_token;
+        }
+
+        public void setRefresh_token(String refresh_token) {
+            this.refresh_token = refresh_token;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeParcelable(this.avatar, flags);
+            dest.writeLong(this.createdAt != null ? this.createdAt.getTime() : -1);
+            dest.writeString(this.description);
+            dest.writeString(this.displayName);
+            dest.writeInt(this.followersCount);
+            dest.writeInt(this.followingCount);
+            dest.writeString(this.host);
+            dest.writeByte(this.hostRedundancyAllowed ? (byte) 1 : (byte) 0);
+            dest.writeString(this.id);
+            dest.writeString(this.name);
+            dest.writeLong(this.updatedAt != null ? this.updatedAt.getTime() : -1);
+            dest.writeString(this.url);
+        }
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/data/CaptionData.java

@@ -0,0 +1,53 @@
+package app.fedilab.fedilabtube.client.data;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+import app.fedilab.fedilabtube.client.entities.Item;
+
+@SuppressWarnings("unused")
+public class CaptionData {
+
+    @SerializedName("total")
+    public int total;
+    @SerializedName("data")
+    public List<Caption> data;
+
+    public static class Caption {
+        @SerializedName("captionPath")
+        private String captionPath;
+        @SerializedName("language")
+        private Item language;
+
+        public String getCaptionPath() {
+            return captionPath;
+        }
+
+        public void setCaptionPath(String captionPath) {
+            this.captionPath = captionPath;
+        }
+
+        public Item getLanguage() {
+            return language;
+        }
+
+        public void setLanguage(Item language) {
+            this.language = language;
+        }
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/data/ChannelData.java

@@ -0,0 +1,271 @@
+package app.fedilab.fedilabtube.client.data;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import app.fedilab.fedilabtube.client.entities.Avatar;
+import app.fedilab.fedilabtube.client.entities.ViewsPerDay;
+
+@SuppressWarnings("unused")
+public class ChannelData {
+
+    @SerializedName("total")
+    public int total;
+    @SerializedName("data")
+    public List<Channel> data;
+
+    public static class Channel implements Parcelable {
+        public static final Creator<Channel> CREATOR = new Creator<Channel>() {
+            @Override
+            public Channel createFromParcel(Parcel source) {
+                return new Channel(source);
+            }
+
+            @Override
+            public Channel[] newArray(int size) {
+                return new Channel[size];
+            }
+        };
+        @SerializedName("avatar")
+        private Avatar avatar;
+        @SerializedName("createdAt")
+        private Date createdAt;
+        @SerializedName("description")
+        private String description;
+        @SerializedName("displayName")
+        private String displayName;
+        @SerializedName("followersCount")
+        private int followersCount;
+        @SerializedName("followingCount")
+        private int followingCount;
+        @SerializedName("host")
+        private String host;
+        @SerializedName("hostRedundancyAllowed")
+        private boolean hostRedundancyAllowed;
+        @SerializedName("id")
+        private String id;
+        @SerializedName("isLocal")
+        private boolean isLocal;
+        @SerializedName("name")
+        private String name;
+        @SerializedName("ownerAccount")
+        private AccountData.Account ownerAccount;
+        @SerializedName("support")
+        private String support;
+        @SerializedName("updatedAt")
+        private Date updatedAt;
+        @SerializedName("url")
+        private String url;
+        @SerializedName("viewsPerDay")
+        private List<ViewsPerDay> viewsPerDays;
+        private String acct;
+
+        public Channel() {
+        }
+
+        protected Channel(Parcel in) {
+            this.avatar = in.readParcelable(Avatar.class.getClassLoader());
+            long tmpCreatedAt = in.readLong();
+            this.createdAt = tmpCreatedAt == -1 ? null : new Date(tmpCreatedAt);
+            this.description = in.readString();
+            this.displayName = in.readString();
+            this.followersCount = in.readInt();
+            this.followingCount = in.readInt();
+            this.host = in.readString();
+            this.hostRedundancyAllowed = in.readByte() != 0;
+            this.id = in.readString();
+            this.isLocal = in.readByte() != 0;
+            this.name = in.readString();
+            this.ownerAccount = in.readParcelable(AccountData.Account.class.getClassLoader());
+            this.support = in.readString();
+            long tmpUpdatedAt = in.readLong();
+            this.updatedAt = tmpUpdatedAt == -1 ? null : new Date(tmpUpdatedAt);
+            this.url = in.readString();
+            this.viewsPerDays = new ArrayList<>();
+            in.readList(this.viewsPerDays, ViewsPerDay.class.getClassLoader());
+            this.acct = in.readString();
+        }
+
+        public Avatar getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(Avatar avatar) {
+            this.avatar = avatar;
+        }
+
+        public Date getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(Date createdAt) {
+            this.createdAt = createdAt;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getDisplayName() {
+            return displayName;
+        }
+
+        public void setDisplayName(String displayName) {
+            this.displayName = displayName;
+        }
+
+        public int getFollowersCount() {
+            return followersCount;
+        }
+
+        public void setFollowersCount(int followersCount) {
+            this.followersCount = followersCount;
+        }
+
+        public int getFollowingCount() {
+            return followingCount;
+        }
+
+        public void setFollowingCount(int followingCount) {
+            this.followingCount = followingCount;
+        }
+
+        public String getHost() {
+            return host;
+        }
+
+        public void setHost(String host) {
+            this.host = host;
+        }
+
+        public boolean isHostRedundancyAllowed() {
+            return hostRedundancyAllowed;
+        }
+
+        public void setHostRedundancyAllowed(boolean hostRedundancyAllowed) {
+            this.hostRedundancyAllowed = hostRedundancyAllowed;
+        }
+
+        public String getAcct() {
+            return acct;
+        }
+
+        public void setAcct(String acct) {
+            this.acct = acct;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public boolean isLocal() {
+            return isLocal;
+        }
+
+        public void setLocal(boolean local) {
+            isLocal = local;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public AccountData.Account getOwnerAccount() {
+            return ownerAccount;
+        }
+
+        public void setOwnerAccount(AccountData.Account ownerAccount) {
+            this.ownerAccount = ownerAccount;
+        }
+
+        public String getSupport() {
+            return support;
+        }
+
+        public void setSupport(String support) {
+            this.support = support;
+        }
+
+        public Date getUpdatedAt() {
+            return updatedAt;
+        }
+
+        public void setUpdatedAt(Date updatedAt) {
+            this.updatedAt = updatedAt;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public List<ViewsPerDay> getViewsPerDays() {
+            return viewsPerDays;
+        }
+
+        public void setViewsPerDays(List<ViewsPerDay> viewsPerDays) {
+            this.viewsPerDays = viewsPerDays;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeParcelable(this.avatar, flags);
+            dest.writeLong(this.createdAt != null ? this.createdAt.getTime() : -1);
+            dest.writeString(this.description);
+            dest.writeString(this.displayName);
+            dest.writeInt(this.followersCount);
+            dest.writeInt(this.followingCount);
+            dest.writeString(this.host);
+            dest.writeByte(this.hostRedundancyAllowed ? (byte) 1 : (byte) 0);
+            dest.writeString(this.id);
+            dest.writeByte(this.isLocal ? (byte) 1 : (byte) 0);
+            dest.writeString(this.name);
+            dest.writeParcelable(this.ownerAccount, flags);
+            dest.writeString(this.support);
+            dest.writeLong(this.updatedAt != null ? this.updatedAt.getTime() : -1);
+            dest.writeString(this.url);
+            dest.writeList(this.viewsPerDays);
+            dest.writeString(this.acct);
+        }
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/data/CommentData.java

@@ -0,0 +1,198 @@
+package app.fedilab.fedilabtube.client.data;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public class CommentData {
+
+    @SerializedName("total")
+    public int total;
+    @SerializedName("data")
+    public List<Comment> data;
+
+
+    public static class Comment {
+
+        @SerializedName("account")
+        private AccountData.Account account;
+        @SerializedName("createdAt")
+        private Date createdAt;
+        @SerializedName("description")
+        private String description;
+        @SerializedName("displayName")
+        private String displayName;
+        @SerializedName("followersCount")
+        private int followersCount;
+        @SerializedName("followingCount")
+        private int followingCount;
+        @SerializedName("host")
+        private String host;
+        @SerializedName("hostRedundancyAllowed")
+        private boolean hostRedundancyAllowed;
+        @SerializedName("id")
+        private String id;
+        @SerializedName("name")
+        private String name;
+        @SerializedName("updatedAt")
+        private String updatedAt;
+        @SerializedName("url")
+        private String url;
+
+
+        public AccountData.Account getAccount() {
+            return account;
+        }
+
+        public void setAccount(AccountData.Account account) {
+            this.account = account;
+        }
+
+        public Date getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(Date createdAt) {
+            this.createdAt = createdAt;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getDisplayName() {
+            return displayName;
+        }
+
+        public void setDisplayName(String displayName) {
+            this.displayName = displayName;
+        }
+
+        public int getFollowersCount() {
+            return followersCount;
+        }
+
+        public void setFollowersCount(int followersCount) {
+            this.followersCount = followersCount;
+        }
+
+        public int getFollowingCount() {
+            return followingCount;
+        }
+
+        public void setFollowingCount(int followingCount) {
+            this.followingCount = followingCount;
+        }
+
+        public String getHost() {
+            return host;
+        }
+
+        public void setHost(String host) {
+            this.host = host;
+        }
+
+        public boolean isHostRedundancyAllowed() {
+            return hostRedundancyAllowed;
+        }
+
+        public void setHostRedundancyAllowed(boolean hostRedundancyAllowed) {
+            this.hostRedundancyAllowed = hostRedundancyAllowed;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getUpdatedAt() {
+            return updatedAt;
+        }
+
+        public void setUpdatedAt(String updatedAt) {
+            this.updatedAt = updatedAt;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+    }
+
+    public static class NotificationComment {
+        @SerializedName("id")
+        private String id;
+        @SerializedName("threadId")
+        private String threadId;
+        @SerializedName("video")
+        private VideoData.Video video;
+        @SerializedName("account")
+        private AccountData.Account account;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getThreadId() {
+            return threadId;
+        }
+
+        public void setThreadId(String threadId) {
+            this.threadId = threadId;
+        }
+
+        public VideoData.Video getVideo() {
+            return video;
+        }
+
+        public void setVideo(VideoData.Video video) {
+            this.video = video;
+        }
+
+        public AccountData.Account getAccount() {
+            return account;
+        }
+
+        public void setAccount(AccountData.Account account) {
+            this.account = account;
+        }
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/data/InstanceData.java

@@ -0,0 +1,243 @@
+package app.fedilab.fedilabtube.client.data;
+
+import android.text.SpannableStringBuilder;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public class InstanceData {
+
+    @SerializedName("total")
+    public int total;
+    @SerializedName("data")
+    public List<Instance> data;
+
+
+    public static class Instance {
+
+        @SerializedName("autoBlacklistUserVideosEnabled")
+        private boolean autoBlacklistUserVideosEnabled;
+        @SerializedName("categories")
+        private List<Integer> categories;
+        @SerializedName("country")
+        private String country;
+        @SerializedName("createdAt")
+        private Date createdAt;
+        @SerializedName("defaultNSFWPolicy")
+        private String defaultNSFWPolicy;
+        @SerializedName("health")
+        private int health;
+        @SerializedName("host")
+        private String host;
+        @SerializedName("id")
+        private String id;
+        @SerializedName("languages")
+        private List<String> languages;
+        @SerializedName("name")
+        private String name;
+        @SerializedName("shortDescription")
+        private String shortDescription;
+        @SerializedName("signupAllowed")
+        private boolean signupAllowed;
+        @SerializedName("supportsIPv6")
+        private boolean supportsIPv6;
+        @SerializedName("totalInstanceFollowers")
+        private int totalInstanceFollowers;
+        @SerializedName("totalInstanceFollowing")
+        private int totalInstanceFollowing;
+        @SerializedName("totalLocalVideos")
+        private int totalLocalVideos;
+        @SerializedName("totalUsers")
+        private int totalUsers;
+        @SerializedName("totalVideos")
+        private int totalVideos;
+        @SerializedName("userVideoQuota")
+        private String userVideoQuota;
+        @SerializedName("version")
+        private String version;
+        @SerializedName("isNSFW")
+        private boolean isNSFW;
+        private SpannableStringBuilder spannableStringBuilder;
+
+        public boolean isAutoBlacklistUserVideosEnabled() {
+            return autoBlacklistUserVideosEnabled;
+        }
+
+        public void setAutoBlacklistUserVideosEnabled(boolean autoBlacklistUserVideosEnabled) {
+            this.autoBlacklistUserVideosEnabled = autoBlacklistUserVideosEnabled;
+        }
+
+        public String getCountry() {
+            return country;
+        }
+
+        public void setCountry(String country) {
+            this.country = country;
+        }
+
+        public Date getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(Date createdAt) {
+            this.createdAt = createdAt;
+        }
+
+        public String getDefaultNSFWPolicy() {
+            return defaultNSFWPolicy;
+        }
+
+        public void setDefaultNSFWPolicy(String defaultNSFWPolicy) {
+            this.defaultNSFWPolicy = defaultNSFWPolicy;
+        }
+
+        public int getHealth() {
+            return health;
+        }
+
+        public void setHealth(int health) {
+            this.health = health;
+        }
+
+        public String getHost() {
+            return host;
+        }
+
+        public void setHost(String host) {
+            this.host = host;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getShortDescription() {
+            return shortDescription;
+        }
+
+        public void setShortDescription(String shortDescription) {
+            this.shortDescription = shortDescription;
+        }
+
+        public boolean isSignupAllowed() {
+            return signupAllowed;
+        }
+
+        public void setSignupAllowed(boolean signupAllowed) {
+            this.signupAllowed = signupAllowed;
+        }
+
+        public boolean isSupportsIPv6() {
+            return supportsIPv6;
+        }
+
+        public void setSupportsIPv6(boolean supportsIPv6) {
+            this.supportsIPv6 = supportsIPv6;
+        }
+
+        public int getTotalInstanceFollowers() {
+            return totalInstanceFollowers;
+        }
+
+        public void setTotalInstanceFollowers(int totalInstanceFollowers) {
+            this.totalInstanceFollowers = totalInstanceFollowers;
+        }
+
+        public int getTotalInstanceFollowing() {
+            return totalInstanceFollowing;
+        }
+
+        public void setTotalInstanceFollowing(int totalInstanceFollowing) {
+            this.totalInstanceFollowing = totalInstanceFollowing;
+        }
+
+        public int getTotalLocalVideos() {
+            return totalLocalVideos;
+        }
+
+        public void setTotalLocalVideos(int totalLocalVideos) {
+            this.totalLocalVideos = totalLocalVideos;
+        }
+
+        public int getTotalUsers() {
+            return totalUsers;
+        }
+
+        public void setTotalUsers(int totalUsers) {
+            this.totalUsers = totalUsers;
+        }
+
+        public int getTotalVideos() {
+            return totalVideos;
+        }
+
+        public void setTotalVideos(int totalVideos) {
+            this.totalVideos = totalVideos;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public void setVersion(String version) {
+            this.version = version;
+        }
+
+        public boolean isNSFW() {
+            return isNSFW;
+        }
+
+        public void setNSFW(boolean NSFW) {
+            isNSFW = NSFW;
+        }
+
+        public String getUserVideoQuota() {
+            return userVideoQuota;
+        }
+
+        public void setUserVideoQuota(String userVideoQuota) {
+            this.userVideoQuota = userVideoQuota;
+        }
+
+        public SpannableStringBuilder getSpannableStringBuilder() {
+            return spannableStringBuilder;
+        }
+
+        public void setSpannableStringBuilder(SpannableStringBuilder spannableStringBuilder) {
+            this.spannableStringBuilder = spannableStringBuilder;
+        }
+
+        public List<String> getLanguages() {
+            return languages;
+        }
+
+        public void setLanguages(List<String> languages) {
+            this.languages = languages;
+        }
+
+        public List<Integer> getCategories() {
+            return categories;
+        }
+
+        public void setCategories(List<Integer> categories) {
+            this.categories = categories;
+        }
+    }
+
+}
+

app/src/main/java/app/fedilab/fedilabtube/client/data/NotificationData.java

@@ -0,0 +1,157 @@
+package app.fedilab.fedilabtube.client.data;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+import java.util.List;
+
+import app.fedilab.fedilabtube.client.entities.ActorFollow;
+import app.fedilab.fedilabtube.client.entities.VideoAbuse;
+import app.fedilab.fedilabtube.client.entities.VideoBlacklist;
+
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+@SuppressWarnings("unused")
+public class NotificationData {
+
+    @SerializedName("total")
+    public int total;
+    @SerializedName("data")
+    public List<Notification> data;
+
+    public static class Notification {
+        @SerializedName("id")
+        private String id;
+        @SerializedName("type")
+        private int type;
+        @SerializedName("read")
+        private boolean read;
+        @SerializedName("video")
+        private VideoData.Video video;
+        @SerializedName("videoImport")
+        private VideoData.VideoImport videoImport;
+        @SerializedName("comment")
+        private CommentData.NotificationComment comment;
+        @SerializedName("videoAbuse")
+        private VideoAbuse videoAbuse;
+        @SerializedName("videoBlacklist")
+        private VideoBlacklist videoBlacklist;
+        @SerializedName("account")
+        private AccountData.Account account;
+        @SerializedName("actorFollow")
+        private ActorFollow actorFollow;
+        @SerializedName("createdAt")
+        private Date createdAt;
+        @SerializedName("updatedAt")
+        private Date updatedAt;
+
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public boolean isRead() {
+            return read;
+        }
+
+        public void setRead(boolean read) {
+            this.read = read;
+        }
+
+        public VideoData.Video getVideo() {
+            return video;
+        }
+
+        public void setVideo(VideoData.Video video) {
+            this.video = video;
+        }
+
+        public VideoData.VideoImport getVideoImport() {
+            return videoImport;
+        }
+
+        public void setVideoImport(VideoData.VideoImport videoImport) {
+            this.videoImport = videoImport;
+        }
+
+        public CommentData.NotificationComment getComment() {
+            return comment;
+        }
+
+        public void setComment(CommentData.NotificationComment comment) {
+            this.comment = comment;
+        }
+
+        public VideoAbuse getVideoAbuse() {
+            return videoAbuse;
+        }
+
+        public void setVideoAbuse(VideoAbuse videoAbuse) {
+            this.videoAbuse = videoAbuse;
+        }
+
+        public VideoBlacklist getVideoBlacklist() {
+            return videoBlacklist;
+        }
+
+        public void setVideoBlacklist(VideoBlacklist videoBlacklist) {
+            this.videoBlacklist = videoBlacklist;
+        }
+
+        public AccountData.Account getAccount() {
+            return account;
+        }
+
+        public void setAccount(AccountData.Account account) {
+            this.account = account;
+        }
+
+        public ActorFollow getActorFollow() {
+            return actorFollow;
+        }
+
+        public void setActorFollow(ActorFollow actorFollow) {
+            this.actorFollow = actorFollow;
+        }
+
+        public Date getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(Date createdAt) {
+            this.createdAt = createdAt;
+        }
+
+        public Date getUpdatedAt() {
+            return updatedAt;
+        }
+
+        public void setUpdatedAt(Date updatedAt) {
+            this.updatedAt = updatedAt;
+        }
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/data/PlaylistData.java

@@ -0,0 +1,222 @@
+package app.fedilab.fedilabtube.client.data;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+import java.util.List;
+
+import app.fedilab.fedilabtube.client.entities.Item;
+
+@SuppressWarnings("unused")
+public class PlaylistData {
+
+    @SerializedName("total")
+    public int total;
+    @SerializedName("data")
+    public List<Playlist> data;
+
+    public static class Playlist implements Parcelable {
+        public static final Parcelable.Creator<Playlist> CREATOR = new Parcelable.Creator<Playlist>() {
+            @Override
+            public Playlist createFromParcel(Parcel source) {
+                return new Playlist(source);
+            }
+
+            @Override
+            public Playlist[] newArray(int size) {
+                return new Playlist[size];
+            }
+        };
+        @SerializedName("id")
+        private String id;
+        @SerializedName("createdAt")
+        private Date createdAt;
+        @SerializedName("updatedAt")
+        private Date updatedAt;
+        @SerializedName("description")
+        private String description;
+        @SerializedName("uuid")
+        private String uuid;
+        @SerializedName("displayName")
+        private String displayName;
+        @SerializedName("isLocal")
+        private boolean isLocal;
+        @SerializedName("videoLength")
+        private long videoLength;
+        @SerializedName("thumbnailPath")
+        private String thumbnailPath;
+        @SerializedName("privacy")
+        private Item privacy;
+        @SerializedName("type")
+        private Item type;
+        @SerializedName("ownerAccount")
+        private AccountData.Account ownerAccount;
+        @SerializedName("videoChannel")
+        private ChannelData.Channel videoChannel;
+
+        public Playlist() {
+        }
+
+        protected Playlist(Parcel in) {
+            this.id = in.readString();
+            long tmpCreatedAt = in.readLong();
+            this.createdAt = tmpCreatedAt == -1 ? null : new Date(tmpCreatedAt);
+            long tmpUpdatedAt = in.readLong();
+            this.updatedAt = tmpUpdatedAt == -1 ? null : new Date(tmpUpdatedAt);
+            this.description = in.readString();
+            this.uuid = in.readString();
+            this.displayName = in.readString();
+            this.isLocal = in.readByte() != 0;
+            this.videoLength = in.readLong();
+            this.thumbnailPath = in.readString();
+            this.privacy = in.readParcelable(Item.class.getClassLoader());
+            this.type = in.readParcelable(Item.class.getClassLoader());
+            this.ownerAccount = in.readParcelable(AccountData.Account.class.getClassLoader());
+            this.videoChannel = in.readParcelable(ChannelData.Channel.class.getClassLoader());
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public Date getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(Date createdAt) {
+            this.createdAt = createdAt;
+        }
+
+        public Date getUpdatedAt() {
+            return updatedAt;
+        }
+
+        public void setUpdatedAt(Date updatedAt) {
+            this.updatedAt = updatedAt;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getUuid() {
+            return uuid;
+        }
+
+        public void setUuid(String uuid) {
+            this.uuid = uuid;
+        }
+
+        public String getDisplayName() {
+            return displayName;
+        }
+
+        public void setDisplayName(String displayName) {
+            this.displayName = displayName;
+        }
+
+        public boolean isLocal() {
+            return isLocal;
+        }
+
+        public void setLocal(boolean local) {
+            isLocal = local;
+        }
+
+        public long getVideoLength() {
+            return videoLength;
+        }
+
+        public void setVideoLength(long videoLength) {
+            this.videoLength = videoLength;
+        }
+
+        public String getThumbnailPath() {
+            return thumbnailPath;
+        }
+
+        public void setThumbnailPath(String thumbnailPath) {
+            this.thumbnailPath = thumbnailPath;
+        }
+
+        public Item getPrivacy() {
+            return privacy;
+        }
+
+        public void setPrivacy(Item privacy) {
+            this.privacy = privacy;
+        }
+
+        public Item getType() {
+            return type;
+        }
+
+        public void setType(Item type) {
+            this.type = type;
+        }
+
+        public AccountData.Account getOwnerAccount() {
+            return ownerAccount;
+        }
+
+        public void setOwnerAccount(AccountData.Account ownerAccount) {
+            this.ownerAccount = ownerAccount;
+        }
+
+        public ChannelData.Channel getVideoChannel() {
+            return videoChannel;
+        }
+
+        public void setVideoChannel(ChannelData.Channel videoChannel) {
+            this.videoChannel = videoChannel;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeString(this.id);
+            dest.writeLong(this.createdAt != null ? this.createdAt.getTime() : -1);
+            dest.writeLong(this.updatedAt != null ? this.updatedAt.getTime() : -1);
+            dest.writeString(this.description);
+            dest.writeString(this.uuid);
+            dest.writeString(this.displayName);
+            dest.writeByte(this.isLocal ? (byte) 1 : (byte) 0);
+            dest.writeLong(this.videoLength);
+            dest.writeString(this.thumbnailPath);
+            dest.writeParcelable(this.privacy, flags);
+            dest.writeParcelable(this.type, flags);
+            dest.writeParcelable(this.ownerAccount, flags);
+            dest.writeParcelable(this.videoChannel, flags);
+        }
+    }
+
+}

app/src/main/java/app/fedilab/fedilabtube/client/data/VideoData.java

@@ -0,0 +1,609 @@
+package app.fedilab.fedilabtube.client.data;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
+import app.fedilab.fedilabtube.client.entities.File;
+import app.fedilab.fedilabtube.client.entities.Item;
+import app.fedilab.fedilabtube.helper.Helper;
+
+
+@SuppressWarnings("unused")
+public class VideoData {
+
+    @SerializedName("total")
+    public int total;
+    @SerializedName("data")
+    public List<Video> data;
+
+    public static class Video implements Parcelable {
+        public static final Creator<Video> CREATOR = new Creator<Video>() {
+            @Override
+            public Video createFromParcel(Parcel source) {
+                return new Video(source);
+            }
+
+            @Override
+            public Video[] newArray(int size) {
+                return new Video[size];
+            }
+        };
+        @SerializedName("account")
+        private Account account;
+        @SerializedName("blacklisted")
+        private boolean blacklisted;
+        @SerializedName("blacklistedReason")
+        private String blacklistedReason;
+        @SerializedName("category")
+        private Item item;
+        @SerializedName("channel")
+        private ChannelData.Channel channel;
+        @SerializedName("commentsEnabled")
+        private boolean commentsEnabled;
+        @SerializedName("createdAt")
+        private Date createdAt;
+        @SerializedName("description")
+        private String description;
+        @SerializedName("descriptionPath")
+        private String descriptionPath;
+        @SerializedName("dislikes")
+        private int dislikes;
+        @SerializedName("downloadEnabled")
+        private boolean downloadEnabled;
+        @SerializedName("duration")
+        private int duration;
+        @SerializedName("embedPath")
+        private String embedPath;
+        @SerializedName("files")
+        private List<File> files;
+        @SerializedName("id")
+        private String id;
+        @SerializedName("isLocal")
+        private boolean isLocal;
+        @SerializedName("language")
+        private Item language;
+        @SerializedName("licence")
+        private Item licence;
+        @SerializedName("likes")
+        private int likes;
+        @SerializedName("name")
+        private String name;
+        @SerializedName("nsfw")
+        private boolean nsfw;
+        @SerializedName("originallyPublishedAt")
+        private Date originallyPublishedAt;
+        @SerializedName("previewPath")
+        private String previewPath;
+        @SerializedName("privacy")
+        private Item privacy;
+        @SerializedName("publishedAt")
+        private Date publishedAt;
+        @SerializedName("state")
+        private Item state;
+        @SerializedName("streamingPlaylists")
+        private String[] streamingPlaylists;
+        @SerializedName("support")
+        private String support;
+        @SerializedName("tags")
+        private String[] tags;
+        @SerializedName("thumbnailPath")
+        private String thumbnailPath;
+        @SerializedName("trackerUrls")
+        private String[] trackerUrls;
+        @SerializedName("updatedAt")
+        private Date updatedAt;
+        @SerializedName("uuid")
+        private String uuid;
+        @SerializedName("views")
+        private int views;
+        @SerializedName("waitTranscoding")
+        private boolean waitTranscoding;
+        private String myRating;
+
+
+        public Video() {
+        }
+
+        protected Video(Parcel in) {
+            this.account = in.readParcelable(Account.class.getClassLoader());
+            this.blacklisted = in.readByte() != 0;
+            this.blacklistedReason = in.readString();
+            this.item = in.readParcelable(Item.class.getClassLoader());
+            this.channel = in.readParcelable(ChannelData.Channel.class.getClassLoader());
+            this.commentsEnabled = in.readByte() != 0;
+            long tmpCreatedAt = in.readLong();
+            this.createdAt = tmpCreatedAt == -1 ? null : new Date(tmpCreatedAt);
+            this.description = in.readString();
+            this.descriptionPath = in.readString();
+            this.dislikes = in.readInt();
+            this.downloadEnabled = in.readByte() != 0;
+            this.duration = in.readInt();
+            this.embedPath = in.readString();
+            this.files = new ArrayList<>();
+            in.readList(this.files, File.class.getClassLoader());
+            this.id = in.readString();
+            this.isLocal = in.readByte() != 0;
+            this.language = in.readParcelable(Item.class.getClassLoader());
+            this.licence = in.readParcelable(Item.class.getClassLoader());
+            this.likes = in.readInt();
+            this.name = in.readString();
+            this.nsfw = in.readByte() != 0;
+            long tmpOriginallyPublishedAt = in.readLong();
+            this.originallyPublishedAt = tmpOriginallyPublishedAt == -1 ? null : new Date(tmpOriginallyPublishedAt);
+            this.previewPath = in.readString();
+            this.privacy = in.readParcelable(Item.class.getClassLoader());
+            long tmpPublishedAt = in.readLong();
+            this.publishedAt = tmpPublishedAt == -1 ? null : new Date(tmpPublishedAt);
+            this.state = in.readParcelable(Item.class.getClassLoader());
+            this.streamingPlaylists = in.createStringArray();
+            this.support = in.readString();
+            this.tags = in.createStringArray();
+            this.thumbnailPath = in.readString();
+            this.trackerUrls = in.createStringArray();
+            long tmpUpdatedAt = in.readLong();
+            this.updatedAt = tmpUpdatedAt == -1 ? null : new Date(tmpUpdatedAt);
+            this.uuid = in.readString();
+            this.views = in.readInt();
+            this.waitTranscoding = in.readByte() != 0;
+        }
+
+        public String getFileUrl(String resolution, Context context) {
+
+            if (resolution != null) {
+                for (File file : files) {
+                    SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+                    boolean streamService = sharedpreferences.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL) == Helper.VIDEO_MODE_STREAMING;
+                    if (file.getResolutions().getLabel().compareTo(resolution) == 0) {
+                        if (streamService) {
+                            return file.getMagnetUri();
+                        } else {
+                            return file.getFileUrl();
+
+                        }
+                    }
+                }
+            }
+            return files.get(0).getFileUrl();
+        }
+
+        public String getTorrentUrl(String resolution) {
+            for (File file : files) {
+                if (file.getResolutions().getLabel().compareTo(resolution) == 0) {
+                    return file.getTorrentUrl();
+                }
+            }
+            return files.get(0).getTorrentUrl();
+
+        }
+
+        public String getTorrentDownloadUrl(String resolution) {
+            for (File file : files) {
+                if (file.getResolutions().getLabel().compareTo(resolution) == 0) {
+                    return file.getTorrentDownloadUrl();
+                }
+            }
+            return files.get(0).getTorrentDownloadUrl();
+
+        }
+
+        public String getFileDownloadUrl(String resolution) {
+            if (resolution != null) {
+                for (File file : files) {
+                    if (file.getResolutions().getLabel().compareTo(resolution) == 0) {
+                        return file.getFileDownloadUrl();
+                    }
+                }
+            }
+            return files.get(0).getFileDownloadUrl();
+        }
+
+        public Account getAccount() {
+            return account;
+        }
+
+        public void setAccount(Account account) {
+            this.account = account;
+        }
+
+        public boolean isBlacklisted() {
+            return blacklisted;
+        }
+
+        public void setBlacklisted(boolean blacklisted) {
+            this.blacklisted = blacklisted;
+        }
+
+        public String getBlacklistedReason() {
+            return blacklistedReason;
+        }
+
+        public void setBlacklistedReason(String blacklistedReason) {
+            this.blacklistedReason = blacklistedReason;
+        }
+
+        public Item getItem() {
+            return item;
+        }
+
+        public void setItem(Item item) {
+            this.item = item;
+        }
+
+        public ChannelData.Channel getChannel() {
+            return channel;
+        }
+
+        public void setChannel(ChannelData.Channel channel) {
+            this.channel = channel;
+        }
+
+        public boolean isCommentsEnabled() {
+            return commentsEnabled;
+        }
+
+        public void setCommentsEnabled(boolean commentsEnabled) {
+            this.commentsEnabled = commentsEnabled;
+        }
+
+        public Date getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(Date createdAt) {
+            this.createdAt = createdAt;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getDescriptionPath() {
+            return descriptionPath;
+        }
+
+        public void setDescriptionPath(String descriptionPath) {
+            this.descriptionPath = descriptionPath;
+        }
+
+        public int getDislikes() {
+            return dislikes;
+        }
+
+        public void setDislikes(int dislikes) {
+            this.dislikes = dislikes;
+        }
+
+        public boolean isDownloadEnabled() {
+            return downloadEnabled;
+        }
+
+        public void setDownloadEnabled(boolean downloadEnabled) {
+            this.downloadEnabled = downloadEnabled;
+        }
+
+        public int getDuration() {
+            return duration;
+        }
+
+        public void setDuration(int duration) {
+            this.duration = duration;
+        }
+
+        public String getEmbedPath() {
+            return embedPath;
+        }
+
+        public void setEmbedPath(String embedPath) {
+            this.embedPath = embedPath;
+        }
+
+        public List<File> getFiles() {
+            return files;
+        }
+
+        public void setFiles(List<File> files) {
+            this.files = files;
+        }
+
+        public String getMyRating() {
+            return myRating;
+        }
+
+        public void setMyRating(String myRating) {
+            this.myRating = myRating;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public boolean isLocal() {
+            return isLocal;
+        }
+
+        public void setLocal(boolean local) {
+            isLocal = local;
+        }
+
+        public Item getLanguage() {
+            return language;
+        }
+
+        public void setLanguage(Item language) {
+            this.language = language;
+        }
+
+        public Item getLicence() {
+            return licence;
+        }
+
+        public void setLicence(Item licence) {
+            this.licence = licence;
+        }
+
+        public int getLikes() {
+            return likes;
+        }
+
+        public void setLikes(int likes) {
+            this.likes = likes;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public boolean isNsfw() {
+            return nsfw;
+        }
+
+        public void setNsfw(boolean nsfw) {
+            this.nsfw = nsfw;
+        }
+
+        public Date getOriginallyPublishedAt() {
+            return originallyPublishedAt;
+        }
+
+        public void setOriginallyPublishedAt(Date originallyPublishedAt) {
+            this.originallyPublishedAt = originallyPublishedAt;
+        }
+
+        public String getPreviewPath() {
+            return previewPath;
+        }
+
+        public void setPreviewPath(String previewPath) {
+            this.previewPath = previewPath;
+        }
+
+        public Item getPrivacy() {
+            return privacy;
+        }
+
+        public void setPrivacy(Item privacy) {
+            this.privacy = privacy;
+        }
+
+        public Date getPublishedAt() {
+            return publishedAt;
+        }
+
+        public void setPublishedAt(Date publishedAt) {
+            this.publishedAt = publishedAt;
+        }
+
+        public Item getState() {
+            return state;
+        }
+
+        public void setState(Item state) {
+            this.state = state;
+        }
+
+        public String[] getStreamingPlaylists() {
+            return streamingPlaylists;
+        }
+
+        public void setStreamingPlaylists(String[] streamingPlaylists) {
+            this.streamingPlaylists = streamingPlaylists;
+        }
+
+        public String getSupport() {
+            return support;
+        }
+
+        public void setSupport(String support) {
+            this.support = support;
+        }
+
+        public String[] getTags() {
+            return tags;
+        }
+
+        public void setTags(String[] tags) {
+            this.tags = tags;
+        }
+
+        public String getThumbnailPath() {
+            return thumbnailPath;
+        }
+
+        public void setThumbnailPath(String thumbnailPath) {
+            this.thumbnailPath = thumbnailPath;
+        }
+
+        public String[] getTrackerUrls() {
+            return trackerUrls;
+        }
+
+        public void setTrackerUrls(String[] trackerUrls) {
+            this.trackerUrls = trackerUrls;
+        }
+
+        public Date getUpdatedAt() {
+            return updatedAt;
+        }
+
+        public void setUpdatedAt(Date updatedAt) {
+            this.updatedAt = updatedAt;
+        }
+
+        public String getUuid() {
+            return uuid;
+        }
+
+        public void setUuid(String uuid) {
+            this.uuid = uuid;
+        }
+
+        public int getViews() {
+            return views;
+        }
+
+        public void setViews(int views) {
+            this.views = views;
+        }
+
+        public boolean isWaitTranscoding() {
+            return waitTranscoding;
+        }
+
+        public void setWaitTranscoding(boolean waitTranscoding) {
+            this.waitTranscoding = waitTranscoding;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeParcelable(this.account, flags);
+            dest.writeByte(this.blacklisted ? (byte) 1 : (byte) 0);
+            dest.writeString(this.blacklistedReason);
+            dest.writeParcelable(this.item, flags);
+            dest.writeParcelable(this.channel, flags);
+            dest.writeByte(this.commentsEnabled ? (byte) 1 : (byte) 0);
+            dest.writeLong(this.createdAt != null ? this.createdAt.getTime() : -1);
+            dest.writeString(this.description);
+            dest.writeString(this.descriptionPath);
+            dest.writeInt(this.dislikes);
+            dest.writeByte(this.downloadEnabled ? (byte) 1 : (byte) 0);
+            dest.writeInt(this.duration);
+            dest.writeString(this.embedPath);
+            dest.writeList(this.files);
+            dest.writeString(this.id);
+            dest.writeByte(this.isLocal ? (byte) 1 : (byte) 0);
+            dest.writeParcelable(this.language, flags);
+            dest.writeParcelable(this.licence, flags);
+            dest.writeInt(this.likes);
+            dest.writeString(this.name);
+            dest.writeByte(this.nsfw ? (byte) 1 : (byte) 0);
+            dest.writeLong(this.originallyPublishedAt != null ? this.originallyPublishedAt.getTime() : -1);
+            dest.writeString(this.previewPath);
+            dest.writeParcelable(this.privacy, flags);
+            dest.writeLong(this.publishedAt != null ? this.publishedAt.getTime() : -1);
+            dest.writeParcelable(this.state, flags);
+            dest.writeStringArray(this.streamingPlaylists);
+            dest.writeString(this.support);
+            dest.writeStringArray(this.tags);
+            dest.writeString(this.thumbnailPath);
+            dest.writeStringArray(this.trackerUrls);
+            dest.writeLong(this.updatedAt != null ? this.updatedAt.getTime() : -1);
+            dest.writeString(this.uuid);
+            dest.writeInt(this.views);
+            dest.writeByte(this.waitTranscoding ? (byte) 1 : (byte) 0);
+        }
+    }
+
+    public static class VideoImport {
+        @SerializedName("id")
+        private String id;
+        @SerializedName("video")
+        private Video video;
+        @SerializedName("torrentName")
+        private String torrentName;
+        @SerializedName("magnetUri")
+        private String magnetUri;
+        @SerializedName("targetUri")
+        private String targetUri;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public Video getVideo() {
+            return video;
+        }
+
+        public void setVideo(Video video) {
+            this.video = video;
+        }
+
+        public String getTorrentName() {
+            return torrentName;
+        }
+
+        public void setTorrentName(String torrentName) {
+            this.torrentName = torrentName;
+        }
+
+        public String getMagnetUri() {
+            return magnetUri;
+        }
+
+        public void setMagnetUri(String magnetUri) {
+            this.magnetUri = magnetUri;
+        }
+
+        public String getTargetUri() {
+            return targetUri;
+        }
+
+        public void setTargetUri(String targetUri) {
+            this.targetUri = targetUri;
+        }
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Account.java

@@ -1,550 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Date;
-
-
-@SuppressWarnings("unused")
-public class Account implements Parcelable {
-
-    public static final Creator<Account> CREATOR = new Creator<Account>() {
-        @Override
-        public Account createFromParcel(Parcel source) {
-            return new Account(source);
-        }
-
-        @Override
-        public Account[] newArray(int size) {
-            return new Account[size];
-        }
-    };
-    private String id;
-    private String uuid;
-    private String username;
-    private String acct;
-    private String display_name;
-    private boolean locked;
-    private Date created_at;
-    private Date updated_at;
-    private int followers_count;
-    private int following_count;
-    private int statuses_count;
-    private String followers_count_str;
-    private String following_count_str;
-    private String statuses_count_str;
-    private String note;
-    private SpannableString noteSpan;
-    private String url;
-    private String avatar;
-    private String avatar_static;
-    private String header;
-    private String header_static;
-    private String token;
-    private String instance;
-    private boolean isFollowing;
-    private followAction followType = followAction.NOTHING;
-    private boolean isMakingAction = false;
-    private Account channelOwner;
-    private boolean muting_notifications;
-    private String host;
-    private boolean isBot;
-    private String social;
-    private String client_id;
-    private String client_secret;
-    private String refresh_token;
-    private boolean isModerator = false;
-    private boolean isAdmin = false;
-    private String privacy = "public";
-    private boolean sensitive = false;
-    private String locale;
-    private String invite_request;
-    private String created_by_application_id;
-    private String invited_by_account_id;
-    private boolean isSelected;
-
-    public Account() {
-    }
-
-    protected Account(Parcel in) {
-        this.id = in.readString();
-        this.uuid = in.readString();
-        this.username = in.readString();
-        this.acct = in.readString();
-        this.display_name = in.readString();
-        this.locked = in.readByte() != 0;
-        long tmpCreated_at = in.readLong();
-        this.created_at = tmpCreated_at == -1 ? null : new Date(tmpCreated_at);
-        long tmpUpdated_at = in.readLong();
-        this.updated_at = tmpUpdated_at == -1 ? null : new Date(tmpUpdated_at);
-        this.followers_count = in.readInt();
-        this.following_count = in.readInt();
-        this.statuses_count = in.readInt();
-        this.followers_count_str = in.readString();
-        this.following_count_str = in.readString();
-        this.statuses_count_str = in.readString();
-        this.note = in.readString();
-        this.noteSpan = (SpannableString) TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
-        this.url = in.readString();
-        this.avatar = in.readString();
-        this.avatar_static = in.readString();
-        this.header = in.readString();
-        this.header_static = in.readString();
-        this.token = in.readString();
-        this.instance = in.readString();
-        this.isFollowing = in.readByte() != 0;
-        int tmpFollowType = in.readInt();
-        this.followType = tmpFollowType == -1 ? null : followAction.values()[tmpFollowType];
-        this.isMakingAction = in.readByte() != 0;
-        this.channelOwner = in.readParcelable(Account.class.getClassLoader());
-        this.muting_notifications = in.readByte() != 0;
-        this.host = in.readString();
-        this.isBot = in.readByte() != 0;
-        this.social = in.readString();
-        this.client_id = in.readString();
-        this.client_secret = in.readString();
-        this.refresh_token = in.readString();
-        this.isModerator = in.readByte() != 0;
-        this.isAdmin = in.readByte() != 0;
-        this.privacy = in.readString();
-        this.sensitive = in.readByte() != 0;
-        this.locale = in.readString();
-        this.invite_request = in.readString();
-        this.created_by_application_id = in.readString();
-        this.invited_by_account_id = in.readString();
-    }
-
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(this.id);
-        dest.writeString(this.uuid);
-        dest.writeString(this.username);
-        dest.writeString(this.acct);
-        dest.writeString(this.display_name);
-        dest.writeByte(this.locked ? (byte) 1 : (byte) 0);
-        dest.writeLong(this.created_at != null ? this.created_at.getTime() : -1);
-        dest.writeLong(this.updated_at != null ? this.updated_at.getTime() : -1);
-        dest.writeInt(this.followers_count);
-        dest.writeInt(this.following_count);
-        dest.writeInt(this.statuses_count);
-        dest.writeString(this.followers_count_str);
-        dest.writeString(this.following_count_str);
-        dest.writeString(this.statuses_count_str);
-        dest.writeString(this.note);
-        TextUtils.writeToParcel(this.noteSpan, dest, flags);
-        dest.writeString(this.url);
-        dest.writeString(this.avatar);
-        dest.writeString(this.avatar_static);
-        dest.writeString(this.header);
-        dest.writeString(this.header_static);
-        dest.writeString(this.token);
-        dest.writeString(this.instance);
-        dest.writeByte(this.isFollowing ? (byte) 1 : (byte) 0);
-        dest.writeInt(this.followType == null ? -1 : this.followType.ordinal());
-        dest.writeByte(this.isMakingAction ? (byte) 1 : (byte) 0);
-        dest.writeParcelable(this.channelOwner, flags);
-        dest.writeByte(this.muting_notifications ? (byte) 1 : (byte) 0);
-        dest.writeString(this.host);
-        dest.writeByte(this.isBot ? (byte) 1 : (byte) 0);
-        dest.writeString(this.social);
-        dest.writeString(this.client_id);
-        dest.writeString(this.client_secret);
-        dest.writeString(this.refresh_token);
-        dest.writeByte(this.isModerator ? (byte) 1 : (byte) 0);
-        dest.writeByte(this.isAdmin ? (byte) 1 : (byte) 0);
-        dest.writeString(this.privacy);
-        dest.writeByte(this.sensitive ? (byte) 1 : (byte) 0);
-        dest.writeString(this.locale);
-        dest.writeString(this.invite_request);
-        dest.writeString(this.created_by_application_id);
-        dest.writeString(this.invited_by_account_id);
-    }
-
-    public followAction getFollowType() {
-        return followType;
-    }
-
-    public void setFollowType(followAction followType) {
-        this.followType = followType;
-    }
-
-    public boolean isMakingAction() {
-        return isMakingAction;
-    }
-
-    public void setMakingAction(boolean makingAction) {
-        isMakingAction = makingAction;
-    }
-
-    public Account getchannelOwner() {
-        return channelOwner;
-    }
-
-    public void setchannelOwner(Account moved_to_account) {
-        this.channelOwner = moved_to_account;
-    }
-
-    public boolean isMuting_notifications() {
-        return muting_notifications;
-    }
-
-    public void setMuting_notifications(boolean muting_notifications) {
-        this.muting_notifications = muting_notifications;
-    }
-
-    public boolean isSelected() {
-        return isSelected;
-    }
-
-    public void setSelected(boolean selected) {
-        isSelected = selected;
-    }
-
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public boolean isBot() {
-        return isBot;
-    }
-
-    public void setBot(boolean bot) {
-        isBot = bot;
-    }
-
-    public String getSocial() {
-        return social;
-    }
-
-    public void setSocial(String social) {
-        this.social = social;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getClient_id() {
-        return client_id;
-    }
-
-    public void setClient_id(String client_id) {
-        this.client_id = client_id;
-    }
-
-    public String getClient_secret() {
-        return client_secret;
-    }
-
-    public void setClient_secret(String client_secret) {
-        this.client_secret = client_secret;
-    }
-
-    public String getRefresh_token() {
-        return refresh_token;
-    }
-
-    public void setRefresh_token(String refresh_token) {
-        this.refresh_token = refresh_token;
-    }
-
-    public boolean isModerator() {
-        return isModerator;
-    }
-
-    public void setModerator(boolean moderator) {
-        isModerator = moderator;
-    }
-
-    public boolean isAdmin() {
-        return isAdmin;
-    }
-
-    public void setAdmin(boolean admin) {
-        isAdmin = admin;
-    }
-
-    public Date getUpdated_at() {
-        return updated_at;
-    }
-
-    public void setUpdated_at(Date updated_at) {
-        this.updated_at = updated_at;
-    }
-
-    public String getPrivacy() {
-        return privacy;
-    }
-
-    public void setPrivacy(String privacy) {
-        this.privacy = privacy;
-    }
-
-    public boolean isSensitive() {
-        return sensitive;
-    }
-
-    public void setSensitive(boolean sensitive) {
-        this.sensitive = sensitive;
-    }
-
-    public String getLocale() {
-        return locale;
-    }
-
-    public void setLocale(String locale) {
-        this.locale = locale;
-    }
-
-    public String getInvite_request() {
-        return invite_request;
-    }
-
-    public void setInvite_request(String invite_request) {
-        this.invite_request = invite_request;
-    }
-
-    public String getCreated_by_application_id() {
-        return created_by_application_id;
-    }
-
-    public void setCreated_by_application_id(String created_by_application_id) {
-        this.created_by_application_id = created_by_application_id;
-    }
-
-    public String getInvited_by_account_id() {
-        return invited_by_account_id;
-    }
-
-    public void setInvited_by_account_id(String invited_by_account_id) {
-        this.invited_by_account_id = invited_by_account_id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-
-    public String getAcct() {
-        return acct;
-    }
-
-    public void setAcct(String acct) {
-        this.acct = acct;
-    }
-
-    public String getDisplay_name() {
-        return display_name;
-    }
-
-    public void setDisplay_name(String display_name) {
-        this.display_name = display_name;
-    }
-
-    public boolean isLocked() {
-        return locked;
-    }
-
-    public void setLocked(boolean locked) {
-        this.locked = locked;
-    }
-
-    public Date getCreated_at() {
-        return created_at;
-    }
-
-    public void setCreated_at(Date created_at) {
-        this.created_at = created_at;
-    }
-
-    public int getFollowers_count() {
-        return followers_count;
-    }
-
-    public void setFollowers_count(int followers_count) {
-        this.followers_count = followers_count;
-    }
-
-    public int getFollowing_count() {
-        return following_count;
-    }
-
-    public void setFollowing_count(int following_count) {
-        this.following_count = following_count;
-    }
-
-    public int getStatuses_count() {
-        return statuses_count;
-    }
-
-    public void setStatuses_count(int statuses_count) {
-        this.statuses_count = statuses_count;
-    }
-
-    public SpannableString getNoteSpan() {
-        return noteSpan;
-    }
-
-    public void setNoteSpan(SpannableString noteSpan) {
-        this.noteSpan = noteSpan;
-    }
-
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getAvatar_static() {
-        return avatar_static;
-    }
-
-    public void setAvatar_static(String avatar_static) {
-        this.avatar_static = avatar_static;
-    }
-
-    public String getHeader() {
-        return header;
-    }
-
-    public void setHeader(String header) {
-        this.header = header;
-    }
-
-    public String getHeader_static() {
-        return header_static;
-    }
-
-    public void setHeader_static(String header_static) {
-        this.header_static = header_static;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getInstance() {
-        return instance;
-    }
-
-    public void setInstance(String instance) {
-        this.instance = instance;
-    }
-
-    public boolean isFollowing() {
-        return isFollowing;
-    }
-
-    public void setFollowing(boolean following) {
-        isFollowing = following;
-    }
-
-    public String getFollowers_count_str() {
-        return followers_count_str;
-    }
-
-    public void setFollowers_count_str(String followers_count_str) {
-        this.followers_count_str = followers_count_str;
-    }
-
-    public String getFollowing_count_str() {
-        return following_count_str;
-    }
-
-    public void setFollowing_count_str(String following_count_str) {
-        this.following_count_str = following_count_str;
-    }
-
-    public String getStatuses_count_str() {
-        return statuses_count_str;
-    }
-
-    public void setStatuses_count_str(String statuses_count_str) {
-        this.statuses_count_str = statuses_count_str;
-    }
-
-
-    @NotNull
-    public String toString() {
-        return this.getAcct() + " - " + this.getUrl();
-    }
-
-    public enum followAction {
-        FOLLOW,
-        NOT_FOLLOW,
-        BLOCK,
-        MUTE,
-        REQUEST_SENT,
-        NOTHING
-    }
-
-
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Actor.java

@@ -14,37 +14,26 @@ package app.fedilab.fedilabtube.client.entities;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-public class PeertubeAccountNotification {
+import com.google.gson.annotations.SerializedName;
 
-    private String id;
+public class Actor {
-    private String avatar;
+    @SerializedName("type")
-    private String displayName;
-    private String name;
     private String type;
+    @SerializedName("name")
+    private String name;
+    @SerializedName("displayName")
+    private String displayName;
+    @SerializedName("host")
     private String host;
+    @SerializedName("avatar")
+    private Avatar avatar;
 
-    public String getId() {
+    public String getType() {
-        return id;
+        return type;
     }
 
-    public void setId(String id) {
+    public void setType(String type) {
-        this.id = id;
+        this.type = type;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
     }
 
     public String getName() {
@@ -55,12 +44,12 @@ public class PeertubeAccountNotification {
         this.name = name;
     }
 
-    public String getType() {
+    public String getDisplayName() {
-        return type;
+        return displayName;
     }
 
-    public void setType(String type) {
+    public void setDisplayName(String displayName) {
-        this.type = type;
+        this.displayName = displayName;
     }
 
     public String getHost() {
@@ -70,4 +59,12 @@ public class PeertubeAccountNotification {
     public void setHost(String host) {
         this.host = host;
     }
+
+    public Avatar getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(Avatar avatar) {
+        this.avatar = avatar;
+    }
 }

app/src/main/java/app/fedilab/fedilabtube/client/entities/ActorFollow.java

@@ -14,15 +14,19 @@ package app.fedilab.fedilabtube.client.entities;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-public class PeertubeActorFollow {
+import com.google.gson.annotations.SerializedName;
 
+@SuppressWarnings("unused")
+public class ActorFollow {
+
+    @SerializedName("id")
     private String id;
-    private PeertubeAccountNotification follower;
+    @SerializedName("follower")
-    private PeertubeAccountNotification following;
+    private Actor follower;
-
+    @SerializedName("following")
-    public PeertubeActorFollow() {
+    private Actor following;
-    }
+    @SerializedName("state")
-
+    private String state;
 
     public String getId() {
         return id;
@@ -32,19 +36,27 @@ public class PeertubeActorFollow {
         this.id = id;
     }
 
-    public PeertubeAccountNotification getFollower() {
+    public Actor getFollower() {
         return follower;
     }
 
-    public void setFollower(PeertubeAccountNotification follower) {
+    public void setFollower(Actor follower) {
         this.follower = follower;
     }
 
-    public PeertubeAccountNotification getFollowing() {
+    public Actor getFollowing() {
         return following;
     }
 
-    public void setFollowing(PeertubeAccountNotification following) {
+    public void setFollowing(Actor following) {
         this.following = following;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

app/src/main/java/app/fedilab/fedilabtube/client/entities/Avatar.java

@@ -0,0 +1,87 @@
+package app.fedilab.fedilabtube.client.entities;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.SerializedName;
+
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+@SuppressWarnings("unused")
+public class Avatar implements Parcelable {
+
+    public static final Parcelable.Creator<Avatar> CREATOR = new Parcelable.Creator<Avatar>() {
+        @Override
+        public Avatar createFromParcel(Parcel source) {
+            return new Avatar(source);
+        }
+
+        @Override
+        public Avatar[] newArray(int size) {
+            return new Avatar[size];
+        }
+    };
+    @SerializedName("createdAt")
+    private String createdAt;
+    @SerializedName("path")
+    private String path;
+    @SerializedName("updatedAt")
+    private String updatedAt;
+
+    public Avatar() {
+    }
+
+    protected Avatar(Parcel in) {
+        this.createdAt = in.readString();
+        this.path = in.readString();
+        this.updatedAt = in.readString();
+    }
+
+    public String getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(String createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(String updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.createdAt);
+        dest.writeString(this.path);
+        dest.writeString(this.updatedAt);
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/CaptionsParams.java

@@ -0,0 +1,42 @@
+package app.fedilab.fedilabtube.client.entities;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import com.google.gson.annotations.SerializedName;
+
+@SuppressWarnings("unused")
+public class CaptionsParams {
+
+    @SerializedName("captionLanguage")
+    private String captionLanguage;
+    @SerializedName("id")
+    private String id;
+
+    public String getCaptionLanguage() {
+        return captionLanguage;
+    }
+
+    public void setCaptionLanguage(String captionLanguage) {
+        this.captionLanguage = captionLanguage;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/ChannelParams.java

@@ -1,5 +1,4 @@
 package app.fedilab.fedilabtube.client.entities;
-
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -15,20 +14,21 @@ package app.fedilab.fedilabtube.client.entities;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-public class ChannelCreation {
+import com.google.gson.annotations.SerializedName;
-    private String id;
+
+@SuppressWarnings("unused")
+public class ChannelParams {
+
+    @SerializedName("displayName")
     private String displayName;
+    @SerializedName("name")
     private String name;
+    @SerializedName("description")
     private String description;
+    @SerializedName("support")
     private String support;
-
+    @SerializedName("bulkVideosSupportUpdate")
-    public String getId() {
+    private boolean bulkVideosSupportUpdate;
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
 
     public String getDisplayName() {
         return displayName;
@@ -61,4 +61,12 @@ public class ChannelCreation {
     public void setSupport(String support) {
         this.support = support;
     }
+
+    public boolean isBulkVideosSupportUpdate() {
+        return bulkVideosSupportUpdate;
+    }
+
+    public void setBulkVideosSupportUpdate(boolean bulkVideosSupportUpdate) {
+        this.bulkVideosSupportUpdate = bulkVideosSupportUpdate;
+    }
 }

app/src/main/java/app/fedilab/fedilabtube/client/entities/File.java

@@ -0,0 +1,99 @@
+package app.fedilab.fedilabtube.client.entities;
+
+import com.google.gson.annotations.SerializedName;
+
+
+@SuppressWarnings("unused")
+public class File {
+
+    @SerializedName("fileDownloadUrl")
+    private String fileDownloadUrl;
+    @SerializedName("fileUrl")
+    private String fileUrl;
+    @SerializedName("fps")
+    private int fps;
+    @SerializedName("magnetUri")
+    private String magnetUri;
+    @SerializedName("metadataUrl")
+    private String metadataUrl;
+    @SerializedName("resolutions")
+    private Item resolutions;
+    @SerializedName("size")
+    private long size;
+    @SerializedName("torrentDownloadUrl")
+    private String torrentDownloadUrl;
+    @SerializedName("torrentUrl")
+    private String torrentUrl;
+
+    public String getFileDownloadUrl() {
+        return fileDownloadUrl;
+    }
+
+    public void setFileDownloadUrl(String fileDownloadUrl) {
+        this.fileDownloadUrl = fileDownloadUrl;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    public int getFps() {
+        return fps;
+    }
+
+    public void setFps(int fps) {
+        this.fps = fps;
+    }
+
+    public String getMagnetUri() {
+        return magnetUri;
+    }
+
+    public void setMagnetUri(String magnetUri) {
+        this.magnetUri = magnetUri;
+    }
+
+    public String getMetadataUrl() {
+        return metadataUrl;
+    }
+
+    public void setMetadataUrl(String metadataUrl) {
+        this.metadataUrl = metadataUrl;
+    }
+
+    public Item getResolutions() {
+        return resolutions;
+    }
+
+    public void setResolutions(Item resolutions) {
+        this.resolutions = resolutions;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public void setSize(long size) {
+        this.size = size;
+    }
+
+    public String getTorrentDownloadUrl() {
+        return torrentDownloadUrl;
+    }
+
+    public void setTorrentDownloadUrl(String torrentDownloadUrl) {
+        this.torrentDownloadUrl = torrentDownloadUrl;
+    }
+
+    public String getTorrentUrl() {
+        return torrentUrl;
+    }
+
+    public void setTorrentUrl(String torrentUrl) {
+        this.torrentUrl = torrentUrl;
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Instance.java

@@ -1,224 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.text.SpannableStringBuilder;
-
-import java.util.Date;
-import java.util.LinkedHashMap;
-
-
-public class Instance {
-
-    private boolean autoBlacklistUserVideosEnabled;
-    private LinkedHashMap<Integer, Integer> categories;
-    private String country;
-    private Date createdAt;
-    private String defaultNSFWPolicy;
-    private int health;
-    private String host;
-    private String id;
-    private LinkedHashMap<Integer, String> languages;
-    private String name;
-    private String shortDescription;
-    private boolean signupAllowed;
-    private boolean supportsIPv6;
-    private int totalInstanceFollowers;
-    private int totalInstanceFollowing;
-    private int totalLocalVideos;
-    private int totalUsers;
-    private int totalVideos;
-    private String userVideoQuota;
-    private String version;
-    private boolean isNSFW;
-    private SpannableStringBuilder spannableStringBuilder;
-
-
-    public boolean isAutoBlacklistUserVideosEnabled() {
-        return autoBlacklistUserVideosEnabled;
-    }
-
-    public void setAutoBlacklistUserVideosEnabled(boolean autoBlacklistUserVideosEnabled) {
-        this.autoBlacklistUserVideosEnabled = autoBlacklistUserVideosEnabled;
-    }
-
-    public LinkedHashMap<Integer, Integer> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(LinkedHashMap<Integer, Integer> categories) {
-        this.categories = categories;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public String getDefaultNSFWPolicy() {
-        return defaultNSFWPolicy;
-    }
-
-    public void setDefaultNSFWPolicy(String defaultNSFWPolicy) {
-        this.defaultNSFWPolicy = defaultNSFWPolicy;
-    }
-
-    public int getHealth() {
-        return health;
-    }
-
-    public void setHealth(int health) {
-        this.health = health;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public LinkedHashMap<Integer, String> getLanguages() {
-        return languages;
-    }
-
-    public void setLanguages(LinkedHashMap<Integer, String> languages) {
-        this.languages = languages;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-
-    public boolean isSignupAllowed() {
-        return signupAllowed;
-    }
-
-    public void setSignupAllowed(boolean signupAllowed) {
-        this.signupAllowed = signupAllowed;
-    }
-
-    public boolean isSupportsIPv6() {
-        return supportsIPv6;
-    }
-
-    public void setSupportsIPv6(boolean supportsIPv6) {
-        this.supportsIPv6 = supportsIPv6;
-    }
-
-    public int getTotalInstanceFollowers() {
-        return totalInstanceFollowers;
-    }
-
-    public void setTotalInstanceFollowers(int totalInstanceFollowers) {
-        this.totalInstanceFollowers = totalInstanceFollowers;
-    }
-
-    public int getTotalInstanceFollowing() {
-        return totalInstanceFollowing;
-    }
-
-    public void setTotalInstanceFollowing(int totalInstanceFollowing) {
-        this.totalInstanceFollowing = totalInstanceFollowing;
-    }
-
-    public int getTotalLocalVideos() {
-        return totalLocalVideos;
-    }
-
-    public void setTotalLocalVideos(int totalLocalVideos) {
-        this.totalLocalVideos = totalLocalVideos;
-    }
-
-    public int getTotalUsers() {
-        return totalUsers;
-    }
-
-    public void setTotalUsers(int totalUsers) {
-        this.totalUsers = totalUsers;
-    }
-
-    public int getTotalVideos() {
-        return totalVideos;
-    }
-
-    public void setTotalVideos(int totalVideos) {
-        this.totalVideos = totalVideos;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public boolean isNSFW() {
-        return isNSFW;
-    }
-
-    public void setNSFW(boolean NSFW) {
-        isNSFW = NSFW;
-    }
-
-    public String getUserVideoQuota() {
-        return userVideoQuota;
-    }
-
-    public void setUserVideoQuota(String userVideoQuota) {
-        this.userVideoQuota = userVideoQuota;
-    }
-
-    public SpannableStringBuilder getSpannableStringBuilder() {
-        return spannableStringBuilder;
-    }
-
-    public void setSpannableStringBuilder(SpannableStringBuilder spannableStringBuilder) {
-        this.spannableStringBuilder = spannableStringBuilder;
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/InstanceNodeInfo.java

@@ -1,137 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-@SuppressWarnings("unused")
-public class InstanceNodeInfo {
-
-    private String name;
-    private String title;
-    private String version;
-    private boolean openRegistrations;
-    private boolean connectionError;
-    private int numberOfUsers = 0;
-    private int numberOfPosts = 0;
-    private int numberOfInstance = 0;
-    private String staffAccountStr;
-    private Account staffAccount;
-    private String nodeName;
-    private String nodeDescription;
-    private String thumbnail;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public boolean isOpenRegistrations() {
-        return openRegistrations;
-    }
-
-    public void setOpenRegistrations(boolean openRegistrations) {
-        this.openRegistrations = openRegistrations;
-    }
-
-    public boolean isConnectionError() {
-        return connectionError;
-    }
-
-    public void setConnectionError(boolean connectionError) {
-        this.connectionError = connectionError;
-    }
-
-    public int getNumberOfUsers() {
-        return numberOfUsers;
-    }
-
-    public void setNumberOfUsers(int numberOfUsers) {
-        this.numberOfUsers = numberOfUsers;
-    }
-
-    public int getNumberOfPosts() {
-        return numberOfPosts;
-    }
-
-    public void setNumberOfPosts(int numberOfPosts) {
-        this.numberOfPosts = numberOfPosts;
-    }
-
-    public String getStaffAccountStr() {
-        return staffAccountStr;
-    }
-
-    public void setStaffAccountStr(String staffAccountStr) {
-        this.staffAccountStr = staffAccountStr;
-    }
-
-    public Account getStaffAccount() {
-        return staffAccount;
-    }
-
-    public void setStaffAccount(Account staffAccount) {
-        this.staffAccount = staffAccount;
-    }
-
-    public String getNodeName() {
-        return nodeName;
-    }
-
-    public void setNodeName(String nodeName) {
-        this.nodeName = nodeName;
-    }
-
-    public String getNodeDescription() {
-        return nodeDescription;
-    }
-
-    public void setNodeDescription(String nodeDescription) {
-        this.nodeDescription = nodeDescription;
-    }
-
-    public String getThumbnail() {
-        return thumbnail;
-    }
-
-    public void setThumbnail(String thumbnail) {
-        this.thumbnail = thumbnail;
-    }
-
-    public int getNumberOfInstance() {
-        return numberOfInstance;
-    }
-
-    public void setNumberOfInstance(int numberOfInstance) {
-        this.numberOfInstance = numberOfInstance;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Item.java

@@ -17,47 +17,48 @@ package app.fedilab.fedilabtube.client.entities;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.google.gson.annotations.SerializedName;
 
-@SuppressWarnings("unused")
+public class Item implements Parcelable {
-public class Tag implements Parcelable {
 
-    public static final Creator<Tag> CREATOR = new Creator<Tag>() {
+    public static final Parcelable.Creator<Item> CREATOR = new Parcelable.Creator<Item>() {
         @Override
-        public Tag createFromParcel(Parcel source) {
+        public Item createFromParcel(Parcel source) {
-            return new Tag(source);
+            return new Item(source);
         }
 
         @Override
-        public Tag[] newArray(int size) {
+        public Item[] newArray(int size) {
-            return new Tag[size];
+            return new Item[size];
         }
     };
-    private String name;
+    @SerializedName("id")
-    private String url;
+    private long id;
+    @SerializedName("label")
+    private String label;
 
-    public Tag() {
+    public Item() {
     }
 
-    protected Tag(Parcel in) {
+    protected Item(Parcel in) {
-        this.name = in.readString();
+        this.id = in.readLong();
-        this.url = in.readString();
+        this.label = in.readString();
     }
 
-
+    public long getId() {
-    public String getName() {
+        return id;
-        return name;
     }
 
-    public void setName(String name) {
+    public void setId(long id) {
-        this.name = name;
+        this.id = id;
     }
 
-    public String getUrl() {
+    public String getLabel() {
-        return url;
+        return label;
     }
 
-    public void setUrl(String url) {
+    public void setLabel(String label) {
-        this.url = url;
+        this.label = label;
     }
 
     @Override
@@ -67,7 +68,7 @@ public class Tag implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(this.name);
+        dest.writeLong(this.id);
-        dest.writeString(this.url);
+        dest.writeString(this.label);
     }
 }

app/src/main/java/app/fedilab/fedilabtube/client/entities/Mention.java

@@ -1,94 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-
-@SuppressWarnings("unused")
-public class Mention implements Parcelable {
-
-    public static final Creator<Mention> CREATOR = new Creator<Mention>() {
-        @Override
-        public Mention createFromParcel(Parcel in) {
-            return new Mention(in);
-        }
-
-        @Override
-        public Mention[] newArray(int size) {
-            return new Mention[size];
-        }
-    };
-    private String url;
-    private String username;
-    private String acct;
-    private String id;
-
-    private Mention(Parcel in) {
-        url = in.readString();
-        username = in.readString();
-        acct = in.readString();
-        id = in.readString();
-    }
-
-    public Mention() {
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getAcct() {
-        return acct;
-    }
-
-    public void setAcct(String acct) {
-        this.acct = acct;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(url);
-        dest.writeString(username);
-        dest.writeString(acct);
-        dest.writeString(id);
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/OverviewVideo.java

@@ -0,0 +1,125 @@
+package app.fedilab.fedilabtube.client.entities;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+import app.fedilab.fedilabtube.client.data.ChannelData;
+import app.fedilab.fedilabtube.client.data.VideoData;
+
+public class OverviewVideo {
+
+    @SerializedName("categories")
+    private Categories categories;
+    @SerializedName("channels")
+    private Channels channels;
+    @SerializedName("tags")
+    private Tags tags;
+
+    public Categories getCategories() {
+        return categories;
+    }
+
+    public void setCategories(Categories categories) {
+        this.categories = categories;
+    }
+
+    public Channels getChannels() {
+        return channels;
+    }
+
+    public void setChannels(Channels channels) {
+        this.channels = channels;
+    }
+
+    public Tags getTags() {
+        return tags;
+    }
+
+    public void setTags(Tags tags) {
+        this.tags = tags;
+    }
+
+    public static class Categories {
+        @SerializedName("category")
+        private Item category;
+        @SerializedName("videos")
+        private List<VideoData.Video> videos;
+
+        public Item getCategory() {
+            return category;
+        }
+
+        public void setCategory(Item category) {
+            this.category = category;
+        }
+
+        public List<VideoData.Video> getVideos() {
+            return videos;
+        }
+
+        public void setVideos(List<VideoData.Video> videos) {
+            this.videos = videos;
+        }
+    }
+
+    public static class Channels {
+        @SerializedName("channels")
+        private ChannelData.Channel channels;
+        @SerializedName("videos")
+        private List<VideoData.Video> videos;
+
+        public ChannelData.Channel getChannels() {
+            return channels;
+        }
+
+        public void setChannels(ChannelData.Channel channels) {
+            this.channels = channels;
+        }
+
+        public List<VideoData.Video> getVideos() {
+            return videos;
+        }
+
+        public void setVideos(List<VideoData.Video> videos) {
+            this.videos = videos;
+        }
+    }
+
+    public static class Tags {
+        @SerializedName("tag")
+        private String tag;
+        @SerializedName("videos")
+        private List<VideoData.Video> videos;
+
+        public String getTag() {
+            return tag;
+        }
+
+        public void setTag(String tag) {
+            this.tag = tag;
+        }
+
+        public List<VideoData.Video> getVideos() {
+            return videos;
+        }
+
+        public void setVideos(List<VideoData.Video> videos) {
+            this.videos = videos;
+        }
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Peertube.java

@@ -1,358 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import org.json.JSONObject;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-import app.fedilab.fedilabtube.helper.Helper;
-
-
-@SuppressWarnings("unused")
-public class Peertube {
-
-    private String id;
-    private String uuid;
-    private String name;
-    private String description;
-    private String host;
-    private String thumbnailPath;
-    private String previewPath;
-    private String embedPath;
-    private int view;
-    private int like;
-    private int dislike;
-    private Date created_at;
-    private int duration;
-    private String instance;
-    private Account account;
-    private Account channel;
-    private List<String> resolution;
-    private List<String> tags;
-    private boolean commentsEnabled;
-    private boolean sensitive;
-    private HashMap<Integer, String> category;
-    private HashMap<Integer, String> license;
-    private HashMap<String, String> language;
-    private HashMap<Integer, String> privacy;
-    private HashMap<String, String> channelForUpdate;
-    private String myRating = "none";
-    private boolean isUpdate = false;
-    private String headerType = null;
-    private String headerTypeValue = null;
-    private JSONObject cache;
-
-    public Peertube() {
-    }
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getThumbnailPath() {
-        return thumbnailPath;
-    }
-
-    public void setThumbnailPath(String thumbnailPath) {
-        this.thumbnailPath = thumbnailPath;
-    }
-
-    public String getPreviewPath() {
-        return previewPath;
-    }
-
-    public void setPreviewPath(String previewPath) {
-        this.previewPath = previewPath;
-    }
-
-    public String getEmbedPath() {
-        return embedPath;
-    }
-
-    public void setEmbedPath(String embedPath) {
-        this.embedPath = embedPath;
-    }
-
-
-    public int getView() {
-        return view;
-    }
-
-    public void setView(int view) {
-        this.view = view;
-    }
-
-    public int getLike() {
-        return like;
-    }
-
-    public void setLike(int like) {
-        this.like = like;
-    }
-
-    public int getDislike() {
-        return dislike;
-    }
-
-    public void setDislike(int dislike) {
-        this.dislike = dislike;
-    }
-
-    public Date getCreated_at() {
-        return created_at;
-    }
-
-    public void setCreated_at(Date created_at) {
-        this.created_at = created_at;
-    }
-
-    public int getDuration() {
-        return duration;
-    }
-
-    public void setDuration(int duration) {
-        this.duration = duration;
-    }
-
-    public String getInstance() {
-        return instance;
-    }
-
-    public void setInstance(String instance) {
-        this.instance = instance;
-    }
-
-    public Account getAccount() {
-        return account;
-    }
-
-    public void setAccount(Account account) {
-        this.account = account;
-    }
-
-    public String getFileUrl(String resolution, Context context) {
-        if (resolution == null)
-            resolution = this.getResolution().get(0);
-        if (resolution == null)
-            return null;
-        SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        boolean streamService = sharedpreferences.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL) == Helper.VIDEO_MODE_STREAMING;
-        if (streamService) {
-            return "https://" + this.host + "/static/streaming-playlists/hls/" + getUuid() + "/" + getUuid() + "-" + resolution + "-fragmented.mp4";
-        } else {
-            return "https://" + this.host + "/static/webseed/" + getUuid() + "-" + resolution + ".mp4";
-
-        }
-    }
-
-
-    public String getTorrentUrl(String resolution) {
-        if (resolution == null)
-            resolution = this.getResolution().get(0);
-        if (resolution == null)
-            return null;
-        return "https://" + this.host + "/static/torrents/" + getUuid() + "-" + resolution + ".torrent";
-
-    }
-
-    public String getTorrentDownloadUrl(String resolution) {
-        if (resolution == null)
-            resolution = this.getResolution().get(0);
-        if (resolution == null)
-            return null;
-        return "https://" + this.host + "/download/torrents/" + getUuid() + "-" + resolution + ".torrent";
-
-    }
-
-    public String getFileDownloadUrl(String resolution, Context context) {
-        if (resolution == null)
-            resolution = this.getResolution().get(0);
-        if (resolution == null)
-            return null;
-        SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        boolean streamService = sharedpreferences.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL) == Helper.VIDEO_MODE_STREAMING;
-        if (streamService) {
-            return "https://" + this.host + "/download/streaming-playlists/hls/videos/" + getUuid() + "/" + getUuid() + "-" + resolution + "-fragmented.mp4";
-        } else {
-            return "https://" + this.host + "/download/videos/" + getUuid() + "-" + resolution + ".mp4";
-        }
-
-    }
-
-    public List<String> getResolution() {
-        return resolution;
-    }
-
-    public void setResolution(List<String> resolution) {
-        this.resolution = resolution;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public boolean isCommentsEnabled() {
-        return commentsEnabled;
-    }
-
-    public void setCommentsEnabled(boolean commentsEnabled) {
-        this.commentsEnabled = commentsEnabled;
-    }
-
-    public JSONObject getCache() {
-        return cache;
-    }
-
-    public void setCache(JSONObject cache) {
-        this.cache = cache;
-    }
-
-    public boolean isSensitive() {
-        return sensitive;
-    }
-
-    public void setSensitive(boolean sensitive) {
-        this.sensitive = sensitive;
-    }
-
-
-    public String getMyRating() {
-        return myRating;
-    }
-
-    public void setMyRating(String myRating) {
-        this.myRating = myRating;
-    }
-
-    public Account getChannel() {
-        return channel;
-    }
-
-    public void setChannel(Account channel) {
-        this.channel = channel;
-    }
-
-
-    public List<String> getTags() {
-        return tags;
-    }
-
-    public void setTags(List<String> tags) {
-        this.tags = tags;
-    }
-
-    public HashMap<Integer, String> getCategory() {
-        return category;
-    }
-
-    public void setCategory(HashMap<Integer, String> category) {
-        this.category = category;
-    }
-
-    public HashMap<Integer, String> getLicense() {
-        return license;
-    }
-
-    public void setLicense(HashMap<Integer, String> license) {
-        this.license = license;
-    }
-
-    public HashMap<String, String> getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(HashMap<String, String> language) {
-        this.language = language;
-    }
-
-    public HashMap<Integer, String> getPrivacy() {
-        return privacy;
-    }
-
-    public void setPrivacy(HashMap<Integer, String> privacy) {
-        this.privacy = privacy;
-    }
-
-    public HashMap<String, String> getChannelForUpdate() {
-        return channelForUpdate;
-    }
-
-    public void setChannelForUpdate(HashMap<String, String> channelForUpdate) {
-        this.channelForUpdate = channelForUpdate;
-    }
-
-    public boolean isUpdate() {
-        return isUpdate;
-    }
-
-    public void setUpdate(boolean update) {
-        isUpdate = update;
-    }
-
-    public String getHeaderType() {
-        return headerType;
-    }
-
-    public void setHeaderType(String headerType) {
-        this.headerType = headerType;
-    }
-
-    public String getHeaderTypeValue() {
-        return headerTypeValue;
-    }
-
-    public void setHeaderTypeValue(String headerTypeValue) {
-        this.headerTypeValue = headerTypeValue;
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/PeertubeComment.java

@@ -1,60 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-@SuppressWarnings("unused")
-public class PeertubeComment {
-
-    private String id;
-    private String threadId;
-    private PeertubeVideoNotification peertubeVideoNotification;
-    private PeertubeAccountNotification peertubeAccountNotification;
-
-    public PeertubeComment() {
-    }
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getThreadId() {
-        return threadId;
-    }
-
-    public void setThreadId(String threadId) {
-        this.threadId = threadId;
-    }
-
-    public PeertubeVideoNotification getPeertubeVideoNotification() {
-        return peertubeVideoNotification;
-    }
-
-    public void setPeertubeVideoNotification(PeertubeVideoNotification peertubeVideoNotification) {
-        this.peertubeVideoNotification = peertubeVideoNotification;
-    }
-
-    public PeertubeAccountNotification getPeertubeAccountNotification() {
-        return peertubeAccountNotification;
-    }
-
-    public void setPeertubeAccountNotification(PeertubeAccountNotification peertubeAccountNotification) {
-        this.peertubeAccountNotification = peertubeAccountNotification;
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/PeertubeInformation.java

@@ -15,15 +15,16 @@ package app.fedilab.fedilabtube.client.entities;
  * see <http://www.gnu.org/licenses>. */
 
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 
 public class PeertubeInformation {
 
 
-    public static final LinkedHashMap<String, String> langueMapped;
+    public static final Map<String, String> langueMapped;
 
     static {
-        LinkedHashMap<String, String> aMap = new LinkedHashMap<>();
+        Map<String, String> aMap = new LinkedHashMap<>();
         aMap.put("ca", "ca-ES");
         aMap.put("de", "de-DE");
         aMap.put("en", "en-US");
@@ -40,58 +41,58 @@ public class PeertubeInformation {
         langueMapped = aMap;
     }
 
-    private LinkedHashMap<Integer, String> categories;
+    private Map<Integer, String> categories;
-    private LinkedHashMap<String, String> languages;
+    private Map<String, String> languages;
-    private LinkedHashMap<Integer, String> licences;
+    private Map<Integer, String> licences;
-    private LinkedHashMap<Integer, String> privacies;
+    private Map<Integer, String> privacies;
-    private LinkedHashMap<Integer, String> playlistPrivacies;
+    private Map<Integer, String> playlistPrivacies;
-    private LinkedHashMap<String, String> translations;
+    private Map<String, String> translations;
 
-    public LinkedHashMap<String, String> getTranslations() {
+    public Map<String, String> getTranslations() {
         return translations;
     }
 
-    public void setTranslations(LinkedHashMap<String, String> translations) {
+    public void setTranslations(Map<String, String> translations) {
         this.translations = translations;
     }
 
-    public LinkedHashMap<Integer, String> getCategories() {
+    public Map<Integer, String> getCategories() {
         return categories;
     }
 
-    public void setCategories(LinkedHashMap<Integer, String> categories) {
+    public void setCategories(Map<Integer, String> categories) {
         this.categories = categories;
     }
 
-    public LinkedHashMap<String, String> getLanguages() {
+    public Map<String, String> getLanguages() {
         return languages;
     }
 
-    public void setLanguages(LinkedHashMap<String, String> languages) {
+    public void setLanguages(Map<String, String> languages) {
         this.languages = languages;
     }
 
-    public LinkedHashMap<Integer, String> getLicences() {
+    public Map<Integer, String> getLicences() {
         return licences;
     }
 
-    public void setLicences(LinkedHashMap<Integer, String> licences) {
+    public void setLicences(Map<Integer, String> licences) {
         this.licences = licences;
     }
 
-    public LinkedHashMap<Integer, String> getPrivacies() {
+    public Map<Integer, String> getPrivacies() {
         return privacies;
     }
 
-    public void setPrivacies(LinkedHashMap<Integer, String> privacies) {
+    public void setPrivacies(Map<Integer, String> privacies) {
         this.privacies = privacies;
     }
 
-    public LinkedHashMap<Integer, String> getPlaylistPrivacies() {
+    public Map<Integer, String> getPlaylistPrivacies() {
         return playlistPrivacies;
     }
 
-    public void setPlaylistPrivacies(LinkedHashMap<Integer, String> playlistPrivacies) {
+    public void setPlaylistPrivacies(Map<Integer, String> playlistPrivacies) {
         this.playlistPrivacies = playlistPrivacies;
     }
 }

app/src/main/java/app/fedilab/fedilabtube/client/entities/PeertubeNotification.java

@@ -1,99 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-
-import java.util.Date;
-
-@SuppressWarnings("unused")
-public class PeertubeNotification {
-
-    private String id;
-    private boolean read;
-    private Date updatedAt, createdAt;
-    private int type;
-    private PeertubeComment peertubeComment;
-    private PeertubeVideoNotification peertubeVideoNotification;
-    private PeertubeActorFollow peertubeActorFollow;
-
-    public PeertubeNotification() {
-    }
-
-    public String getId() {
-        return id;
-    }
-
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public boolean isRead() {
-        return read;
-    }
-
-    public void setRead(boolean read) {
-        this.read = read;
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public PeertubeComment getPeertubeComment() {
-        return peertubeComment;
-    }
-
-    public void setPeertubeComment(PeertubeComment peertubeComment) {
-        this.peertubeComment = peertubeComment;
-    }
-
-
-    public PeertubeActorFollow getPeertubeActorFollow() {
-        return peertubeActorFollow;
-    }
-
-    public void setPeertubeActorFollow(PeertubeActorFollow peertubeActorFollow) {
-        this.peertubeActorFollow = peertubeActorFollow;
-    }
-
-    public PeertubeVideoNotification getPeertubeVideoNotification() {
-        return peertubeVideoNotification;
-    }
-
-    public void setPeertubeVideoNotification(PeertubeVideoNotification peertubeVideoNotification) {
-        this.peertubeVideoNotification = peertubeVideoNotification;
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Playlist.java

@@ -1,198 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.Date;
-import java.util.HashMap;
-
-
-@SuppressWarnings("unused")
-public class Playlist implements Parcelable {
-
-    public static final Creator<Playlist> CREATOR = new Creator<Playlist>() {
-        @Override
-        public Playlist createFromParcel(Parcel source) {
-            return new Playlist(source);
-        }
-
-        @Override
-        public Playlist[] newArray(int size) {
-            return new Playlist[size];
-        }
-    };
-    private String id;
-    private String uuid;
-    private String displayName;
-    private String description;
-    private String videoChannelId;
-    private Date createdAt;
-    private boolean isLocal;
-    private Account ownerAccount;
-    private HashMap<Integer, String> privacy;
-    private String thumbnailPath;
-    private HashMap<Integer, String> type;
-    private Date updatedAt;
-    private int videosLength;
-
-    public Playlist() {
-    }
-
-    private Playlist(Parcel in) {
-        this.id = in.readString();
-        this.uuid = in.readString();
-        this.displayName = in.readString();
-        this.description = in.readString();
-        this.videoChannelId = in.readString();
-        long tmpCreatedAt = in.readLong();
-        this.createdAt = tmpCreatedAt == -1 ? null : new Date(tmpCreatedAt);
-        this.isLocal = in.readByte() != 0;
-        this.ownerAccount = in.readParcelable(Account.class.getClassLoader());
-        this.privacy = (HashMap<Integer, String>) in.readSerializable();
-        this.thumbnailPath = in.readString();
-        this.type = (HashMap<Integer, String>) in.readSerializable();
-        long tmpUpdatedAt = in.readLong();
-        this.updatedAt = tmpUpdatedAt == -1 ? null : new Date(tmpUpdatedAt);
-        this.videosLength = in.readInt();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getVideoChannelId() {
-        return videoChannelId;
-    }
-
-    public void setVideoChannelId(String videoChannelId) {
-        this.videoChannelId = videoChannelId;
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public boolean isLocal() {
-        return isLocal;
-    }
-
-    public void setLocal(boolean local) {
-        isLocal = local;
-    }
-
-    public Account getOwnerAccount() {
-        return ownerAccount;
-    }
-
-    public void setOwnerAccount(Account ownerAccount) {
-        this.ownerAccount = ownerAccount;
-    }
-
-    public HashMap<Integer, String> getPrivacy() {
-        return privacy;
-    }
-
-    public void setPrivacy(HashMap<Integer, String> privacy) {
-        this.privacy = privacy;
-    }
-
-    public String getThumbnailPath() {
-        return thumbnailPath;
-    }
-
-    public void setThumbnailPath(String thumbnailPath) {
-        this.thumbnailPath = thumbnailPath;
-    }
-
-    public HashMap<Integer, String> getType() {
-        return type;
-    }
-
-    public void setType(HashMap<Integer, String> type) {
-        this.type = type;
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public int getVideosLength() {
-        return videosLength;
-    }
-
-    public void setVideosLength(int videosLength) {
-        this.videosLength = videosLength;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(this.id);
-        dest.writeString(this.uuid);
-        dest.writeString(this.displayName);
-        dest.writeString(this.description);
-        dest.writeString(this.videoChannelId);
-        dest.writeLong(this.createdAt != null ? this.createdAt.getTime() : -1);
-        dest.writeByte(this.isLocal ? (byte) 1 : (byte) 0);
-        dest.writeParcelable(this.ownerAccount, flags);
-        dest.writeSerializable(this.privacy);
-        dest.writeString(this.thumbnailPath);
-        dest.writeSerializable(this.type);
-        dest.writeLong(this.updatedAt != null ? this.updatedAt.getTime() : -1);
-        dest.writeInt(this.videosLength);
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistExist.java

@@ -1,5 +1,4 @@
 package app.fedilab.fedilabtube.client.entities;
-
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,16 +13,18 @@ package app.fedilab.fedilabtube.client.entities;
  *
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
-@SuppressWarnings("unused")
-public class PlaylistElement {
 
+import com.google.gson.annotations.SerializedName;
+
+public class PlaylistExist {
+
+    @SerializedName("playlistElementId")
     private String playlistElementId;
+    @SerializedName("playlistId")
     private String playlistId;
-    private String videoChannelId;
+    @SerializedName("startTimestamp")
-    private String privacy;
-    private String displayName;
-    private String description;
     private long startTimestamp;
+    @SerializedName("stopTimestamp")
     private long stopTimestamp;
 
     public String getPlaylistElementId() {
@@ -57,36 +58,4 @@ public class PlaylistElement {
     public void setStopTimestamp(long stopTimestamp) {
         this.stopTimestamp = stopTimestamp;
     }
-
-    public String getVideoChannelId() {
-        return videoChannelId;
-    }
-
-    public void setVideoChannelId(String videoChannelId) {
-        this.videoChannelId = videoChannelId;
-    }
-
-    public String getPrivacy() {
-        return privacy;
-    }
-
-    public void setPrivacy(String privacy) {
-        this.privacy = privacy;
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
 }

app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistParams.java

@@ -0,0 +1,62 @@
+package app.fedilab.fedilabtube.client.entities;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import com.google.gson.annotations.SerializedName;
+
+public class PlaylistParams {
+
+    @SerializedName("displayName")
+    private String displayName;
+    @SerializedName("description")
+    private String description;
+    @SerializedName("privacy")
+    private int privacy;
+    @SerializedName("videoChannelId")
+    private String videoChannelId;
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public int getPrivacy() {
+        return privacy;
+    }
+
+    public void setPrivacy(int privacy) {
+        this.privacy = privacy;
+    }
+
+    public String getVideoChannelId() {
+        return videoChannelId;
+    }
+
+    public void setVideoChannelId(String videoChannelId) {
+        this.videoChannelId = videoChannelId;
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Rating.java

@@ -0,0 +1,42 @@
+package app.fedilab.fedilabtube.client.entities;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import com.google.gson.annotations.SerializedName;
+
+@SuppressWarnings("unused")
+public class Rating {
+
+    @SerializedName("videoId")
+    private String videoId;
+    @SerializedName("rating")
+    private String rating;
+
+    public String getVideoId() {
+        return videoId;
+    }
+
+    public void setVideoId(String videoId) {
+        this.videoId = videoId;
+    }
+
+    public String getRating() {
+        return rating;
+    }
+
+    public void setRating(String rating) {
+        this.rating = rating;
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/RefreshToken.java

@@ -0,0 +1,61 @@
+package app.fedilab.fedilabtube.client.entities;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import com.google.gson.annotations.SerializedName;
+
+public class RefreshToken {
+
+    @SerializedName("access_token")
+    private String access_token;
+    @SerializedName("expires_in")
+    private long expires_in;
+    @SerializedName("refresh_token")
+    private String refresh_token;
+    @SerializedName("token_type")
+    private String token_type;
+
+    public String getAccess_token() {
+        return access_token;
+    }
+
+    public void setAccess_token(String access_token) {
+        this.access_token = access_token;
+    }
+
+    public String getRefresh_token() {
+        return refresh_token;
+    }
+
+    public void setRefresh_token(String refresh_token) {
+        this.refresh_token = refresh_token;
+    }
+
+    public long getExpires_in() {
+        return expires_in;
+    }
+
+    public void setExpires_in(long expires_in) {
+        this.expires_in = expires_in;
+    }
+
+    public String getToken_type() {
+        return token_type;
+    }
+
+    public void setToken_type(String token_type) {
+        this.token_type = token_type;
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Relationship.java

@@ -1,111 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-@SuppressWarnings("unused")
-public class Relationship {
-
-    private String id;
-    private boolean following;
-    private boolean followed_by;
-    private boolean blocking;
-    private boolean muting;
-    private boolean requested;
-    private boolean muting_notifications;
-    private boolean endorsed;
-    private boolean showing_reblogs;
-    private boolean blocked_by;
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public boolean isFollowing() {
-        return following;
-    }
-
-    public void setFollowing(boolean following) {
-        this.following = following;
-    }
-
-    public boolean isFollowed_by() {
-        return followed_by;
-    }
-
-    public void setFollowed_by(boolean followed_by) {
-        this.followed_by = followed_by;
-    }
-
-    public boolean isBlocking() {
-        return blocking;
-    }
-
-    public void setBlocking(boolean blocking) {
-        this.blocking = blocking;
-    }
-
-    public boolean isMuting() {
-        return muting;
-    }
-
-    public void setMuting(boolean muting) {
-        this.muting = muting;
-    }
-
-    public boolean isRequested() {
-        return requested;
-    }
-
-    public void setRequested(boolean requested) {
-        this.requested = requested;
-    }
-
-    public boolean isMuting_notifications() {
-        return muting_notifications;
-    }
-
-    public void setMuting_notifications(boolean muting_notifications) {
-        this.muting_notifications = muting_notifications;
-    }
-
-    public boolean isEndorsed() {
-        return endorsed;
-    }
-
-    public void setEndorsed(boolean endorsed) {
-        this.endorsed = endorsed;
-    }
-
-    public boolean isShowing_reblogs() {
-        return showing_reblogs;
-    }
-
-    public void setShowing_reblogs(boolean showing_reblogs) {
-        this.showing_reblogs = showing_reblogs;
-    }
-
-    public boolean isBlocked_by() {
-        return blocked_by;
-    }
-
-    public void setBlocked_by(boolean blocked_by) {
-        this.blocked_by = blocked_by;
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Report.java

@@ -0,0 +1,93 @@
+package app.fedilab.fedilabtube.client.entities;
+
+import java.util.List;
+
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+public class Report {
+
+    private String reason;
+    private List<String> predefinedReasons;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public List<String> getPredefinedReasons() {
+        return predefinedReasons;
+    }
+
+    public void setPredefinedReasons(List<String> predefinedReasons) {
+        this.predefinedReasons = predefinedReasons;
+    }
+
+    public static class videoReport {
+        private String id;
+        private long startAt;
+        private long endAt;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public long getStartAt() {
+            return startAt;
+        }
+
+        public void setStartAt(long startAt) {
+            this.startAt = startAt;
+        }
+
+        public long getEndAt() {
+            return endAt;
+        }
+
+        public void setEndAt(long endAt) {
+            this.endAt = endAt;
+        }
+    }
+
+    public static class commentReport {
+        private String id;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+    }
+
+    public static class accountReport {
+        private String id;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/Status.java

@@ -1,655 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.preference.PreferenceManager;
-import android.text.Html;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextPaint;
-import android.text.TextUtils;
-import android.text.style.ClickableSpan;
-import android.text.style.QuoteSpan;
-import android.text.style.URLSpan;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-
-import java.lang.ref.WeakReference;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import app.fedilab.fedilabtube.helper.CustomQuoteSpan;
-import app.fedilab.fedilabtube.helper.Helper;
-import app.fedilab.fedilabtube.viewmodel.FeedsVM;
-
-
-@SuppressWarnings("unused")
-public class Status implements Parcelable {
-
-    public static final Creator<Status> CREATOR = new Creator<Status>() {
-        @Override
-        public Status createFromParcel(Parcel source) {
-            return new Status(source);
-        }
-
-        @Override
-        public Status[] newArray(int size) {
-            return new Status[size];
-        }
-    };
-    private String id;
-    private String uri;
-    private String url;
-    private Account account;
-    private String in_reply_to_id;
-    private String in_reply_to_account_id;
-    private Date created_at;
-    private int favourites_count;
-    private int replies_count;
-    private boolean favourited;
-    private boolean muted;
-    private boolean pinned;
-    private boolean sensitive;
-    private boolean bookmarked;
-    private String visibility;
-    private List<Mention> mentions;
-    private List<Tag> tags;
-    private String language;
-    private String content;
-    private SpannableString contentSpan;
-    private transient FeedsVM.Type type;
-    private String conversationId;
-    private String contentType;
-
-    public Status() {
-    }
-
-    protected Status(Parcel in) {
-        this.id = in.readString();
-        this.uri = in.readString();
-        this.url = in.readString();
-        this.account = in.readParcelable(Account.class.getClassLoader());
-        this.in_reply_to_id = in.readString();
-        this.in_reply_to_account_id = in.readString();
-        long tmpCreated_at = in.readLong();
-        this.created_at = tmpCreated_at == -1 ? null : new Date(tmpCreated_at);
-        this.favourites_count = in.readInt();
-        this.replies_count = in.readInt();
-        this.favourited = in.readByte() != 0;
-        this.muted = in.readByte() != 0;
-        this.pinned = in.readByte() != 0;
-        this.sensitive = in.readByte() != 0;
-        this.bookmarked = in.readByte() != 0;
-        this.visibility = in.readString();
-        this.mentions = in.createTypedArrayList(Mention.CREATOR);
-        this.tags = in.createTypedArrayList(Tag.CREATOR);
-        this.language = in.readString();
-        this.content = in.readString();
-        this.contentSpan = (SpannableString) TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
-        int tmpType = in.readInt();
-        this.type = tmpType == -1 ? null : FeedsVM.Type.values()[tmpType];
-        this.conversationId = in.readString();
-        this.contentType = in.readString();
-    }
-
-    public static void fillSpan(WeakReference<Context> contextWeakReference, Status status) {
-        Status.transform(contextWeakReference, status);
-    }
-
-    private static void transform(WeakReference<Context> contextWeakReference, Status status) {
-        Context context = contextWeakReference.get();
-        if (status == null)
-            return;
-        SpannableString spannableStringContent, spannableStringCW;
-        if (status.getContent() == null)
-            return;
-
-        String content = status.getContent();
-
-        Pattern aLink = Pattern.compile("<a((?!href).)*href=\"([^\"]*)\"[^>]*(((?!</a).)*)</a>");
-        Matcher matcherALink = aLink.matcher(content);
-        int count = 0;
-        while (matcherALink.find()) {
-            String beforemodification;
-            String urlText = matcherALink.group(3);
-
-            assert urlText != null;
-            urlText = urlText.substring(1);
-            beforemodification = urlText;
-            if (!beforemodification.startsWith("http")) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                    urlText = new SpannableString(Html.fromHtml(urlText, Html.FROM_HTML_MODE_LEGACY)).toString();
-                else
-                    urlText = new SpannableString(Html.fromHtml(urlText)).toString();
-                if (urlText.startsWith("http")) {
-                    urlText = urlText.replace("http://", "").replace("https://", "").replace("www.", "");
-                    if (urlText.length() > 31) {
-                        urlText = urlText.substring(0, 30);
-                        urlText += "…" + count;
-                        count++;
-                    }
-                } else if (urlText.startsWith("@")) {
-                    urlText += "|" + count;
-                    count++;
-                }
-                content = content.replaceFirst(Pattern.quote(beforemodification), Matcher.quoteReplacement(urlText));
-            }
-        }
-
-        content = content.replaceAll("(<\\s?p\\s?>)&gt;(((?!(</p>)|(<br)).){5,})(<\\s?/p\\s?><\\s?p\\s?>|<\\s?br\\s?/?>|<\\s?/p\\s?>$)", "<blockquote>$2</blockquote><p>");
-        content = content.replaceAll("^<\\s?p\\s?>(.*)<\\s?/p\\s?>$", "$1");
-        spannableStringContent = new SpannableString(content);
-        if (spannableStringContent.length() > 0)
-            status.setContentSpan(treatment(context, spannableStringContent, status));
-    }
-
-    private static SpannableString treatment(final Context context, SpannableString spannableString, Status status) {
-
-        URLSpan[] urls = spannableString.getSpans(0, spannableString.length(), URLSpan.class);
-        for (URLSpan span : urls)
-            spannableString.removeSpan(span);
-        List<Mention> mentions = status.getMentions();
-
-        SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-
-        Matcher matcher;
-        Pattern linkPattern = Pattern.compile("<a((?!href).)*href=\"([^\"]*)\"[^>]*(((?!</a).)*)</a>");
-        matcher = linkPattern.matcher(spannableString);
-        LinkedHashMap<String, String> targetedURL = new LinkedHashMap<>();
-        HashMap<String, Account> accountsMentionUnknown = new HashMap<>();
-        String liveInstance = Helper.getLiveInstance(context);
-        int i = 1;
-        while (matcher.find()) {
-            String key;
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                key = new SpannableString(Html.fromHtml(matcher.group(3), Html.FROM_HTML_MODE_LEGACY)).toString();
-            else
-                key = new SpannableString(Html.fromHtml(matcher.group(3))).toString();
-            key = key.substring(1);
-
-            if (!key.startsWith("#") && !key.startsWith("@") && !key.trim().equals("") && !Objects.requireNonNull(matcher.group(2)).contains("search?tag=") && !Objects.requireNonNull(matcher.group(2)).contains(liveInstance + "/users/")) {
-                String url;
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    url = Html.fromHtml(matcher.group(2), Html.FROM_HTML_MODE_LEGACY).toString();
-                } else {
-                    url = Html.fromHtml(matcher.group(2)).toString();
-                }
-                targetedURL.put(key + "|" + i, url);
-                i++;
-            } else if (key.startsWith("@") || Objects.requireNonNull(matcher.group(2)).contains(liveInstance + "/users/")) {
-                String acct;
-                String url;
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    url = Html.fromHtml(matcher.group(2), Html.FROM_HTML_MODE_LEGACY).toString();
-                } else {
-                    url = Html.fromHtml(matcher.group(2)).toString();
-                }
-
-                URI uri;
-                String instance = null;
-                try {
-                    uri = new URI(url);
-                    instance = uri.getHost();
-                } catch (URISyntaxException e) {
-                    if (url.contains("|")) {
-                        try {
-                            uri = new URI(url.split("\\|")[0]);
-                            instance = uri.getHost();
-                        } catch (URISyntaxException ex) {
-                            ex.printStackTrace();
-                        }
-
-                    }
-                }
-                if (key.startsWith("@"))
-                    acct = key.substring(1).split("\\|")[0];
-                else
-                    acct = key.split("\\|")[0];
-                Account account = new Account();
-                account.setAcct(acct);
-                account.setInstance(instance);
-                account.setUrl(url);
-                String accountId = null;
-                if (mentions != null) {
-                    for (Mention mention : mentions) {
-                        String[] accountMentionAcct = mention.getAcct().split("@");
-                        //Different isntance
-                        if (accountMentionAcct.length > 1) {
-                            if (mention.getAcct().equals(account.getAcct() + "@" + account.getInstance())) {
-                                accountId = mention.getId();
-                                break;
-                            }
-                        } else {
-                            if (mention.getAcct().equals(account.getAcct())) {
-                                accountId = mention.getId();
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                if (accountId != null) {
-                    account.setId(accountId);
-                }
-                accountsMentionUnknown.put(key, account);
-            }
-        }
-
-        SpannableStringBuilder spannableStringT;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-            spannableStringT = new SpannableStringBuilder(Html.fromHtml(spannableString.toString().replaceAll("[\\s]{2}", "&nbsp;&nbsp;"), Html.FROM_HTML_MODE_LEGACY));
-        else
-            spannableStringT = new SpannableStringBuilder(Html.fromHtml(spannableString.toString().replaceAll("[\\s]{2}", "&nbsp;&nbsp;")));
-        replaceQuoteSpans(context, spannableStringT);
-        URLSpan[] spans = spannableStringT.getSpans(0, spannableStringT.length(), URLSpan.class);
-        for (URLSpan span : spans) {
-            spannableStringT.removeSpan(span);
-        }
-
-
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        if (accountsMentionUnknown.size() > 0) {
-            Iterator<Map.Entry<String, Account>> it = accountsMentionUnknown.entrySet().iterator();
-            while (it.hasNext()) {
-                Map.Entry<String, Account> pair = it.next();
-                String key = pair.getKey();
-                Account account = pair.getValue();
-                String targetedAccount = "@" + account.getAcct();
-                if (spannableStringT.toString().toLowerCase().contains(targetedAccount.toLowerCase())) {
-
-                    int startPosition = spannableStringT.toString().toLowerCase().indexOf(key.toLowerCase());
-                    int endPosition = startPosition + key.length();
-                    if (key.contains("|")) {
-                        key = key.split("\\|")[0];
-                        SpannableStringBuilder ssb = new SpannableStringBuilder();
-                        ssb.append(spannableStringT, 0, spannableStringT.length());
-                        if (ssb.length() >= endPosition) {
-                            ssb.replace(startPosition, endPosition, key);
-                        }
-                        spannableStringT = SpannableStringBuilder.valueOf(ssb);
-                        endPosition = startPosition + key.length();
-                    }
-                    //Accounts can be mentioned several times so we have to loop
-                    if (startPosition >= 0 && endPosition <= spannableStringT.toString().length() && endPosition >= startPosition)
-                        spannableStringT.setSpan(new ClickableSpan() {
-                                                     @Override
-                                                     public void onClick(@NonNull View textView) {
-                                                         /*if (account.getId() != null) {
-                                                             Intent intent = new Intent(context, ShowAccountActivity.class);
-                                                             Bundle b = new Bundle();
-                                                             b.putString("accountId", account.getId());
-                                                             intent.putExtras(b);
-                                                             context.startActivity(intent);
-                                                         }*/
-                                                     }
-
-                                                     @Override
-                                                     public void updateDrawState(@NonNull TextPaint ds) {
-                                                         super.updateDrawState(ds);
-                                                     }
-                                                 },
-                                startPosition, endPosition,
-                                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-                }
-                it.remove();
-            }
-        }
-        if (targetedURL.size() > 0) {
-            Iterator<Map.Entry<String, String>> it = targetedURL.entrySet().iterator();
-            int endPosition = 0;
-            while (it.hasNext()) {
-                Map.Entry<String, String> pair = it.next();
-                String key = (pair.getKey()).split("\\|")[0];
-                String url = pair.getValue();
-                if (spannableStringT.toString().toLowerCase().contains(key.toLowerCase())) {
-                    //Accounts can be mentioned several times so we have to loop
-                    int startPosition = spannableStringT.toString().toLowerCase().indexOf(key.toLowerCase(), endPosition);
-                    if (startPosition >= 0) {
-                        endPosition = startPosition + key.length();
-                        if (key.contains("…") && !key.endsWith("…")) {
-                            key = key.split("…")[0] + "…";
-                            SpannableStringBuilder ssb = new SpannableStringBuilder();
-                            ssb.append(spannableStringT, 0, spannableStringT.length());
-                            if (ssb.length() >= endPosition) {
-                                ssb.replace(startPosition, endPosition, key);
-                            }
-                            spannableStringT = SpannableStringBuilder.valueOf(ssb);
-                            endPosition = startPosition + key.length();
-                        }
-                    }
-
-                }
-                it.remove();
-            }
-        }
-        matcher = Helper.hashtagPattern.matcher(spannableStringT);
-        while (matcher.find()) {
-            int matchStart = matcher.start(1);
-            int matchEnd = matcher.end();
-            final String tag = spannableStringT.toString().substring(matchStart, matchEnd);
-            if (matchStart >= 0 && matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)
-                spannableStringT.setSpan(new ClickableSpan() {
-                    @Override
-                    public void onClick(@NonNull View textView) {
-                       /* Intent intent = new Intent(context, HashTagActivity.class);
-                        Bundle b = new Bundle();
-                        b.putString("tag", tag.substring(1));
-                        intent.putExtras(b);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        context.startActivity(intent);*/
-                    }
-
-                    @Override
-                    public void updateDrawState(@NonNull TextPaint ds) {
-                        super.updateDrawState(ds);
-                        ds.setUnderlineText(false);
-                    }
-                }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-
-        }
-
-
-        Pattern carriagePattern = Pattern.compile("(\\n)+$");
-        matcher = carriagePattern.matcher(spannableStringT);
-        while (matcher.find()) {
-            int matchStart = matcher.start();
-            int matchEnd = matcher.end();
-            if (matchStart >= 0 && matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart) {
-                spannableStringT.delete(matchStart, matchEnd);
-            }
-        }
-        return SpannableString.valueOf(spannableStringT);
-    }
-
-    private static void replaceQuoteSpans(Context context, Spannable spannable) {
-        QuoteSpan[] quoteSpans = spannable.getSpans(0, spannable.length(), QuoteSpan.class);
-        for (QuoteSpan quoteSpan : quoteSpans) {
-            int start = spannable.getSpanStart(quoteSpan);
-            int end = spannable.getSpanEnd(quoteSpan);
-            int flags = spannable.getSpanFlags(quoteSpan);
-            spannable.removeSpan(quoteSpan);
-            spannable.setSpan(new CustomQuoteSpan(
-                            ContextCompat.getColor(context, android.R.color.transparent),
-                            Helper.getColorAccent(),
-                            10,
-                            20),
-                    start,
-                    end,
-                    flags);
-        }
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(this.id);
-        dest.writeString(this.uri);
-        dest.writeString(this.url);
-        dest.writeParcelable(this.account, flags);
-        dest.writeString(this.in_reply_to_id);
-        dest.writeString(this.in_reply_to_account_id);
-        dest.writeLong(this.created_at != null ? this.created_at.getTime() : -1);
-        dest.writeInt(this.favourites_count);
-        dest.writeInt(this.replies_count);
-        dest.writeByte(this.favourited ? (byte) 1 : (byte) 0);
-        dest.writeByte(this.muted ? (byte) 1 : (byte) 0);
-        dest.writeByte(this.pinned ? (byte) 1 : (byte) 0);
-        dest.writeByte(this.sensitive ? (byte) 1 : (byte) 0);
-        dest.writeByte(this.bookmarked ? (byte) 1 : (byte) 0);
-        dest.writeString(this.visibility);
-        dest.writeTypedList(this.mentions);
-        dest.writeTypedList(this.tags);
-        dest.writeString(this.language);
-        dest.writeString(this.content);
-        TextUtils.writeToParcel(this.contentSpan, dest, flags);
-        dest.writeInt(this.type == null ? -1 : this.type.ordinal());
-        dest.writeString(this.conversationId);
-        dest.writeString(this.contentType);
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public Account getAccount() {
-        return account;
-    }
-
-    public void setAccount(Account account) {
-        this.account = account;
-    }
-
-    public String getIn_reply_to_id() {
-        return in_reply_to_id;
-    }
-
-    public void setIn_reply_to_id(String in_reply_to_id) {
-        this.in_reply_to_id = in_reply_to_id;
-    }
-
-    public String getIn_reply_to_account_id() {
-        return in_reply_to_account_id;
-    }
-
-    public void setIn_reply_to_account_id(String in_reply_to_account_id) {
-        this.in_reply_to_account_id = in_reply_to_account_id;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Date getCreated_at() {
-        return created_at;
-    }
-
-    public void setCreated_at(Date created_at) {
-        this.created_at = created_at;
-    }
-
-    public int getFavourites_count() {
-        return favourites_count;
-    }
-
-    public void setFavourites_count(int favourites_count) {
-        this.favourites_count = favourites_count;
-    }
-
-    public boolean isFavourited() {
-        return favourited;
-    }
-
-    public void setFavourited(boolean favourited) {
-        this.favourited = favourited;
-    }
-
-    public boolean isPinned() {
-        return pinned;
-    }
-
-    public void setPinned(boolean pinned) {
-        this.pinned = pinned;
-    }
-
-    public boolean isSensitive() {
-        return sensitive;
-    }
-
-    public void setSensitive(boolean sensitive) {
-        this.sensitive = sensitive;
-    }
-
-    public List<Mention> getMentions() {
-        return mentions;
-    }
-
-    public void setMentions(List<Mention> mentions) {
-        this.mentions = mentions;
-    }
-
-    public List<Tag> getTags() {
-        return tags;
-    }
-
-    public void setTags(List<Tag> tags) {
-        this.tags = tags;
-    }
-
-    public String getTagsString() {
-        //iterate through tags and create comma delimited string of tag names
-        StringBuilder tag_names = new StringBuilder();
-        for (Tag t : tags) {
-            if (tag_names.toString().equals("")) {
-                tag_names = new StringBuilder(t.getName());
-            } else {
-                tag_names.append(", ").append(t.getName());
-            }
-        }
-        return tag_names.toString();
-    }
-
-    public String getVisibility() {
-        return visibility;
-    }
-
-    public void setVisibility(String visibility) {
-        this.visibility = visibility;
-    }
-
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-
-    public SpannableString getContentSpan() {
-        return contentSpan;
-    }
-
-    public void setContentSpan(SpannableString contentSpan) {
-        this.contentSpan = contentSpan;
-    }
-
-
-    @Override
-    public boolean equals(Object otherStatus) {
-        return otherStatus != null && (otherStatus == this || otherStatus instanceof Status && this.getId().equals(((Status) otherStatus).getId()));
-    }
-
-    public boolean isMuted() {
-        return muted;
-    }
-
-    public void setMuted(boolean muted) {
-        this.muted = muted;
-    }
-
-    public boolean isBookmarked() {
-        return bookmarked;
-    }
-
-    public void setBookmarked(boolean bookmarked) {
-        this.bookmarked = bookmarked;
-    }
-
-    public int getReplies_count() {
-        return replies_count;
-    }
-
-    public void setReplies_count(int replies_count) {
-        this.replies_count = replies_count;
-    }
-
-    public FeedsVM.Type getType() {
-        return type;
-    }
-
-    public void setType(FeedsVM.Type type) {
-        this.type = type;
-    }
-
-
-    public String getConversationId() {
-        return conversationId;
-    }
-
-    public void setConversationId(String conversationId) {
-        this.conversationId = conversationId;
-    }
-
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-
-    public String getContentType() {
-        return contentType;
-    }
-
-    public void setContentType(String contentType) {
-        this.contentType = contentType;
-    }
-
-
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/StatusDrawerParams.java

@@ -1,61 +0,0 @@
-package app.fedilab.fedilabtube.client.entities;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import java.util.List;
-
-import app.fedilab.fedilabtube.viewmodel.FeedsVM;
-
-@SuppressWarnings("unused")
-public class StatusDrawerParams {
-    private List<Status> statuses;
-    private FeedsVM.Type type;
-    private String targetedId;
-    private int position;
-
-
-    public List<Status> getStatuses() {
-        return statuses;
-    }
-
-    public void setStatuses(List<Status> statuses) {
-        this.statuses = statuses;
-    }
-
-    public FeedsVM.Type getType() {
-        return type;
-    }
-
-    public void setType(FeedsVM.Type type) {
-        this.type = type;
-    }
-
-    public String getTargetedId() {
-        return targetedId;
-    }
-
-    public void setTargetedId(String targetedId) {
-        this.targetedId = targetedId;
-    }
-
-
-    public int getPosition() {
-        return position;
-    }
-
-    public void setPosition(int position) {
-        this.position = position;
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoAbuse.java

@@ -14,12 +14,16 @@ package app.fedilab.fedilabtube.client.entities;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-public class PeertubeVideoNotification {
+import com.google.gson.annotations.SerializedName;
 
+import app.fedilab.fedilabtube.client.data.VideoData;
+
+public class VideoAbuse {
+
+    @SerializedName("id")
     private String id;
-    private PeertubeAccountNotification peertubeAccountNotification;
+    @SerializedName("video")
-    private String uuid;
+    private VideoData.Video video;
-    private String name;
 
     public String getId() {
         return id;
@@ -29,27 +33,11 @@ public class PeertubeVideoNotification {
         this.id = id;
     }
 
-    public String getName() {
+    public VideoData.Video getVideo() {
-        return name;
+        return video;
     }
 
-    public void setName(String name) {
+    public void setVideo(VideoData.Video video) {
-        this.name = name;
+        this.video = video;
-    }
-
-    public PeertubeAccountNotification getPeertubeAccountNotification() {
-        return peertubeAccountNotification;
-    }
-
-    public void setPeertubeAccountNotification(PeertubeAccountNotification peertubeAccountNotification) {
-        this.peertubeAccountNotification = peertubeAccountNotification;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
     }
 }

app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoBlacklist.java

@@ -0,0 +1,43 @@
+package app.fedilab.fedilabtube.client.entities;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import com.google.gson.annotations.SerializedName;
+
+import app.fedilab.fedilabtube.client.data.VideoData;
+
+public class VideoBlacklist {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("video")
+    private VideoData.Video video;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public VideoData.Video getVideo() {
+        return video;
+    }
+
+    public void setVideo(VideoData.Video video) {
+        this.video = video;
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoParams.java

@@ -0,0 +1,165 @@
+package app.fedilab.fedilabtube.client.entities;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public class VideoParams {
+
+    @SerializedName("channelId")
+    private String channelId;
+    @SerializedName("name")
+    private String name;
+    @SerializedName("category")
+    private int category;
+    @SerializedName("commentsEnabled")
+    private boolean commentsEnabled;
+    @SerializedName("description")
+    private String description;
+    @SerializedName("downloadEnabled")
+    private boolean downloadEnabled;
+    @SerializedName("language")
+    private int language;
+    @SerializedName("licence")
+    private String licence;
+    @SerializedName("nsfw")
+    private boolean nsfw;
+    @SerializedName("originallyPublishedAt")
+    private Date originallyPublishedAt;
+    @SerializedName("privacy")
+    private int privacy;
+    @SerializedName("support")
+    private String support;
+    @SerializedName("tags")
+    private List<String> tags;
+    @SerializedName("waitTranscoding")
+    private boolean waitTranscoding;
+
+    public String getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(String channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCategory() {
+        return category;
+    }
+
+    public void setCategory(int category) {
+        this.category = category;
+    }
+
+    public boolean isCommentsEnabled() {
+        return commentsEnabled;
+    }
+
+    public void setCommentsEnabled(boolean commentsEnabled) {
+        this.commentsEnabled = commentsEnabled;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public boolean isDownloadEnabled() {
+        return downloadEnabled;
+    }
+
+    public void setDownloadEnabled(boolean downloadEnabled) {
+        this.downloadEnabled = downloadEnabled;
+    }
+
+    public int getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(int language) {
+        this.language = language;
+    }
+
+    public String getLicence() {
+        return licence;
+    }
+
+    public void setLicence(String licence) {
+        this.licence = licence;
+    }
+
+    public boolean isNsfw() {
+        return nsfw;
+    }
+
+    public void setNsfw(boolean nsfw) {
+        this.nsfw = nsfw;
+    }
+
+    public Date getOriginallyPublishedAt() {
+        return originallyPublishedAt;
+    }
+
+    public void setOriginallyPublishedAt(Date originallyPublishedAt) {
+        this.originallyPublishedAt = originallyPublishedAt;
+    }
+
+    public int getPrivacy() {
+        return privacy;
+    }
+
+    public void setPrivacy(int privacy) {
+        this.privacy = privacy;
+    }
+
+    public String getSupport() {
+        return support;
+    }
+
+    public void setSupport(String support) {
+        this.support = support;
+    }
+
+    public List<String> getTags() {
+        return tags;
+    }
+
+    public void setTags(List<String> tags) {
+        this.tags = tags;
+    }
+
+    public boolean isWaitTranscoding() {
+        return waitTranscoding;
+    }
+
+    public void setWaitTranscoding(boolean waitTranscoding) {
+        this.waitTranscoding = waitTranscoding;
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/client/entities/ViewsPerDay.java

@@ -14,26 +14,26 @@ package app.fedilab.fedilabtube.client.entities;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import java.util.HashMap;
+import java.util.Date;
 
-public class Caption {
+public class ViewsPerDay {
 
-    private String captionPath;
+    private Date date;
-    private HashMap<String, String> language;
+    private int views;
 
-    public String getCaptionPath() {
+    public Date getDate() {
-        return captionPath;
+        return date;
     }
 
-    public void setCaptionPath(String captionPath) {
+    public void setDate(Date date) {
-        this.captionPath = captionPath;
+        this.date = date;
     }
 
-    public HashMap<String, String> getLanguage() {
+    public int getViews() {
-        return language;
+        return views;
     }
 
-    public void setLanguage(HashMap<String, String> language) {
+    public void setViews(int views) {
-        this.language = language;
+        this.views = views;
     }
 }

app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsHorizontalListAdapter.java

@@ -31,7 +31,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.util.List;
 
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.helper.Helper;
 
 
@@ -59,13 +59,13 @@ public class AccountsHorizontalListAdapter extends RecyclerView.Adapter<Recycler
         final AccountsHorizontalListAdapter.ViewHolder holder = (AccountsHorizontalListAdapter.ViewHolder) viewHolder;
         final Account account = accounts.get(position);
 
-        if (account.getDisplay_name() != null && !account.getDisplay_name().trim().equals(""))
+        if (account.getDisplayName() != null && !account.getDisplayName().trim().equals(""))
-            holder.account_dn.setText(account.getDisplay_name());
+            holder.account_dn.setText(account.getDisplayName());
         else
-            holder.account_dn.setText(account.getUsername().replace("@", ""));
+            holder.account_dn.setText(account.getName().replace("@", ""));
 
         //Profile picture
-        Helper.loadGiF(context, account, holder.account_pp, 270);
+        Helper.loadGiF(context, account.getAvatar().getPath(), holder.account_pp, 270);
 
         if (account.isSelected()) {
             holder.main_container.setBackgroundColor(ColorUtils.setAlphaComponent(ContextCompat.getColor(context, Helper.getColorAccent()), 50));
@@ -107,9 +107,9 @@ public class AccountsHorizontalListAdapter extends RecyclerView.Adapter<Recycler
         @Override
         public void onClick(View v) {
             Account account = accounts.get(getAdapterPosition());
-            listener.click(account.getAcct());
+            listener.click(account.getId());
             for (Account acc : accounts) {
-                if (acc.getAcct().compareTo(account.getAcct()) == 0) {
+                if (acc.getId().compareTo(account.getId()) == 0) {
                     acc.setSelected(true);
                 } else {
                     acc.setSelected(false);

app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java

@@ -14,13 +14,10 @@ package app.fedilab.fedilabtube.drawer;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.text.Html;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
@@ -33,9 +30,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelStoreOwner;
@@ -45,16 +39,12 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.List;
 
-import app.fedilab.fedilabtube.AccountActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.ShowAccountActivity;
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.HttpsConnection;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
-import app.fedilab.fedilabtube.client.entities.Account;
-import app.fedilab.fedilabtube.fragment.DisplayPlaylistsFragment;
 import app.fedilab.fedilabtube.helper.Helper;
-import app.fedilab.fedilabtube.viewmodel.AccountsVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import es.dmoral.toasty.Toasty;
 
@@ -66,9 +56,9 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
     private List<Account> accounts;
     private Context context;
     private AccountsListAdapter accountsListAdapter;
-    private AccountsVM.accountFetch type;
+    private RetrofitPeertubeAPI.DataType type;
 
-    public AccountsListAdapter(AccountsVM.accountFetch type, List<Account> accounts) {
+    public AccountsListAdapter(RetrofitPeertubeAPI.DataType type, List<Account> accounts) {
         this.accounts = accounts;
         this.accountsListAdapter = this;
         this.type = type;
@@ -86,157 +76,42 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
         final AccountsListAdapter.ViewHolder holder = (AccountsListAdapter.ViewHolder) viewHolder;
         final Account account = accounts.get(position);
-        if (type == AccountsVM.accountFetch.CHANNEL) {
+        if (type == RetrofitPeertubeAPI.DataType.MUTED) {
-            holder.account_action.hide();
-            holder.more_actions.setVisibility(View.VISIBLE);
-            holder.account_action.setImageResource(R.drawable.ic_baseline_delete_24);
-            holder.account_action.setContentDescription(context.getString(R.string.delete_channel));
-            holder.account_action.setOnClickListener(view -> {
-                AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                builder.setTitle(context.getString(R.string.delete_channel) + ": " + account.getAcct());
-                builder.setMessage(context.getString(R.string.action_channel_confirm_delete));
-                builder.setIcon(android.R.drawable.ic_dialog_alert)
-                        .setPositiveButton(R.string.yes, (dialog, which) -> {
-                            accounts.remove(account);
-                            notifyDataSetChanged();
-                            new Thread(() -> {
-                                try {
-                                    new PeertubeAPI(context).deleteChannel(account.getAcct());
-                                    Handler mainHandler = new Handler(Looper.getMainLooper());
-                                    Runnable myRunnable = () -> {
-                                        accounts.remove(account);
-                                        notifyDataSetChanged();
-                                        if (accounts.size() == 0) {
-                                            allAccountsRemoved.onAllAccountsRemoved();
-                                        }
-                                    };
-                                    mainHandler.post(myRunnable);
-                                } catch (HttpsConnection.HttpsConnectionException e) {
-                                    e.printStackTrace();
-                                    Handler mainHandler = new Handler(Looper.getMainLooper());
-                                    Runnable myRunnable = () -> {
-                                        if (e.getMessage() != null) {
-                                            Toasty.error(context, e.getMessage(), Toast.LENGTH_LONG).show();
-                                        } else {
-                                            Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                                        }
-                                    };
-                                    mainHandler.post(myRunnable);
-                                }
-                            }).start();
-                            dialog.dismiss();
-                        })
-                        .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss())
-                        .show();
-            });
-        } else if (type == AccountsVM.accountFetch.MUTED) {
             holder.account_action.setOnClickListener(v -> {
                 PostActionsVM viewModel = new ViewModelProvider((ViewModelStoreOwner) context).get(PostActionsVM.class);
-                viewModel.post(PeertubeAPI.StatusAction.UNMUTE, account.getAcct(), null, null).observe((LifecycleOwner) context, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.UNMUTE, apiResponse));
+                viewModel.post(RetrofitPeertubeAPI.ActionType.UNMUTE, account.getId(), null).observe((LifecycleOwner) context, apiResponse -> manageVIewPostActions(RetrofitPeertubeAPI.ActionType.UNMUTE, apiResponse));
             });
         } else {
             holder.account_action.hide();
         }
 
-        holder.account_dn.setText(account.getDisplay_name());
+        holder.account_dn.setText(account.getDisplayName());
-        holder.account_ac.setText(account.getAcct());
+        holder.account_ac.setText(String.format("@%s", account.getName()));
-        if (account.getUsername().equals(account.getAcct()))
+        if (account.getDescription() == null) {
-            holder.account_ac.setVisibility(View.GONE);
+            account.setDescription("");
-        else
-            holder.account_ac.setVisibility(View.VISIBLE);
-        if (account.getNote() == null) {
-            account.setNote("");
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-            holder.account_ds.setText(Html.fromHtml(account.getNote(), Html.FROM_HTML_MODE_LEGACY));
+            holder.account_ds.setText(Html.fromHtml(account.getDescription(), Html.FROM_HTML_MODE_LEGACY));
         else
-            holder.account_ds.setText(Html.fromHtml(account.getNote()));
+            holder.account_ds.setText(Html.fromHtml(account.getDescription()));
         holder.account_ds.setAutoLinkMask(Linkify.WEB_URLS);
-        holder.account_sc.setText(Helper.withSuffix(account.getStatuses_count()));
+        holder.account_fgc.setText(Helper.withSuffix(account.getFollowingCount()));
-        holder.account_fgc.setText(Helper.withSuffix(account.getFollowing_count()));
+        holder.account_frc.setText(Helper.withSuffix(account.getFollowersCount()));
-        holder.account_frc.setText(Helper.withSuffix(account.getFollowers_count()));
         //Profile picture
-        Helper.loadGiF(context, account, holder.account_pp);
+        Helper.loadGiF(context, account.getAvatar().getPath(), holder.account_pp);
-        if (account.isMakingAction()) {
-            holder.account_action.setEnabled(false);
-        } else {
-            holder.account_action.setEnabled(true);
-        }
         //Follow button
-        if (type == AccountsVM.accountFetch.MUTED) {
+        if (type == RetrofitPeertubeAPI.DataType.MUTED) {
             holder.account_action.show();
             holder.account_action.setImageResource(R.drawable.ic_baseline_volume_mute_24);
         }
 
-        holder.more_actions.setOnClickListener(view -> {
-            PopupMenu popup = new PopupMenu(context, holder.more_actions);
-            popup.getMenuInflater()
-                    .inflate(R.menu.playlist_menu, popup.getMenu());
-            if (accounts.size() == 1) {
-                popup.getMenu().findItem(R.id.action_delete).setEnabled(false);
-            }
-            popup.setOnMenuItemClickListener(item -> {
-                switch (item.getItemId()) {
-                    case R.id.action_delete:
-                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                        builder.setTitle(context.getString(R.string.delete_channel) + ": " + account.getAcct());
-                        builder.setMessage(context.getString(R.string.action_channel_confirm_delete));
-                        builder.setIcon(android.R.drawable.ic_dialog_alert)
-                                .setPositiveButton(R.string.yes, (dialog, which) -> {
-                                    accounts.remove(account);
-                                    notifyDataSetChanged();
-                                    new Thread(() -> {
-                                        try {
-                                            new PeertubeAPI(context).deleteChannel(account.getAcct());
-                                            Handler mainHandler = new Handler(Looper.getMainLooper());
-                                            Runnable myRunnable = () -> {
-                                                DisplayPlaylistsFragment displayPlaylistsFragment;
-                                                if (context == null)
-                                                    return;
-                                                displayPlaylistsFragment = (DisplayPlaylistsFragment) ((AppCompatActivity) context).getSupportFragmentManager().findFragmentByTag("CHANNELS");
-                                                final FragmentTransaction ft = ((AppCompatActivity) context).getSupportFragmentManager().beginTransaction();
-                                                if (displayPlaylistsFragment != null) {
-                                                    ft.detach(displayPlaylistsFragment);
-                                                    ft.attach(displayPlaylistsFragment);
-                                                    ft.commit();
-                                                }
-                                            };
-                                            mainHandler.post(myRunnable);
-                                        } catch (HttpsConnection.HttpsConnectionException e) {
-                                            e.printStackTrace();
-                                            Handler mainHandler = new Handler(Looper.getMainLooper());
-                                            Runnable myRunnable = () -> {
-                                                if (e.getMessage() != null) {
-                                                    Toasty.error(context, e.getMessage(), Toast.LENGTH_LONG).show();
-                                                } else {
-                                                    Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                                                }
-                                            };
-                                            mainHandler.post(myRunnable);
-                                        }
-                                    }).start();
-                                    dialog.dismiss();
-                                })
-                                .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss())
-                                .show();
-                        break;
-                    case R.id.action_edit:
-                        if (context instanceof AccountActivity) {
-                            editAlertDialog.show(account);
-                        }
-                        break;
-                }
-                return true;
-            });
-            popup.show();
-        });
 
         holder.account_pp.setOnClickListener(v -> {
             Intent intent = new Intent(context, ShowAccountActivity.class);
             Bundle b = new Bundle();
             b.putBoolean("peertubeaccount", true);
             b.putBoolean("ischannel", true);
-            b.putString("targetedid", account.getAcct());
+            b.putString("targetedid", account.getName());
             b.putParcelable("account", account);
             intent.putExtras(b);
             context.startActivity(intent);
@@ -255,26 +130,16 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         return accounts.size();
     }
 
-    public void manageVIewPostActions(PeertubeAPI.StatusAction statusAction, APIResponse apiResponse) {
+    public void manageVIewPostActions(RetrofitPeertubeAPI.ActionType statusAction, APIResponse apiResponse) {
         if (apiResponse.getError() != null) {
             Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             return;
         }
-
+        if (statusAction == RetrofitPeertubeAPI.ActionType.UNMUTE) {
-        if (statusAction == PeertubeAPI.StatusAction.FOLLOW) {
-            for (Account account : accounts) {
-                if (account.getId().equals(apiResponse.getTargetedId())) {
-                    account.setFollowType(Account.followAction.FOLLOW);
-                    account.setMakingAction(false);
-                }
-            }
-            accountsListAdapter.notifyDataSetChanged();
-        }
-        if (statusAction == PeertubeAPI.StatusAction.UNMUTE) {
             Account tmpAccount = null;
             int position = 0;
             for (Account account : accounts) {
-                if (account.getAcct().equals(apiResponse.getTargetedId())) {
+                if (account.getId().equals(apiResponse.getTargetedId())) {
                     tmpAccount = account;
                     break;
                 }
@@ -284,15 +149,6 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 accounts.remove(position);
                 accountsListAdapter.notifyItemRemoved(position);
             }
-        }
-        if (statusAction == PeertubeAPI.StatusAction.UNFOLLOW) {
-            for (Account account : accounts) {
-                if (account.getId().equals(apiResponse.getTargetedId())) {
-                    account.setFollowType(Account.followAction.NOT_FOLLOW);
-                    account.setMakingAction(false);
-                }
-            }
-            accountsListAdapter.notifyDataSetChanged();
             if (accounts.size() == 0) {
                 allAccountsRemoved.onAllAccountsRemoved();
             }
@@ -313,7 +169,6 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         TextView account_ac;
         TextView account_dn;
         TextView account_ds;
-        TextView account_sc;
         TextView account_fgc;
         TextView account_frc;
         ImageButton more_actions;
@@ -327,7 +182,6 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             account_dn = itemView.findViewById(R.id.account_dn);
             account_ac = itemView.findViewById(R.id.account_ac);
             account_ds = itemView.findViewById(R.id.account_ds);
-            account_sc = itemView.findViewById(R.id.account_sc);
             account_fgc = itemView.findViewById(R.id.account_fgc);
             account_frc = itemView.findViewById(R.id.account_frc);
             account_action = itemView.findViewById(R.id.account_action);

app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java

@@ -0,0 +1,191 @@
+package app.fedilab.fedilabtube.drawer;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.Html;
+import android.text.util.Linkify;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+import app.fedilab.fedilabtube.AccountActivity;
+import app.fedilab.fedilabtube.R;
+import app.fedilab.fedilabtube.ShowAccountActivity;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
+import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
+import app.fedilab.fedilabtube.helper.Helper;
+
+
+public class ChannelListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    public AllChannelRemoved allChannelRemoved;
+    public EditAlertDialog editAlertDialog;
+    private List<Channel> channels;
+    private Context context;
+
+
+    public ChannelListAdapter(List<Channel> channels) {
+        this.channels = channels;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        LayoutInflater layoutInflater = LayoutInflater.from(context);
+        return new ViewHolder(layoutInflater.inflate(R.layout.drawer_channel, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
+        final ViewHolder holder = (ViewHolder) viewHolder;
+        final Channel channel = channels.get(position);
+        holder.account_dn.setText(channel.getDisplayName());
+        holder.account_ac.setText(channel.getName());
+        if (channel.getDescription() == null) {
+            channel.setDescription("");
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+            holder.account_ds.setText(Html.fromHtml(channel.getDescription(), Html.FROM_HTML_MODE_LEGACY));
+        else
+            holder.account_ds.setText(Html.fromHtml(channel.getDescription()));
+        holder.account_ds.setAutoLinkMask(Linkify.WEB_URLS);
+        holder.account_fgc.setText(Helper.withSuffix(channel.getFollowingCount()));
+        holder.account_frc.setText(Helper.withSuffix(channel.getFollowersCount()));
+        //Profile picture
+        Helper.loadGiF(context, channel.getAvatar().getPath(), holder.account_pp);
+
+
+        holder.more_actions.setOnClickListener(view -> {
+            PopupMenu popup = new PopupMenu(context, holder.more_actions);
+            popup.getMenuInflater()
+                    .inflate(R.menu.playlist_menu, popup.getMenu());
+            if (channels.size() == 1) {
+                popup.getMenu().findItem(R.id.action_delete).setEnabled(false);
+            }
+            popup.setOnMenuItemClickListener(item -> {
+                switch (item.getItemId()) {
+                    case R.id.action_delete:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                        builder.setTitle(context.getString(R.string.delete_channel) + ": " + channel.getName());
+                        builder.setMessage(context.getString(R.string.action_channel_confirm_delete));
+                        builder.setIcon(android.R.drawable.ic_dialog_alert)
+                                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                                    channels.remove(channel);
+                                    notifyDataSetChanged();
+                                    new Thread(() -> {
+                                        new RetrofitPeertubeAPI(context).post(RetrofitPeertubeAPI.ActionType.DELETE_CHANNEL, channel.getName(), null);
+                                        Handler mainHandler = new Handler(Looper.getMainLooper());
+                                        Runnable myRunnable = () -> {
+                                            channels.remove(channel);
+                                            notifyDataSetChanged();
+                                            if (channels.size() == 0) {
+                                                allChannelRemoved.onAllChannelRemoved();
+                                            }
+                                        };
+                                        mainHandler.post(myRunnable);
+                                    }).start();
+                                    dialog.dismiss();
+                                })
+                                .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss())
+                                .show();
+                        break;
+                    case R.id.action_edit:
+                        if (context instanceof AccountActivity) {
+                            editAlertDialog.show(channel);
+                        }
+                        break;
+                }
+                return true;
+            });
+            popup.show();
+        });
+
+        holder.account_pp.setOnClickListener(v -> {
+            Intent intent = new Intent(context, ShowAccountActivity.class);
+            Bundle b = new Bundle();
+            b.putBoolean("peertubeaccount", true);
+            b.putBoolean("ischannel", true);
+            b.putString("targetedid", channel.getName());
+            b.putParcelable("account", channel);
+            intent.putExtras(b);
+            context.startActivity(intent);
+        });
+
+
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public int getItemCount() {
+        return channels.size();
+    }
+
+
+    public interface AllChannelRemoved {
+        void onAllChannelRemoved();
+    }
+
+    public interface EditAlertDialog {
+        void show(Channel channel);
+    }
+
+    private static class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView account_pp;
+        TextView account_ac;
+        TextView account_dn;
+        TextView account_ds;
+        TextView account_fgc;
+        TextView account_frc;
+        ImageButton more_actions;
+        LinearLayout account_info;
+        LinearLayout account_container;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            account_pp = itemView.findViewById(R.id.account_pp);
+            account_dn = itemView.findViewById(R.id.account_dn);
+            account_ac = itemView.findViewById(R.id.account_ac);
+            account_ds = itemView.findViewById(R.id.account_ds);
+            account_fgc = itemView.findViewById(R.id.account_fgc);
+            account_frc = itemView.findViewById(R.id.account_frc);
+            account_info = itemView.findViewById(R.id.account_info);
+            more_actions = itemView.findViewById(R.id.more_actions);
+            account_container = itemView.findViewById(R.id.account_container);
+        }
+    }
+
+}

app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java

@@ -17,6 +17,8 @@ package app.fedilab.fedilabtube.drawer;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
+import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -46,29 +48,28 @@ import java.util.regex.Pattern;
 import app.fedilab.fedilabtube.PeertubeActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.CommentData.Comment;
-import app.fedilab.fedilabtube.client.entities.Status;
-import app.fedilab.fedilabtube.client.entities.StatusDrawerParams;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import es.dmoral.toasty.Toasty;
 
 import static android.content.Context.MODE_PRIVATE;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.PEERTUBEDELETECOMMENT;
 
 
-public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 
     private Context context;
-    private List<Status> statuses;
+    private List<Comment> comments;
 
-    private StatusListAdapter statusListAdapter;
+    private CommentListAdapter commentListAdapter;
 
 
-    public StatusListAdapter(StatusDrawerParams statusDrawerParams) {
+    public CommentListAdapter(List<Comment> comments) {
-        statuses = statusDrawerParams.getStatuses();
+        this.comments = comments;
-        statusListAdapter = this;
+        commentListAdapter = this;
     }
 
     @Override
@@ -78,7 +79,7 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     @Override
     public int getItemCount() {
-        return statuses.size();
+        return comments.size();
     }
 
 
@@ -102,16 +103,12 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
         final ViewHolder holder = (ViewHolder) viewHolder;
 
-        final Status status = statuses.get(i);
+        final Comment comment = comments.get(i);
 
 
-        if (status == null)
+        if (comment == null)
             return;
-        if (status.getVisibility() == null) {
+        if (comment.getAccount() != null && comment.getAccount().getId().equals(userId))
-            status.setVisibility("public");
-        }
-
-        if (status.getAccount() != null && status.getAccount().getId().equals(userId))
             holder.status_peertube_delete.setVisibility(View.VISIBLE);
         else
             holder.status_peertube_delete.setVisibility(View.GONE);
@@ -123,7 +120,7 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
             builderInner.setPositiveButton(R.string.yes, (dialog, which) -> {
                 PostActionsVM viewModel = new ViewModelProvider((ViewModelStoreOwner) context).get(PostActionsVM.class);
-                viewModel.post(PeertubeAPI.StatusAction.PEERTUBEDELETECOMMENT, PeertubeActivity.video_id, status.getId(), null).observe((LifecycleOwner) context, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.PEERTUBEDELETECOMMENT, apiResponse));
+                viewModel.post(PEERTUBEDELETECOMMENT, PeertubeActivity.video_id, comment.getId()).observe((LifecycleOwner) context, apiResponse -> manageVIewPostActions(PEERTUBEDELETECOMMENT, apiResponse));
                 dialog.dismiss();
             });
             builderInner.show();
@@ -140,22 +137,23 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             return false;
         });
 
-        //Click on a conversation
+        Spanned commentSpan;
-
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-        holder.status_content.setText(status.getContentSpan(), TextView.BufferType.SPANNABLE);
+            commentSpan = Html.fromHtml(comment.getDescription(), Html.FROM_HTML_MODE_LEGACY);
+        else
+            commentSpan = Html.fromHtml(comment.getDescription());
+        holder.status_content.setText(commentSpan, TextView.BufferType.SPANNABLE);
 
         holder.status_content.setMovementMethod(LinkMovementMethod.getInstance());
 
 
-        final Account accountForUrl;
-        accountForUrl = status.getAccount();
         holder.status_account_displayname.setVisibility(View.GONE);
-        if (status.getAccount() != null) {
+        if (comment.getAccount() != null) {
-            holder.status_account_displayname_owner.setText(status.getAccount().getUsername().replace("@", ""), TextView.BufferType.SPANNABLE);
+            holder.status_account_displayname_owner.setText(comment.getAccount().getName().replace("@", ""), TextView.BufferType.SPANNABLE);
             Spannable wordtoSpan;
             Pattern hashAcct;
-            wordtoSpan = new SpannableString("@" + status.getAccount().getAcct());
+            wordtoSpan = new SpannableString("@" + comment.getAccount().getAcct());
-            hashAcct = Pattern.compile("(@" + status.getAccount().getAcct() + ")");
+            hashAcct = Pattern.compile("(@" + comment.getAccount().getAcct() + ")");
             Matcher matcherAcct = hashAcct.matcher(wordtoSpan);
             while (matcherAcct.find()) {
                 int matchStart = matcherAcct.start(1);
@@ -169,25 +167,25 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
 
 
-        holder.status_toot_date.setText(Helper.dateDiff(context, status.getCreated_at()));
+        holder.status_toot_date.setText(Helper.dateDiff(context, comment.getCreatedAt()));
 
 
-        Helper.loadGiF(context, accountForUrl, holder.status_account_profile);
+        Helper.loadGiF(context, comment.getAccount().getAvatar().getPath(), holder.status_account_profile);
     }
 
-    public void manageVIewPostActions(PeertubeAPI.StatusAction statusAction, APIResponse apiResponse) {
+    public void manageVIewPostActions(RetrofitPeertubeAPI.ActionType statusAction, APIResponse apiResponse) {
 
         if (apiResponse.getError() != null) {
             Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             return;
         }
 
-        if (statusAction == PeertubeAPI.StatusAction.PEERTUBEDELETECOMMENT) {
+        if (statusAction == RetrofitPeertubeAPI.ActionType.PEERTUBEDELETECOMMENT) {
             int position = 0;
-            for (Status status : statuses) {
+            for (Comment comment : comments) {
-                if (status.getId().equals(apiResponse.getTargetedId())) {
+                if (comment.getId().equals(apiResponse.getTargetedId())) {
-                    statuses.remove(status);
+                    comments.remove(comment);
-                    statusListAdapter.notifyItemRemoved(position);
+                    commentListAdapter.notifyItemRemoved(position);
                     break;
                 }
                 position++;

app/src/main/java/app/fedilab/fedilabtube/drawer/InstanceAdapter.java

@@ -30,13 +30,11 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.client.entities.Instance;
+import app.fedilab.fedilabtube.client.data.InstanceData.Instance;
 import app.fedilab.fedilabtube.helper.RoundedBackgroundSpan;
 
 import static android.app.Activity.RESULT_OK;
@@ -83,10 +81,8 @@ public class InstanceAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         if (peertubeInformation != null && peertubeInformation.getCategories() != null) {
             LinkedHashMap<Integer, String> info_cat = new LinkedHashMap<>(peertubeInformation.getCategories());
             if (instance.getCategories() != null && instance.getCategories().size() > 0 && instance.getSpannableStringBuilder() == null) {
-                Iterator<Map.Entry<Integer, Integer>> it = instance.getCategories().entrySet().iterator();
+                for (int category : instance.getCategories()) {
-                while (it.hasNext()) {
+                    String cat = info_cat.get(category);
-                    Map.Entry<Integer, Integer> pair = it.next();
-                    String cat = info_cat.get(pair.getKey());
                     stringBuilder.append(between);
                     if (cat != null && cat.trim().toLowerCase().compareTo("null") != 0) {
                         if (between.length() == 0) between = "  ";
@@ -94,7 +90,6 @@ public class InstanceAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                         stringBuilder.append(tag);
                         stringBuilder.setSpan(new RoundedBackgroundSpan(context), stringBuilder.length() - tag.length(), stringBuilder.length() - tag.length() + tag.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
                     }
-                    it.remove();
                 }
                 instance.setSpannableStringBuilder(stringBuilder);
             }
@@ -107,11 +102,8 @@ public class InstanceAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             LinkedHashMap<String, String> info_lang = new LinkedHashMap<>(peertubeInformation.getLanguages());
             StringBuilder languages = new StringBuilder();
             if (instance.getLanguages() != null && instance.getLanguages().size() > 0) {
-                Iterator<Map.Entry<Integer, String>> it = instance.getLanguages().entrySet().iterator();
+                for (String language : instance.getLanguages()) {
-                while (it.hasNext()) {
+                    languages.append(info_lang.get(language)).append(" ");
-                    Map.Entry<Integer, String> pair = it.next();
-                    languages.append(info_lang.get(pair.getValue())).append(" ");
-                    it.remove();
                 }
             }
             if (languages.toString().trim().length() == 0) {

app/src/main/java/app/fedilab/fedilabtube/drawer/OwnAccountsAdapter.java

@@ -25,11 +25,10 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-
 import java.util.List;
 
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.helper.Helper;
 
 
@@ -80,7 +79,7 @@ public class OwnAccountsAdapter extends ArrayAdapter<Account> {
 
         holder.account_un.setText(String.format("@%s", account.getAcct()));
         //Profile picture
-        Helper.loadGiF(holder.account_pp.getContext(), account.getAvatar().compareTo("null") != 0 ? "https://" + account.getInstance() + account.getAvatar() : "null", holder.account_pp);
+        Helper.loadGiF(holder.account_pp.getContext(), account.getAvatar().getPath(), holder.account_pp);
         return convertView;
     }
 

app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java

@@ -28,25 +28,23 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-
 import java.util.List;
 
 import app.fedilab.fedilabtube.PeertubeActivity;
 import app.fedilab.fedilabtube.PeertubeEditUploadActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.ShowAccountActivity;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
-import app.fedilab.fedilabtube.client.entities.Peertube;
+import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.helper.Helper;
 
 
 public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    private List<Peertube> peertubes;
+    private List<VideoData.Video> peertubes;
     private Context context;
 
-    public PeertubeAdapter(List<Peertube> peertubes) {
+    public PeertubeAdapter(List<VideoData.Video> peertubes) {
         this.peertubes = peertubes;
 
     }
@@ -64,9 +62,8 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
 
         final PeertubeAdapter.ViewHolder holder = (PeertubeAdapter.ViewHolder) viewHolder;
-        final Peertube peertube = peertubes.get(position);
+        final VideoData.Video peertube = peertubes.get(position);
-        if (peertube.getInstance() == null)
+
-            peertube.setInstance(Helper.getLiveInstance(context));
         Account account = peertube.getAccount();
 
         SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@@ -76,27 +73,17 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
         if (peertube.getChannel() == null) {
             holder.peertube_account_name.setText(account.getAcct());
-            if (account.getAvatar() != null && !account.getAvatar().equals("null") && !account.getAvatar().startsWith("http")) {
+            Helper.loadGiF(context, account.getAvatar().getPath(), holder.peertube_profile);
-                account.setAvatar("https://" + peertube.getInstance() + account.getAvatar());
-                account.setAvatar_static(account.getAvatar());
-            }
-            Helper.loadGiF(context, account, holder.peertube_profile);
         } else {
             holder.peertube_account_name.setText(peertube.getChannel().getAcct());
-            if (peertube.getChannel().getAvatar() != null && !peertube.getChannel().getAvatar().equals("null") && !peertube.getChannel().getAvatar().startsWith("http")) {
+            Helper.loadGiF(context, peertube.getChannel().getAvatar().getPath(), holder.peertube_profile);
-                peertube.getChannel().setAvatar("https://" + peertube.getInstance() + peertube.getChannel().getAvatar());
-                peertube.getChannel().setAvatar_static(peertube.getChannel().getAvatar());
-            }
-            Helper.loadGiF(context, peertube.getChannel(), holder.peertube_profile);
         }
         holder.peertube_title.setText(peertube.getName());
         holder.peertube_duration.setText(Helper.secondsToString(peertube.getDuration()));
-        holder.peertube_date.setText(String.format(" - %s", Helper.dateDiff(context, peertube.getCreated_at())));
+        holder.peertube_date.setText(String.format(" - %s", Helper.dateDiff(context, peertube.getCreatedAt())));
-        holder.peertube_views.setText(context.getString(R.string.number_view_video, Helper.withSuffix(peertube.getView())));
+        holder.peertube_views.setText(context.getString(R.string.number_view_video, Helper.withSuffix(peertube.getViews())));
 
-        Glide.with(holder.peertube_video_image.getContext())
+        Helper.loadGiF(context, peertube.getThumbnailPath(), holder.peertube_video_image);
-                .load("https://" + peertube.getInstance() + peertube.getThumbnailPath())
-                .into(holder.peertube_video_image);
 
 
         if (!ownVideos) {
@@ -114,17 +101,17 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             });
         }
 
-        if (peertube.getHeaderType() != null && peertube.getHeaderTypeValue() != null) {
+        if (peertube.getTags() != null) {
-            String type = peertube.getHeaderType();
+            String[] type = peertube.getTags();
-            if ("tags".equals(type)) {
+            if (type.length > 0) {
-                holder.header_title.setText(String.format("#%s", peertube.getHeaderTypeValue()));
+                holder.header_title.setText(String.format("#%s", peertube.getTags()[0]));
-            } else {
-                holder.header_title.setText(peertube.getHeaderTypeValue());
-            }
                 holder.header_title.setVisibility(View.VISIBLE);
             } else {
                 holder.header_title.setVisibility(View.GONE);
             }
+        } else {
+            holder.header_title.setVisibility(View.GONE);
+        }
 
         if (!ownVideos) {
             holder.bottom_container.setOnClickListener(v -> {

app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java

@@ -35,18 +35,18 @@ import app.fedilab.fedilabtube.LoginActivity;
 import app.fedilab.fedilabtube.PeertubeActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.ShowAccountActivity;
-import app.fedilab.fedilabtube.client.entities.PeertubeAccountNotification;
+import app.fedilab.fedilabtube.client.data.AccountData;
-import app.fedilab.fedilabtube.client.entities.PeertubeNotification;
+import app.fedilab.fedilabtube.client.data.NotificationData.Notification;
-import app.fedilab.fedilabtube.client.entities.PeertubeVideoNotification;
+import app.fedilab.fedilabtube.client.entities.Actor;
 import app.fedilab.fedilabtube.helper.Helper;
 
 
 public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private Context context;
-    private List<PeertubeNotification> notifications;
+    private List<Notification> notifications;
 
-    public PeertubeNotificationsListAdapter(List<PeertubeNotification> notifications) {
+    public PeertubeNotificationsListAdapter(List<Notification> notifications) {
         this.notifications = notifications;
     }
 
@@ -63,91 +63,90 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
 
         ViewHolder holder = (ViewHolder) viewHolder;
-        PeertubeNotification notification = notifications.get(position);
+        Notification notification = notifications.get(position);
         //Follow Notification
-        PeertubeAccountNotification accountAction = null;
+
-        PeertubeVideoNotification videoAction;
+
-        if (notification.getPeertubeActorFollow() != null) {
+        AccountData.Account accountAction = null;
-            String profileUrl = notification.getPeertubeActorFollow().getFollower().getAvatar();
+        if (notification.getActorFollow() != null) {
+            String profileUrl = notification.getActorFollow().getFollower().getAvatar().getPath();
             Helper.loadGiF(context, profileUrl, holder.peertube_notif_pp);
-            accountAction = notification.getPeertubeActorFollow().getFollower();
+            Actor accountActionFollow = notification.getActorFollow().getFollower();
-            String type = notification.getPeertubeActorFollow().getFollowing().getType();
+            String type = notification.getActorFollow().getFollowing().getType();
             String message;
             if (type != null && type.equals("account")) {
-                message = context.getString(R.string.peertube_follow_channel, notification.getPeertubeActorFollow().getFollower().getDisplayName(), notification.getPeertubeActorFollow().getFollowing().getDisplayName());
+                message = context.getString(R.string.peertube_follow_channel, notification.getActorFollow().getFollower().getDisplayName(), notification.getActorFollow().getFollowing().getDisplayName());
             } else {
-                message = context.getString(R.string.peertube_follow_account, accountAction.getDisplayName());
+                message = context.getString(R.string.peertube_follow_account, accountActionFollow.getDisplayName());
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                 holder.peertube_notif_message.setText(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY));
             else
                 holder.peertube_notif_message.setText(Html.fromHtml(message));
-            PeertubeAccountNotification finalAccountAction1 = accountAction;
             holder.peertube_notif_pp.setOnClickListener(v -> {
                 Intent intent = new Intent(context, ShowAccountActivity.class);
                 Bundle b = new Bundle();
-                b.putString("accountId", finalAccountAction1.getName() + "@" + finalAccountAction1.getHost());
+                b.putString("accountId", accountActionFollow.getName() + "@" + accountActionFollow.getHost());
                 b.putBoolean("ischannel", true);
                 intent.putExtras(b);
                 context.startActivity(intent);
             });
-        } else if (notification.getPeertubeComment() != null) { //Comment Notification
+        } else if (notification.getComment() != null) { //Comment Notification
-            String profileUrl = notification.getPeertubeComment().getPeertubeAccountNotification().getAvatar();
+            String profileUrl = notification.getComment().getAccount().getAvatar().getPath();
             Helper.loadGiF(context, profileUrl, holder.peertube_notif_pp);
-            accountAction = notification.getPeertubeComment().getPeertubeAccountNotification();
+            accountAction = notification.getComment().getAccount();
-            videoAction = notification.getPeertubeComment().getPeertubeVideoNotification();
+            String message = context.getString(R.string.peertube_comment_on_video, accountAction.getDisplayName(), accountAction.getName());
-            String message = context.getString(R.string.peertube_comment_on_video, accountAction.getDisplayName(), videoAction.getName());
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                 holder.peertube_notif_message.setText(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY));
             else
                 holder.peertube_notif_message.setText(Html.fromHtml(message));
-            PeertubeVideoNotification finalVideoAction1 = videoAction;
+            AccountData.Account finalAccountAction1 = accountAction;
             holder.peertube_notif_message.setOnClickListener(v -> {
                 Intent intent = new Intent(context, PeertubeActivity.class);
                 Bundle b = new Bundle();
-                b.putString("peertube_instance", Helper.getLiveInstance(context));
+                b.putString("peertube_instance", finalAccountAction1.getHost());
-                b.putString("video_id", finalVideoAction1.getUuid());
+                b.putString("video_id", notification.getComment().getVideo().getUuid());
                 intent.putExtras(b);
                 context.startActivity(intent);
             });
-        } else {//Other Notifications
+        } else {
-            if (notification.getPeertubeVideoNotification() != null && notification.getPeertubeVideoNotification().getPeertubeAccountNotification() != null) {
+            String profileUrl = notification.getVideo().getAccount().getAvatar().getPath();
-                String profileUrl = notification.getPeertubeVideoNotification().getPeertubeAccountNotification().getAvatar();
             Helper.loadGiF(context, profileUrl, holder.peertube_notif_pp);
-                accountAction = notification.getPeertubeVideoNotification().getPeertubeAccountNotification();
+            accountAction = notification.getVideo().getAccount();
-                videoAction = notification.getPeertubeVideoNotification();
             String message = "";
+            if (notification.getVideo() != null) {
+
                 if (notification.getType() == LoginActivity.MY_VIDEO_PUBLISHED) {
-                    message = context.getString(R.string.peertube_video_published, videoAction.getName());
+                    message = context.getString(R.string.peertube_video_published, notification.getVideo().getName());
                 } else if (notification.getType() == LoginActivity.MY_VIDEO_IMPORT_ERROR) {
-                    message = context.getString(R.string.peertube_video_import_error, videoAction.getName());
+                    message = context.getString(R.string.peertube_video_import_error, notification.getVideo().getName());
                 } else if (notification.getType() == LoginActivity.MY_VIDEO_IMPORT_SUCCESS) {
-                    message = context.getString(R.string.peertube_video_import_success, videoAction.getName());
+                    message = context.getString(R.string.peertube_video_import_success, notification.getVideo().getName());
                 } else if (notification.getType() == LoginActivity.NEW_VIDEO_FROM_SUBSCRIPTION) {
-                    message = context.getString(R.string.peertube_video_from_subscription, accountAction.getDisplayName(), videoAction.getName());
+                    message = context.getString(R.string.peertube_video_from_subscription, accountAction.getDisplayName(), notification.getVideo().getName());
                 } else if (notification.getType() == LoginActivity.BLACKLIST_ON_MY_VIDEO) {
-                    message = context.getString(R.string.peertube_video_blacklist, videoAction.getName());
+                    message = context.getString(R.string.peertube_video_blacklist, notification.getVideo().getName());
                 } else if (notification.getType() == LoginActivity.UNBLACKLIST_ON_MY_VIDEO) {
-                    message = context.getString(R.string.peertube_video_unblacklist, videoAction.getName());
+                    message = context.getString(R.string.peertube_video_unblacklist, notification.getVideo().getName());
                 }
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                     holder.peertube_notif_message.setText(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY));
                 else
                     holder.peertube_notif_message.setText(Html.fromHtml(message));
-                PeertubeVideoNotification finalVideoAction = videoAction;
                 holder.peertube_notif_message.setOnClickListener(v -> {
                     Intent intent = new Intent(context, PeertubeActivity.class);
                     Bundle b = new Bundle();
                     b.putString("peertube_instance", Helper.getLiveInstance(context));
-                    b.putString("video_id", finalVideoAction.getUuid());
+                    b.putString("video_id", notification.getVideo().getUuid());
                     intent.putExtras(b);
                     context.startActivity(intent);
                 });
             }
         }
         holder.peertube_notif_date.setText(Helper.dateDiff(context, notification.getCreatedAt()));
-        PeertubeAccountNotification finalAccountAction = accountAction;
+
+        AccountData.Account finalAccountAction = accountAction;
         holder.peertube_notif_pp.setOnClickListener(v -> {
             if (finalAccountAction != null) {
                 Intent intent = new Intent(context, ShowAccountActivity.class);

app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java

@@ -36,13 +36,12 @@ import androidx.lifecycle.ViewModelStoreOwner;
 import com.bumptech.glide.Glide;
 
 import java.util.List;
-import java.util.Map;
 
 import app.fedilab.fedilabtube.AllPlaylistsActivity;
 import app.fedilab.fedilabtube.PlaylistsActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.entities.Playlist;
+import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 
 
@@ -97,7 +96,7 @@ public class PlaylistAdapter extends BaseAdapter {
 
         if (playlist.getOwnerAccount() != null) {
             Glide.with(context)
-                    .load("https://" + playlist.getOwnerAccount().getHost() + playlist.getThumbnailPath())
+                    .load("https://" + playlist.getOwnerAccount() + playlist.getThumbnailPath())
                     .into(holder.preview_playlist);
         }
 
@@ -108,8 +107,7 @@ public class PlaylistAdapter extends BaseAdapter {
         } else {
             holder.preview_description.setVisibility(View.GONE);
         }
-        Map.Entry<Integer, String> privacyM = playlist.getPrivacy().entrySet().iterator().next();
+        holder.preview_visibility.setText(playlist.getPrivacy().getLabel());
-        holder.preview_visibility.setText(privacyM.getValue());
 
         holder.playlist_container.setOnClickListener(v -> {
             Intent intent = new Intent(context, PlaylistsActivity.class);
@@ -140,7 +138,7 @@ public class PlaylistAdapter extends BaseAdapter {
                                     playlists.remove(playlist);
                                     notifyDataSetChanged();
                                     PlaylistsVM viewModel = new ViewModelProvider((ViewModelStoreOwner) context).get(PlaylistsVM.class);
-                                    viewModel.manage(PlaylistsVM.action.DELETE_PLAYLIST, playlist, null, null).observe((LifecycleOwner) context, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.DELETE_PLAYLIST, apiResponse));
+                                    viewModel.manage(PlaylistsVM.action.DELETE_PLAYLIST, playlist, null).observe((LifecycleOwner) context, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.DELETE_PLAYLIST, apiResponse));
 
                                     if (playlists.size() == 0 && textviewNoAction != null && textviewNoAction.getVisibility() == View.GONE)
                                         textviewNoAction.setVisibility(View.VISIBLE);

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayAccountsFragment.java

@@ -14,25 +14,16 @@ package app.fedilab.fedilabtube.fragment;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
@@ -47,32 +38,27 @@ import java.util.List;
 
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.HttpsConnection;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.data.AccountData;
-import app.fedilab.fedilabtube.client.entities.Account;
-import app.fedilab.fedilabtube.client.entities.ChannelCreation;
 import app.fedilab.fedilabtube.drawer.AccountsListAdapter;
-import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.AccountsVM;
 import es.dmoral.toasty.Toasty;
 
 
-public class DisplayAccountsFragment extends Fragment implements AccountsListAdapter.AllAccountsRemoved, AccountsListAdapter.EditAlertDialog {
+public class DisplayAccountsFragment extends Fragment implements AccountsListAdapter.AllAccountsRemoved {
 
     private boolean flag_loading;
     private Context context;
     private AccountsListAdapter accountsListAdapter;
     private String max_id;
-    private List<Account> accounts;
+    private List<AccountData.Account> accounts;
     private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
     private boolean firstLoad;
     private SwipeRefreshLayout swipeRefreshLayout;
-    private String name;
     private boolean swiped;
     private RecyclerView lv_accounts;
     private View rootView;
-    private AccountsVM.accountFetch accountFetch;
+    private RetrofitPeertubeAPI.DataType accountFetch;
-    private FloatingActionButton action_button;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -84,9 +70,8 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
         accounts = new ArrayList<>();
         if (bundle != null) {
             if (bundle.containsKey("accountFetch")) {
-                accountFetch = (AccountsVM.accountFetch) bundle.getSerializable("accountFetch");
+                accountFetch = (RetrofitPeertubeAPI.DataType) bundle.getSerializable("accountFetch");
             }
-            name = bundle.getString("name", null);
         }
         max_id = null;
         firstLoad = true;
@@ -96,10 +81,6 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
         swipeRefreshLayout = rootView.findViewById(R.id.swipeContainer);
 
 
-        if (getActivity() != null) {
-            action_button = getActivity().findViewById(R.id.action_button);
-            action_button.setOnClickListener(view -> manageAlert(null));
-        }
         lv_accounts = rootView.findViewById(R.id.lv_elements);
         lv_accounts.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL));
         mainLoader = rootView.findViewById(R.id.loader);
@@ -109,10 +90,11 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
         nextElementLoader.setVisibility(View.GONE);
         accountsListAdapter = new AccountsListAdapter(accountFetch, this.accounts);
         accountsListAdapter.allAccountsRemoved = this;
-        accountsListAdapter.editAlertDialog = this;
         lv_accounts.setAdapter(accountsListAdapter);
+        FloatingActionButton action_button = rootView.findViewById(R.id.action_button);
+        action_button.setVisibility(View.GONE);
         TextView no_action_text = rootView.findViewById(R.id.no_action_text);
-        if (accountFetch == AccountsVM.accountFetch.MUTED) {
+        if (accountFetch == RetrofitPeertubeAPI.DataType.MUTED) {
             no_action_text.setText(context.getString(R.string.no_muted));
         }
         final LinearLayoutManager mLayoutManager;
@@ -128,12 +110,7 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
                         if (!flag_loading) {
                             flag_loading = true;
                             AccountsVM viewModel = new ViewModelProvider(DisplayAccountsFragment.this).get(AccountsVM.class);
-                            if (accountFetch == null) {
+                            viewModel.getAccounts(accountFetch, max_id).observe(DisplayAccountsFragment.this.requireActivity(), apiResponse -> manageViewAccounts(apiResponse));
-                                viewModel.getAccounts(null, name, AccountsVM.accountFetch.SINGLE_ACCOUNT).observe(DisplayAccountsFragment.this.requireActivity(), apiResponse -> manageViewAccounts(apiResponse));
-                            } else {
-                                String param = accountFetch == AccountsVM.accountFetch.CHANNEL ? name : max_id;
-                                viewModel.getAccounts(param, null, accountFetch).observe(DisplayAccountsFragment.this.requireActivity(), apiResponse -> manageViewAccounts(apiResponse));
-                            }
                             nextElementLoader.setVisibility(View.VISIBLE);
                         }
                     } else {
@@ -144,23 +121,13 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
         });
         swipeRefreshLayout.setOnRefreshListener(this::pullToRefresh);
         AccountsVM viewModel = new ViewModelProvider(this).get(AccountsVM.class);
-        if (accountFetch == null) {
+        viewModel.getAccounts(RetrofitPeertubeAPI.DataType.MUTED, max_id).observe(DisplayAccountsFragment.this.requireActivity(), this::manageViewAccounts);
-            viewModel.getAccounts(null, name, AccountsVM.accountFetch.SINGLE_ACCOUNT).observe(DisplayAccountsFragment.this.requireActivity(), this::manageViewAccounts);
-        } else {
-            String param = accountFetch == AccountsVM.accountFetch.CHANNEL ? name : null;
-            viewModel.getAccounts(param, null, accountFetch).observe(DisplayAccountsFragment.this.requireActivity(), this::manageViewAccounts);
-        }
         return rootView;
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        if (accountFetch == AccountsVM.accountFetch.CHANNEL) {
-            action_button.setVisibility(View.VISIBLE);
-        } else {
-            action_button.setVisibility(View.GONE);
-        }
     }
 
     @Override
@@ -202,7 +169,7 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
             return;
         }
         flag_loading = (apiResponse.getMax_id() == null);
-        List<Account> accounts = apiResponse.getAccounts();
+        List<AccountData.Account> accounts = apiResponse.getAccounts();
         if (!swiped && firstLoad && (accounts == null || accounts.size() == 0))
             textviewNoAction.setVisibility(View.VISIBLE);
         else
@@ -231,12 +198,7 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
         swiped = true;
         swipeRefreshLayout.setRefreshing(true);
         AccountsVM viewModel = new ViewModelProvider(this).get(AccountsVM.class);
-        if (accountFetch == null) {
+        viewModel.getAccounts(RetrofitPeertubeAPI.DataType.MUTED, null).observe(DisplayAccountsFragment.this.requireActivity(), this::manageViewAccounts);
-            viewModel.getAccounts(null, name, AccountsVM.accountFetch.SINGLE_ACCOUNT).observe(DisplayAccountsFragment.this.requireActivity(), this::manageViewAccounts);
-        } else {
-            String param = accountFetch == AccountsVM.accountFetch.CHANNEL ? name : null;
-            viewModel.getAccounts(param, null, accountFetch).observe(DisplayAccountsFragment.this.requireActivity(), this::manageViewAccounts);
-        }
     }
 
     @Override
@@ -245,118 +207,4 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
     }
 
 
-    public void manageAlert(ChannelCreation oldChannelValues) {
-
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
-        LayoutInflater inflater1 = ((Activity) context).getLayoutInflater();
-        View dialogView = inflater1.inflate(R.layout.add_channel, new LinearLayout(context), false);
-        dialogBuilder.setView(dialogView);
-        EditText display_name = dialogView.findViewById(R.id.display_name);
-        EditText name = dialogView.findViewById(R.id.name);
-        EditText description = dialogView.findViewById(R.id.description);
-        if (oldChannelValues != null) {
-            display_name.setText(oldChannelValues.getDisplayName());
-            name.setText(oldChannelValues.getName());
-            description.setText(oldChannelValues.getDescription());
-            name.setEnabled(false);
-        }
-        dialogBuilder.setPositiveButton(R.string.validate, null);
-        dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
-
-        AlertDialog alertDialog = dialogBuilder.create();
-
-        alertDialog.setOnShowListener(dialogInterface -> {
-
-            Button button = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
-            button.setOnClickListener(view -> {
-                if (display_name.getText() != null && display_name.getText().toString().trim().length() > 0 && name.getText() != null && name.getText().toString().trim().length() > 0) {
-
-                    ChannelCreation channelCreation = new ChannelCreation();
-                    channelCreation.setDisplayName(display_name.getText().toString().trim());
-                    channelCreation.setName(name.getText().toString().trim());
-                    if (description.getText() != null && description.getText().toString().trim().length() > 0) {
-                        channelCreation.setDescription(description.getText().toString().trim());
-                    }
-                    new Thread(() -> {
-                        try {
-                            if (oldChannelValues == null) {
-                                new PeertubeAPI(context).createChannel(channelCreation);
-                            } else {
-                                new PeertubeAPI(context).updateChannel(channelCreation.getName() + "@" + Helper.getLiveInstance(context), channelCreation);
-                            }
-                            Handler mainHandler = new Handler(Looper.getMainLooper());
-                            Runnable myRunnable = () -> {
-
-                                if (getActivity() == null)
-                                    return;
-                                if (oldChannelValues == null) {
-                                    Account channel = new Account();
-                                    channel.setAcct(channelCreation.getName() + "@" + Helper.getLiveInstance(context));
-                                    channel.setUsername(channelCreation.getName());
-                                    channel.setDisplay_name(channelCreation.getDisplayName());
-                                    channel.setNote(channelCreation.getDescription());
-                                    accounts.add(0, channel);
-                                    accountsListAdapter.notifyItemInserted(0);
-                                } else {
-                                    int position = 0;
-                                    for (Account account : accounts) {
-                                        if (account.getId().compareTo(oldChannelValues.getId()) == 0) {
-                                            account.setNote(channelCreation.getDescription());
-                                            account.setDisplay_name(channelCreation.getDisplayName());
-                                            break;
-                                        }
-                                        position++;
-                                    }
-                                    accountsListAdapter.notifyItemChanged(position);
-                                }
-                                action_button.setEnabled(true);
-                            };
-                            mainHandler.post(myRunnable);
-                        } catch (HttpsConnection.HttpsConnectionException e) {
-
-                            e.printStackTrace();
-                            Handler mainHandler = new Handler(Looper.getMainLooper());
-                            Runnable myRunnable = () -> {
-                                action_button.setEnabled(true);
-                                if (e.getMessage() != null) {
-                                    Toasty.error(context, e.getMessage(), Toast.LENGTH_LONG).show();
-                                } else {
-                                    Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                                }
-                            };
-                            mainHandler.post(myRunnable);
-                        }
-                    }).start();
-                    alertDialog.dismiss();
-                    action_button.setEnabled(false);
-                } else {
-                    Toasty.error(context, context.getString(R.string.error_display_name_channel), Toast.LENGTH_LONG).show();
-                }
-            });
-        });
-        if (oldChannelValues == null) {
-            alertDialog.setTitle(getString(R.string.action_channel_create));
-        } else {
-            alertDialog.setTitle(getString(R.string.action_channel_edit));
-        }
-        alertDialog.setOnDismissListener(dialogInterface -> {
-            //Hide keyboard
-            InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-            assert imm != null;
-            imm.hideSoftInputFromWindow(display_name.getWindowToken(), 0);
-        });
-        if (alertDialog.getWindow() != null)
-            alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        alertDialog.show();
-    }
-
-    @Override
-    public void show(Account account) {
-        ChannelCreation oldChannelValues = new ChannelCreation();
-        oldChannelValues.setName(account.getUsername());
-        oldChannelValues.setDescription(account.getNote());
-        oldChannelValues.setDisplayName(account.getDisplay_name());
-        oldChannelValues.setId(account.getId());
-        manageAlert(oldChannelValues);
-    }
 }

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayChannelsFragment.java

@@ -0,0 +1,290 @@
+package app.fedilab.fedilabtube.fragment;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import app.fedilab.fedilabtube.R;
+import app.fedilab.fedilabtube.client.APIResponse;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
+import app.fedilab.fedilabtube.client.data.ChannelData;
+import app.fedilab.fedilabtube.client.entities.ChannelParams;
+import app.fedilab.fedilabtube.drawer.ChannelListAdapter;
+import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
+import es.dmoral.toasty.Toasty;
+
+
+public class DisplayChannelsFragment extends Fragment implements ChannelListAdapter.AllChannelRemoved, ChannelListAdapter.EditAlertDialog {
+
+    private Context context;
+    private ChannelListAdapter channelListAdapter;
+    private List<ChannelData.Channel> channels;
+    private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
+    private SwipeRefreshLayout swipeRefreshLayout;
+    private String name;
+    private boolean swiped;
+    private RecyclerView lv_channels;
+    private View rootView;
+    private FloatingActionButton action_button;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        rootView = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+
+        context = getContext();
+        Bundle bundle = this.getArguments();
+        channels = new ArrayList<>();
+        if (bundle != null) {
+            name = bundle.getString("name", null);
+        }
+
+        swiped = false;
+
+        swipeRefreshLayout = rootView.findViewById(R.id.swipeContainer);
+
+
+        if (getActivity() != null) {
+            action_button = getActivity().findViewById(R.id.action_button);
+            action_button.setVisibility(View.VISIBLE);
+            action_button.setOnClickListener(view -> manageAlert(null));
+        }
+
+        lv_channels = rootView.findViewById(R.id.lv_elements);
+        lv_channels.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL));
+        mainLoader = rootView.findViewById(R.id.loader);
+        nextElementLoader = rootView.findViewById(R.id.loading_next);
+        textviewNoAction = rootView.findViewById(R.id.no_action);
+        mainLoader.setVisibility(View.VISIBLE);
+        nextElementLoader.setVisibility(View.GONE);
+        channelListAdapter = new ChannelListAdapter(this.channels);
+        channelListAdapter.allChannelRemoved = this;
+        channelListAdapter.editAlertDialog = this;
+        lv_channels.setAdapter(channelListAdapter);
+
+
+        final LinearLayoutManager mLayoutManager;
+        mLayoutManager = new LinearLayoutManager(context);
+        lv_channels.setLayoutManager(mLayoutManager);
+
+        swipeRefreshLayout.setOnRefreshListener(this::pullToRefresh);
+        ChannelsVM viewModel = new ViewModelProvider(this).get(ChannelsVM.class);
+        viewModel.get(RetrofitPeertubeAPI.DataType.CHANNELS_FOR_ACCOUNT, name).observe(DisplayChannelsFragment.this.requireActivity(), this::manageViewChannels);
+        return rootView;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        rootView = null;
+    }
+
+    @Override
+    public void onCreate(Bundle saveInstance) {
+        super.onCreate(saveInstance);
+    }
+
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        this.context = context;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+    public void scrollToTop() {
+        if (lv_channels != null)
+            lv_channels.setAdapter(channelListAdapter);
+    }
+
+    private void manageViewChannels(APIResponse apiResponse) {
+        mainLoader.setVisibility(View.GONE);
+        nextElementLoader.setVisibility(View.GONE);
+        if (apiResponse.getError() != null) {
+            Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
+            swipeRefreshLayout.setRefreshing(false);
+            swiped = false;
+            return;
+        }
+        List<ChannelData.Channel> channels = apiResponse.getChannels();
+        if (!swiped && (channels == null || channels.size() == 0))
+            textviewNoAction.setVisibility(View.VISIBLE);
+        else
+            textviewNoAction.setVisibility(View.GONE);
+
+        if (swiped) {
+            channelListAdapter = new ChannelListAdapter(this.channels);
+            lv_channels.setAdapter(channelListAdapter);
+            swiped = false;
+        }
+        if (channels != null && channels.size() > 0) {
+            int currentPosition = this.channels.size();
+            this.channels.addAll(channels);
+            channelListAdapter.notifyItemRangeChanged(currentPosition, channels.size());
+        }
+        swipeRefreshLayout.setRefreshing(false);
+    }
+
+    public void pullToRefresh() {
+        channels = new ArrayList<>();
+
+        swiped = true;
+        swipeRefreshLayout.setRefreshing(true);
+        ChannelsVM viewModel = new ViewModelProvider(this).get(ChannelsVM.class);
+        viewModel.get(RetrofitPeertubeAPI.DataType.CHANNELS_FOR_ACCOUNT, name).observe(DisplayChannelsFragment.this.requireActivity(), this::manageViewChannels);
+    }
+
+    @Override
+    public void onAllChannelRemoved() {
+        textviewNoAction.setVisibility(View.VISIBLE);
+    }
+
+
+    public void manageAlert(ChannelParams oldChannelValues) {
+
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
+        LayoutInflater inflater1 = ((Activity) context).getLayoutInflater();
+        View dialogView = inflater1.inflate(R.layout.add_channel, new LinearLayout(context), false);
+        dialogBuilder.setView(dialogView);
+        EditText display_name = dialogView.findViewById(R.id.display_name);
+        EditText name = dialogView.findViewById(R.id.name);
+        EditText description = dialogView.findViewById(R.id.description);
+        if (oldChannelValues != null) {
+            display_name.setText(oldChannelValues.getDisplayName());
+            name.setText(oldChannelValues.getName());
+            description.setText(oldChannelValues.getDescription());
+            name.setEnabled(false);
+        }
+        dialogBuilder.setPositiveButton(R.string.validate, null);
+        dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
+
+        AlertDialog alertDialog = dialogBuilder.create();
+
+        alertDialog.setOnShowListener(dialogInterface -> {
+
+            Button button = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+            button.setOnClickListener(view -> {
+                if (display_name.getText() != null && display_name.getText().toString().trim().length() > 0 && name.getText() != null && name.getText().toString().trim().length() > 0) {
+
+                    ChannelParams channelCreation = new ChannelParams();
+                    channelCreation.setDisplayName(display_name.getText().toString().trim());
+                    channelCreation.setName(name.getText().toString().trim());
+                    if (description.getText() != null && description.getText().toString().trim().length() > 0) {
+                        channelCreation.setDescription(description.getText().toString().trim());
+                    }
+                    new Thread(() -> {
+                        if (oldChannelValues == null) {
+                            new RetrofitPeertubeAPI(context).createOrUpdateChannel(ChannelsVM.action.CREATE_CHANNEL, null, channelCreation, null);
+                        } else {
+                            new RetrofitPeertubeAPI(context).createOrUpdateChannel(ChannelsVM.action.UPDATE_CHANNEL, channelCreation.getName() + "@" + Helper.getLiveInstance(context), channelCreation, null);
+                        }
+                        Handler mainHandler = new Handler(Looper.getMainLooper());
+                        Runnable myRunnable = () -> {
+
+                            if (getActivity() == null)
+                                return;
+                            if (oldChannelValues == null) {
+                                ChannelData.Channel channel = new ChannelData.Channel();
+                                channel.setName(channelCreation.getName());
+                                channel.setDisplayName(channelCreation.getDisplayName());
+                                channel.setDescription(channelCreation.getDescription());
+                                channels.add(0, channel);
+                                channelListAdapter.notifyItemInserted(0);
+                            } else {
+                                int position = 0;
+                                for (ChannelData.Channel channel : channels) {
+                                    if (channel.getName().compareTo(oldChannelValues.getName()) == 0) {
+                                        channel.setDescription(channelCreation.getDescription());
+                                        channel.setDisplayName(channelCreation.getDisplayName());
+                                        break;
+                                    }
+                                    position++;
+                                }
+                                channelListAdapter.notifyItemChanged(position);
+                            }
+                            action_button.setEnabled(true);
+                        };
+                        mainHandler.post(myRunnable);
+                    }).start();
+                    alertDialog.dismiss();
+                    action_button.setEnabled(false);
+                } else {
+                    Toasty.error(context, context.getString(R.string.error_display_name_channel), Toast.LENGTH_LONG).show();
+                }
+            });
+        });
+        if (oldChannelValues == null) {
+            alertDialog.setTitle(getString(R.string.action_channel_create));
+        } else {
+            alertDialog.setTitle(getString(R.string.action_channel_edit));
+        }
+        alertDialog.setOnDismissListener(dialogInterface -> {
+            //Hide keyboard
+            InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+            assert imm != null;
+            imm.hideSoftInputFromWindow(display_name.getWindowToken(), 0);
+        });
+        if (alertDialog.getWindow() != null)
+            alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        alertDialog.show();
+    }
+
+    @Override
+    public void show(ChannelData.Channel channel) {
+        ChannelParams oldChannelValues = new ChannelParams();
+        oldChannelValues.setName(channel.getName());
+        oldChannelValues.setDescription(channel.getDescription());
+        oldChannelValues.setDisplayName(channel.getDisplayName());
+        manageAlert(oldChannelValues);
+    }
+}

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayNotificationsFragment.java

@@ -35,7 +35,7 @@ import java.util.List;
 
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.entities.PeertubeNotification;
+import app.fedilab.fedilabtube.client.data.NotificationData.Notification;
 import app.fedilab.fedilabtube.drawer.PeertubeNotificationsListAdapter;
 import app.fedilab.fedilabtube.viewmodel.NotificationsVM;
 import es.dmoral.toasty.Toasty;
@@ -47,7 +47,7 @@ public class DisplayNotificationsFragment extends Fragment {
     private Context context;
     private PeertubeNotificationsListAdapter peertubeNotificationsListAdapter;
     private String max_id;
-    private List<PeertubeNotification> notifications;
+    private List<Notification> notifications;
     private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
     private boolean firstLoad;
     private SwipeRefreshLayout swipeRefreshLayout;
@@ -173,7 +173,7 @@ public class DisplayNotificationsFragment extends Fragment {
 
         int previousPosition = notifications.size();
         max_id = apiResponse.getMax_id();
-        List<PeertubeNotification> notifications = apiResponse.getPeertubeNotifications();
+        List<Notification> notifications = apiResponse.getPeertubeNotifications();
         if (!swiped && firstLoad && (notifications == null || notifications.size() == 0))
             textviewNoAction.setVisibility(View.VISIBLE);
         else

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java

@@ -17,6 +17,7 @@ package app.fedilab.fedilabtube.fragment;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -54,17 +55,20 @@ import java.util.Map;
 import app.fedilab.fedilabtube.PlaylistsActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.HttpsConnection;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
-import app.fedilab.fedilabtube.client.entities.Playlist;
+import app.fedilab.fedilabtube.client.entities.Item;
-import app.fedilab.fedilabtube.client.entities.PlaylistElement;
+import app.fedilab.fedilabtube.client.entities.PlaylistParams;
 import app.fedilab.fedilabtube.drawer.PlaylistAdapter;
+import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import es.dmoral.toasty.Toasty;
 
+import static android.content.Context.MODE_PRIVATE;
 import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.CHANNELS_FOR_ACCOUNT;
 
 
 public class DisplayPlaylistsFragment extends Fragment {
@@ -102,7 +106,7 @@ public class DisplayPlaylistsFragment extends Fragment {
         playlistAdapter = new PlaylistAdapter(context, playlists, textviewNoAction);
         lv_playlist.setAdapter(playlistAdapter);
         PlaylistsVM viewModel = new ViewModelProvider(this).get(PlaylistsVM.class);
-        viewModel.manage(PlaylistsVM.action.GET_PLAYLIST, null, null, null).observe(DisplayPlaylistsFragment.this.requireActivity(), apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_PLAYLIST, apiResponse));
+        viewModel.manage(PlaylistsVM.action.GET_PLAYLISTS, null, null).observe(DisplayPlaylistsFragment.this.requireActivity(), apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_PLAYLISTS, apiResponse));
 
         add_new = rootView.findViewById(R.id.add_new);
 
@@ -128,9 +132,10 @@ public class DisplayPlaylistsFragment extends Fragment {
                 set_upload_channel = dialogView.findViewById(R.id.set_upload_channel);
                 set_upload_privacy = dialogView.findViewById(R.id.set_upload_privacy);
 
-
+                final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+                final String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
                 ChannelsVM viewModelC = new ViewModelProvider(this).get(ChannelsVM.class);
-                viewModelC.get().observe(DisplayPlaylistsFragment.this.requireActivity(), this::manageVIewChannels);
+                viewModelC.get(CHANNELS_FOR_ACCOUNT, userId).observe(DisplayPlaylistsFragment.this.requireActivity(), this::manageVIewChannels);
 
                 display_name.setFilters(new InputFilter[]{new InputFilter.LengthFilter(120)});
                 description.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1000)});
@@ -148,49 +153,33 @@ public class DisplayPlaylistsFragment extends Fragment {
                         if (channelToSend != null) {
                             Map.Entry<String, String> channelM = channelToSend.entrySet().iterator().next();
                             idChannel = channelM.getValue();
-                            if (idChannel.length() > 0)
-                                playlist.setVideoChannelId(idChannel);
                         }
                         Map.Entry<Integer, String> privacyM = privacyToSend.entrySet().iterator().next();
-                        String label = privacyM.getValue();
+                        Item privacyItem = new Item();
-                        String idPrivacy = String.valueOf(privacyM.getKey());
+                        privacyItem.setLabel(privacyM.getValue());
-                        if (label.equals("Public") && (playlist.getVideoChannelId() == null || playlist.getVideoChannelId().equals(""))) {
+                        privacyItem.setId(privacyM.getKey());
+                        if (privacyItem.getLabel().equals("Public") && (playlist.getVideoChannel() == null)) {
                             Toasty.error(context, context.getString(R.string.error_channel_mandatory), Toast.LENGTH_LONG).show();
                         } else {
                             if (privacyToSend != null) {
-                                playlist.setPrivacy(privacyToSend);
+                                playlist.setPrivacy(privacyItem);
                             }
-                            PlaylistElement playlistElement = new PlaylistElement();
+                            PlaylistParams playlistParams = new PlaylistParams();
-                            playlistElement.setVideoChannelId(idChannel);
+                            playlistParams.setVideoChannelId(idChannel);
-                            playlistElement.setPrivacy(idPrivacy);
+                            playlistParams.setDisplayName(playlist.getDisplayName());
-                            playlistElement.setDisplayName(playlist.getDisplayName());
+                            playlistParams.setDescription(playlist.getDescription());
-                            playlistElement.setDescription(playlist.getDescription());
                             new Thread(() -> {
-                                try {
+                                APIResponse apiResponse = new RetrofitPeertubeAPI(context).createOrUpdatePlaylist(PlaylistsVM.action.CREATE_PLAYLIST, null, playlistParams, null);
-                                    String returnedId = new PeertubeAPI(context).createPlaylist(playlistElement);
                                 Handler mainHandler = new Handler(Looper.getMainLooper());
                                 Runnable myRunnable = () -> {
                                     if (getActivity() == null)
                                         return;
-                                        playlist.setId(returnedId);
+                                    playlist.setId(apiResponse.getActionReturn());
                                     playlists.add(0, playlist);
                                     playlistAdapter.notifyDataSetChanged();
                                 };
                                 mainHandler.post(myRunnable);
                                 add_new.setEnabled(true);
-                                } catch (HttpsConnection.HttpsConnectionException e) {
-                                    e.printStackTrace();
-                                    Handler mainHandler = new Handler(Looper.getMainLooper());
-                                    Runnable myRunnable = () -> {
-                                        if (e.getMessage() != null) {
-                                            Toasty.error(context, e.getMessage(), Toast.LENGTH_LONG).show();
-                                        } else {
-                                            Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                                        }
-                                        add_new.setEnabled(true);
-                                    };
-                                    mainHandler.post(myRunnable);
-                                }
                             }).start();
 
                             dialog.dismiss();
@@ -246,7 +235,7 @@ public class DisplayPlaylistsFragment extends Fragment {
             return;
         }
 
-        if (actionType == PlaylistsVM.action.GET_PLAYLIST) {
+        if (actionType == PlaylistsVM.action.GET_PLAYLISTS) {
             if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {
                 this.playlists.addAll(apiResponse.getPlaylists());
                 playlistAdapter.notifyDataSetChanged();
@@ -292,8 +281,8 @@ public class DisplayPlaylistsFragment extends Fragment {
         channelId[0] = "";
         channels = new HashMap<>();
         for (Account account : accounts) {
-            channels.put(account.getUsername(), account.getId());
+            channels.put(account.getName(), account.getId());
-            channelName[i] = account.getUsername();
+            channelName[i] = account.getName();
             channelId[i] = account.getId();
             i++;
         }

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java

@@ -44,21 +44,22 @@ import java.util.List;
 
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Peertube;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
+import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.drawer.AccountsHorizontalListAdapter;
 import app.fedilab.fedilabtube.drawer.PeertubeAdapter;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.AccountsVM;
-import app.fedilab.fedilabtube.viewmodel.FeedsVM;
+import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import app.fedilab.fedilabtube.viewmodel.SearchVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.viewmodel.FeedsVM.Type.POVERVIEW;
+import static app.fedilab.fedilabtube.viewmodel.TimelineVM.Type.POVERVIEW;
-import static app.fedilab.fedilabtube.viewmodel.FeedsVM.Type.PSUBSCRIPTIONS;
+import static app.fedilab.fedilabtube.viewmodel.TimelineVM.Type.PSUBSCRIPTIONS;
 
 
-public class DisplayStatusFragment extends Fragment implements AccountsHorizontalListAdapter.EventListener {
+public class DisplayVideosFragment extends Fragment implements AccountsHorizontalListAdapter.EventListener {
 
 
     private LinearLayoutManager mLayoutManager;
@@ -68,9 +69,9 @@ public class DisplayStatusFragment extends Fragment implements AccountsHorizonta
     private PeertubeAdapter peertubeAdapater;
     private AccountsHorizontalListAdapter accountsHorizontalListAdapter;
     private String max_id, max_id_accounts;
-    private List<Peertube> peertubes;
+    private List<VideoData.Video> peertubes;
     private List<Account> accounts;
-    private FeedsVM.Type type;
+    private TimelineVM.Type type;
     private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
     private boolean firstLoad;
     private SwipeRefreshLayout swipeRefreshLayout;
@@ -84,11 +85,11 @@ public class DisplayStatusFragment extends Fragment implements AccountsHorizonta
     private boolean check_ScrollingUp;
     private String forAccount;
     private ConstraintLayout top_account_container;
-    private FeedsVM viewModelFeeds;
+    private TimelineVM viewModelFeeds;
     private SearchVM viewModelSearch;
     private AccountsVM viewModelAccounts;
 
-    public DisplayStatusFragment() {
+    public DisplayVideosFragment() {
     }
 
 
@@ -106,16 +107,16 @@ public class DisplayStatusFragment extends Fragment implements AccountsHorizonta
             search_peertube = bundle.getString("search_peertube", null);
             targetedId = bundle.getString("targetedid", null);
             ischannel = bundle.getBoolean("ischannel", false);
-            type = (FeedsVM.Type) bundle.get("type");
+            type = (TimelineVM.Type) bundle.get("type");
         }
 
         if (getArguments() != null && type == null) {
-            type = DisplayStatusFragmentArgs.fromBundle(getArguments()).getType();
+            type = DisplayVideosFragment.fromBundle(getArguments()).getType();
         }
 
 
         if (ischannel) {
-            type = FeedsVM.Type.CHANNEL;
+            type = TimelineVM.Type.CHANNEL;
         }
 
         forAccount = null;
@@ -159,18 +160,17 @@ public class DisplayStatusFragment extends Fragment implements AccountsHorizonta
             lv_status.addItemDecoration(new GridSpacingItemDecoration(spanCount, spacing, true));
             lv_status.setLayoutManager(gLayoutManager);
         }
-        viewModelAccounts = new ViewModelProvider(DisplayStatusFragment.this).get(AccountsVM.class);
+        viewModelAccounts = new ViewModelProvider(DisplayVideosFragment.this).get(AccountsVM.class);
-        viewModelFeeds = new ViewModelProvider(DisplayStatusFragment.this).get(FeedsVM.class);
+        viewModelFeeds = new ViewModelProvider(DisplayVideosFragment.this).get(TimelineVM.class);
-        viewModelSearch = new ViewModelProvider(DisplayStatusFragment.this).get(SearchVM.class);
+        viewModelSearch = new ViewModelProvider(DisplayVideosFragment.this).get(SearchVM.class);
         swipeRefreshLayout.setOnRefreshListener(this::pullToRefresh);
         //Load data depending of the value
         if (search_peertube == null) { //Not a Peertube search
-            viewModelFeeds.getVideos(type, "0", targetedId, forAccount).observe(DisplayStatusFragment.this.requireActivity(), this::manageVIewVideos);
+            viewModelFeeds.getVideos(type, "0", targetedId, forAccount).observe(DisplayVideosFragment.this.requireActivity(), this::manageVIewVideos);
         } else {
-            viewModelSearch.getVideos("0", search_peertube).observe(DisplayStatusFragment.this.requireActivity(), this::manageVIewVideos);
+            viewModelSearch.getVideos("0", search_peertube).observe(DisplayVideosFragment.this.requireActivity(), this::manageVIewVideos);
         }
 
-        if (mLayoutManager != null) {
         lv_accounts.addOnScrollListener(new RecyclerView.OnScrollListener() {
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 int firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition();
@@ -178,25 +178,11 @@ public class DisplayStatusFragment extends Fragment implements AccountsHorizonta
                     int visibleItemCount = mLayoutManager.getChildCount();
                     int totalItemCount = mLayoutManager.getItemCount();
                     if (firstVisibleItem + visibleItemCount == totalItemCount && context != null) {
-                            viewModelAccounts.getAccounts(max_id_accounts, null, AccountsVM.accountFetch.SUBSCRIPTION).observe(DisplayStatusFragment.this.requireActivity(), apiResponse -> manageViewAccounts(apiResponse));
+                        viewModelAccounts.getAccounts(RetrofitPeertubeAPI.DataType.SUBSCRIBER, max_id_accounts).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageViewAccounts(apiResponse));
                     }
                 }
             }
         });
-        } else {
-            lv_accounts.addOnScrollListener(new RecyclerView.OnScrollListener() {
-                public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                    int firstVisibleItem = gLayoutManager.findFirstVisibleItemPosition();
-                    if (dy > 0) {
-                        int visibleItemCount = gLayoutManager.getChildCount();
-                        int totalItemCount = gLayoutManager.getItemCount();
-                        if (firstVisibleItem + visibleItemCount == totalItemCount && context != null) {
-                            viewModelAccounts.getAccounts(max_id_accounts, null, AccountsVM.accountFetch.SUBSCRIPTION).observe(DisplayStatusFragment.this.requireActivity(), apiResponse -> manageViewAccounts(apiResponse));
-                        }
-                    }
-                }
-            });
-        }
 
 
         if (type != POVERVIEW) {
@@ -227,9 +213,9 @@ public class DisplayStatusFragment extends Fragment implements AccountsHorizonta
                                 if (!flag_loading) {
                                     flag_loading = true;
                                     if (search_peertube == null) { //Not a Peertube search
-                                        viewModelFeeds.getVideos(type, max_id, null, forAccount).observe(DisplayStatusFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
+                                        viewModelFeeds.getVideos(type, max_id, null, forAccount).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
                                     } else {
-                                        viewModelSearch.getVideos(max_id, search_peertube).observe(DisplayStatusFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
+                                        viewModelSearch.getVideos(max_id, search_peertube).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
                                     }
                                     nextElementLoader.setVisibility(View.VISIBLE);
                                 }
@@ -246,9 +232,9 @@ public class DisplayStatusFragment extends Fragment implements AccountsHorizonta
                                 if (!flag_loading) {
                                     flag_loading = true;
                                     if (search_peertube == null) { //Not a Peertube search
-                                        viewModelFeeds.getVideos(type, max_id, null, forAccount).observe(DisplayStatusFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
+                                        viewModelFeeds.getVideos(type, max_id, null, forAccount).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
                                     } else {
-                                        viewModelSearch.getVideos(max_id, search_peertube).observe(DisplayStatusFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
+                                        viewModelSearch.getVideos(max_id, search_peertube).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
                                     }
                                     nextElementLoader.setVisibility(View.VISIBLE);
                                 }
@@ -262,7 +248,7 @@ public class DisplayStatusFragment extends Fragment implements AccountsHorizonta
         }
         if (type == PSUBSCRIPTIONS) {
             AccountsVM viewModel = new ViewModelProvider(this).get(AccountsVM.class);
-            viewModel.getAccounts(max_id, null, AccountsVM.accountFetch.SUBSCRIPTION).observe(DisplayStatusFragment.this.requireActivity(), this::manageViewAccounts);
+            viewModel.getAccounts(RetrofitPeertubeAPI.DataType.SUBSCRIBER, max_id).observe(DisplayVideosFragment.this.requireActivity(), this::manageViewAccounts);
         }
 
         display_all.setOnClickListener(v -> {

app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java

@@ -13,7 +13,6 @@ import androidx.preference.SwitchPreference;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;

app/src/main/java/app/fedilab/fedilabtube/helper/FullScreenMediaController.java

@@ -25,7 +25,7 @@ import android.widget.MediaController;
 
 import app.fedilab.fedilabtube.PeertubeActivity;
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.client.entities.Peertube;
+import app.fedilab.fedilabtube.client.data.VideoData.Video;
 
 
 /**
@@ -37,7 +37,7 @@ public class FullScreenMediaController extends MediaController {
     private ImageButton fullScreen;
     private Button resolution;
     private Context context;
-    private Peertube peertube;
+    private Video peertube;
     private String resolutionVal;
 
     public FullScreenMediaController(Context context) {
@@ -46,7 +46,7 @@ public class FullScreenMediaController extends MediaController {
     }
 
     @SuppressWarnings("unused")
-    public FullScreenMediaController(Context context, Peertube peertube) {
+    public FullScreenMediaController(Context context, Video peertube) {
         super(context);
         this.peertube = peertube;
         this.context = context;
@@ -68,7 +68,7 @@ public class FullScreenMediaController extends MediaController {
         addView(fullScreen, params);
 
         if (resolutionVal == null)
-            resolutionVal = peertube.getResolution().get(0) + "p";
+            resolutionVal = peertube.getFiles().get(0).getResolutions().getLabel() + "p";
         resolution = new Button(context);
         resolution.setAllCaps(false);
         resolution.setBackgroundColor(Color.TRANSPARENT);

app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java

@@ -57,11 +57,10 @@ import java.util.TimeZone;
 import java.util.regex.Pattern;
 
 import app.fedilab.fedilabtube.BuildConfig;
-import app.fedilab.fedilabtube.LoginActivity;
 import app.fedilab.fedilabtube.MainActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.WebviewActivity;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.webview.CustomWebview;
@@ -375,14 +374,10 @@ public class Helper {
         if (years > 0) {
             return format;
         } else if (months > 0 || days > 7) {
-            try {
             //Removes the year depending of the locale from DateFormat.SHORT format
             SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault());
             df.applyPattern(df.toPattern().replaceAll("[^\\p{Alpha}]*y+[^\\p{Alpha}]*", ""));
             return df.format(dateToot);
-            } catch (Exception e) {
-                return format;
-            }
         } else if (days > 0)
             return context.getString(R.string.date_day, days);
         else if (hours > 0)
@@ -427,48 +422,11 @@ public class Helper {
     }
 
 
-    public static void loadGiF(final Context context, Account account, final ImageView imageView, int round) {
-        if (account == null || account.getAvatar() == null || account.getAvatar().compareTo("null") == 0) {
-            Glide.with(imageView.getContext())
-                    .asDrawable()
-                    .load(R.drawable.missing_peertube)
-                    .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(round)))
-                    .into(imageView);
-            return;
-        }
-        String url = account.getAvatar();
-        if (url.startsWith("/")) {
-            url = Helper.getLiveInstance(context) + url;
-        }
-        if (!url.startsWith("http")) {
-            url = "https://" + url;
-        }
-        try {
-            Glide.with(imageView.getContext())
-                    .load(url)
-                    .thumbnail(0.1f)
-                    .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(round)))
-                    .into(imageView);
-        } catch (Exception e) {
-            try {
-                Glide.with(imageView.getContext())
-                        .asDrawable()
-                        .load(R.drawable.missing_peertube)
-                        .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(round)))
-                        .into(imageView);
-
-            } catch (Exception ignored) {
-            }
-        }
-    }
-
-    public static void loadGiF(final Context context, Account account, final ImageView imageView) {
-        loadGiF(context, account, imageView, 10);
-    }
-
-
     public static void loadGiF(final Context context, String url, final ImageView imageView) {
+        loadGiF(context, url, imageView, 10);
+    }
 
+    public static void loadGiF(final Context context, String url, final ImageView imageView, int round) {
         if (url == null || url.trim().toLowerCase().compareTo("null") == 0) {
             Glide.with(imageView.getContext())
                     .asDrawable()
@@ -487,14 +445,14 @@ public class Helper {
             Glide.with(imageView.getContext())
                     .load(url)
                     .thumbnail(0.1f)
-                    .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
+                    .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(round)))
                     .into(imageView);
         } catch (Exception e) {
             try {
                 Glide.with(imageView.getContext())
                         .asDrawable()
                         .load(R.drawable.missing_peertube)
-                        .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
+                        .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(round)))
                         .into(imageView);
 
             } catch (Exception ignored) {
@@ -658,7 +616,7 @@ public class Helper {
         } else {
             editor.putString(PREF_KEY_OAUTH_TOKEN, newAccount.getToken());
             editor.putString(PREF_KEY_ID, newAccount.getId());
-            editor.putString(PREF_INSTANCE, newAccount.getInstance().trim());
+            editor.putString(PREF_INSTANCE, newAccount.getHost().trim());
             editor.commit();
             Intent changeAccount = new Intent(activity, MainActivity.class);
             changeAccount.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

app/src/main/java/app/fedilab/fedilabtube/services/RetrieveInfoService.java

@@ -32,7 +32,7 @@ import java.util.Objects;
 
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.HttpsConnection;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.entities.PeertubeInformation;
 import app.fedilab.fedilabtube.helper.NetworkStateReceiver;
 
@@ -96,11 +96,7 @@ public class RetrieveInfoService extends Service implements NetworkStateReceiver
                 peertubeInformation.setPrivacies(new LinkedHashMap<>());
                 peertubeInformation.setPlaylistPrivacies(new LinkedHashMap<>());
                 peertubeInformation.setTranslations(new LinkedHashMap<>());
-                try {
+                peertubeInformation = new RetrofitPeertubeAPI(RetrieveInfoService.this).getPeertubeInformation();
-                    peertubeInformation = new PeertubeAPI(RetrieveInfoService.this).getPeertubeInformation();
-                } catch (HttpsConnection.HttpsConnectionException e) {
-                    e.printStackTrace();
-                }
                 stopForeground(true);
 
             }

app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java

@@ -23,10 +23,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
+import app.fedilab.fedilabtube.client.entities.Avatar;
 import app.fedilab.fedilabtube.helper.Helper;
 
 
+@SuppressWarnings("UnusedReturnValue")
 public class AccountDAO {
 
     public Context context;
@@ -48,26 +50,21 @@ public class AccountDAO {
      */
     public boolean insertAccount(Account account) {
         ContentValues values = new ContentValues();
-        if (account.getCreated_at() == null)
+        if (account.getCreatedAt() == null)
-            account.setCreated_at(new Date());
+            account.setCreatedAt(new Date());
-        if (account.getNote() == null)
+        if (account.getDescription() == null)
-            account.setNote("");
+            account.setDescription("");
         values.put(Sqlite.COL_USER_ID, account.getId());
-        values.put(Sqlite.COL_USERNAME, account.getUsername());
+        values.put(Sqlite.COL_USERNAME, account.getName());
-        values.put(Sqlite.COL_ACCT, account.getAcct());
+        values.put(Sqlite.COL_ACCT, account.getName() + "@" + account.getHost());
-        values.put(Sqlite.COL_DISPLAYED_NAME, account.getDisplay_name());
+        values.put(Sqlite.COL_DISPLAYED_NAME, account.getDisplayName());
-        values.put(Sqlite.COL_LOCKED, account.isLocked());
+        values.put(Sqlite.COL_FOLLOWERS_COUNT, account.getFollowersCount());
-        values.put(Sqlite.COL_FOLLOWERS_COUNT, account.getFollowers_count());
+        values.put(Sqlite.COL_FOLLOWING_COUNT, account.getFollowingCount());
-        values.put(Sqlite.COL_FOLLOWING_COUNT, account.getFollowing_count());
+        values.put(Sqlite.COL_NOTE, account.getDescription());
-        values.put(Sqlite.COL_STATUSES_COUNT, account.getStatuses_count());
-        values.put(Sqlite.COL_NOTE, account.getNote());
         values.put(Sqlite.COL_URL, account.getUrl());
-        values.put(Sqlite.COL_AVATAR, account.getAvatar());
+        values.put(Sqlite.COL_AVATAR, account.getAvatar().getPath());
-        values.put(Sqlite.COL_AVATAR_STATIC, account.getAvatar_static());
+        values.put(Sqlite.COL_CREATED_AT, Helper.dateToString(account.getCreatedAt()));
-        values.put(Sqlite.COL_HEADER, account.getHeader());
+        values.put(Sqlite.COL_INSTANCE, account.getHost());
-        values.put(Sqlite.COL_HEADER_STATIC, account.getHeader_static());
-        values.put(Sqlite.COL_CREATED_AT, Helper.dateToString(account.getCreated_at()));
-        values.put(Sqlite.COL_INSTANCE, account.getInstance());
         if (account.getClient_id() != null && account.getClient_secret() != null) {
             values.put(Sqlite.COL_CLIENT_ID, account.getClient_id());
             values.put(Sqlite.COL_CLIENT_SECRET, account.getClient_secret());
@@ -78,8 +75,6 @@ public class AccountDAO {
         if (account.getToken() != null)
             values.put(Sqlite.COL_OAUTHTOKEN, account.getToken());
 
-        values.put(Sqlite.COL_SENSITIVE, account.isSensitive());
-        values.put(Sqlite.COL_PRIVACY, account.getPrivacy());
         //Inserts account
         try {
             db.insertOrThrow(Sqlite.TABLE_USER_ACCOUNT, null, values);
@@ -99,23 +94,19 @@ public class AccountDAO {
      */
     public int updateAccount(Account account) {
         ContentValues values = new ContentValues();
-        if (account.getNote() == null)
+        if (account.getCreatedAt() == null)
-            account.setNote("");
+            account.setCreatedAt(new Date());
-        if (account.getCreated_at() == null)
+        if (account.getDescription() == null)
-            account.setCreated_at(new Date());
+            account.setDescription("");
-        values.put(Sqlite.COL_ACCT, account.getAcct());
+        values.put(Sqlite.COL_USERNAME, account.getName());
-        values.put(Sqlite.COL_DISPLAYED_NAME, account.getDisplay_name());
+        values.put(Sqlite.COL_ACCT, account.getName() + "@" + account.getHost());
-        values.put(Sqlite.COL_LOCKED, account.isLocked());
+        values.put(Sqlite.COL_DISPLAYED_NAME, account.getDisplayName());
-        values.put(Sqlite.COL_FOLLOWERS_COUNT, account.getFollowers_count());
+        values.put(Sqlite.COL_FOLLOWERS_COUNT, account.getFollowersCount());
-        values.put(Sqlite.COL_FOLLOWING_COUNT, account.getFollowing_count());
+        values.put(Sqlite.COL_FOLLOWING_COUNT, account.getFollowingCount());
-        values.put(Sqlite.COL_STATUSES_COUNT, account.getStatuses_count());
+        values.put(Sqlite.COL_NOTE, account.getDescription());
-        values.put(Sqlite.COL_NOTE, account.getNote());
         values.put(Sqlite.COL_URL, account.getUrl());
-        values.put(Sqlite.COL_AVATAR, account.getAvatar());
+        values.put(Sqlite.COL_AVATAR, account.getAvatar().getPath());
-        values.put(Sqlite.COL_AVATAR_STATIC, account.getAvatar_static());
+        values.put(Sqlite.COL_CREATED_AT, Helper.dateToString(account.getCreatedAt()));
-        values.put(Sqlite.COL_HEADER, account.getHeader());
-        values.put(Sqlite.COL_HEADER_STATIC, account.getHeader_static());
-        values.put(Sqlite.COL_CREATED_AT, Helper.dateToString(account.getCreated_at()));
         if (account.getClient_id() != null && account.getClient_secret() != null) {
             values.put(Sqlite.COL_CLIENT_ID, account.getClient_id());
             values.put(Sqlite.COL_CLIENT_SECRET, account.getClient_secret());
@@ -127,7 +118,7 @@ public class AccountDAO {
             values.put(Sqlite.COL_OAUTHTOKEN, account.getToken());
         return db.update(Sqlite.TABLE_USER_ACCOUNT,
                 values, Sqlite.COL_USER_ID + " =  ? AND " + Sqlite.COL_INSTANCE + " =?",
-                new String[]{account.getId(), account.getInstance()});
+                new String[]{account.getId(), account.getHost()});
     }
 
 
@@ -139,23 +130,19 @@ public class AccountDAO {
      */
     public int updateAccountCredential(Account account) {
         ContentValues values = new ContentValues();
-        if (account.getNote() == null)
+        if (account.getCreatedAt() == null)
-            account.setNote("");
+            account.setCreatedAt(new Date());
-        if (account.getCreated_at() == null)
+        if (account.getDescription() == null)
-            account.setCreated_at(new Date());
+            account.setDescription("");
-        values.put(Sqlite.COL_ACCT, account.getAcct());
+        values.put(Sqlite.COL_USERNAME, account.getName());
-        values.put(Sqlite.COL_DISPLAYED_NAME, account.getDisplay_name());
+        values.put(Sqlite.COL_ACCT, account.getName() + "@" + account.getHost());
-        values.put(Sqlite.COL_LOCKED, account.isLocked());
+        values.put(Sqlite.COL_DISPLAYED_NAME, account.getDisplayName());
-        values.put(Sqlite.COL_FOLLOWERS_COUNT, account.getFollowers_count());
+        values.put(Sqlite.COL_FOLLOWERS_COUNT, account.getFollowersCount());
-        values.put(Sqlite.COL_FOLLOWING_COUNT, account.getFollowing_count());
+        values.put(Sqlite.COL_FOLLOWING_COUNT, account.getFollowingCount());
-        values.put(Sqlite.COL_STATUSES_COUNT, account.getStatuses_count());
+        values.put(Sqlite.COL_NOTE, account.getDescription());
-        values.put(Sqlite.COL_NOTE, account.getNote());
         values.put(Sqlite.COL_URL, account.getUrl());
-        values.put(Sqlite.COL_AVATAR, account.getAvatar());
+        values.put(Sqlite.COL_AVATAR, account.getAvatar().getPath());
-        values.put(Sqlite.COL_AVATAR_STATIC, account.getAvatar_static());
+        values.put(Sqlite.COL_CREATED_AT, Helper.dateToString(account.getCreatedAt()));
-        values.put(Sqlite.COL_HEADER, account.getHeader());
-        values.put(Sqlite.COL_HEADER_STATIC, account.getHeader_static());
-        values.put(Sqlite.COL_CREATED_AT, Helper.dateToString(account.getCreated_at()));
 
         if (account.getClient_id() != null && account.getClient_secret() != null) {
             values.put(Sqlite.COL_CLIENT_ID, account.getClient_id());
@@ -166,17 +153,15 @@ public class AccountDAO {
         }
         if (account.getToken() != null)
             values.put(Sqlite.COL_OAUTHTOKEN, account.getToken());
-        values.put(Sqlite.COL_SENSITIVE, account.isSensitive());
-        values.put(Sqlite.COL_PRIVACY, account.getPrivacy());
         return db.update(Sqlite.TABLE_USER_ACCOUNT,
                 values, Sqlite.COL_USER_ID + " =  ? AND " + Sqlite.COL_INSTANCE + " =?",
-                new String[]{account.getId(), account.getInstance()});
+                new String[]{account.getId(), account.getHost()});
     }
 
 
     public int removeUser(Account account) {
         return db.delete(Sqlite.TABLE_USER_ACCOUNT, Sqlite.COL_USER_ID + " = '" + account.getId() +
-                "' AND " + Sqlite.COL_INSTANCE + " = '" + account.getInstance() + "'", null);
+                "' AND " + Sqlite.COL_INSTANCE + " = '" + account.getHost() + "'", null);
     }
 
 
@@ -195,22 +180,6 @@ public class AccountDAO {
         }
     }
 
-    /**
-     * Returns an Account by its id and acct
-     *
-     * @param accountId   String
-     * @param accountAcct String
-     * @return Account
-     */
-    public Account getAccountByIDAcct(String accountId, String accountAcct) {
-        try {
-            Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, Sqlite.COL_USER_ID + " = '" + accountId + "' AND " + Sqlite.COL_ACCT + " = '" + accountAcct + "'", null, null, null, null, "1");
-            return cursorToUser(c);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
 
     /**
      * Returns all Account in db
@@ -227,21 +196,6 @@ public class AccountDAO {
         }
     }
 
-    /**
-     * Returns all Account in db
-     *
-     * @return Account List<Account>
-     */
-    public List<Account> getAllAccountActivated() {
-
-        try {
-            Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, Sqlite.COL_OAUTHTOKEN + " != 'null'", null, null, null, Sqlite.COL_INSTANCE + " ASC", null);
-            return cursorToListUser(c);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
 
     /**
      * Returns an Account by token
@@ -285,7 +239,7 @@ public class AccountDAO {
      */
     public boolean userExist(Account account) {
         Cursor mCount = db.rawQuery("select count(*) from " + Sqlite.TABLE_USER_ACCOUNT
-                + " where " + Sqlite.COL_USERNAME + " = '" + account.getUsername() + "' AND " + Sqlite.COL_INSTANCE + " = '" + account.getInstance() + "'", null);
+                + " where " + Sqlite.COL_USERNAME + " = '" + account.getName() + "' AND " + Sqlite.COL_INSTANCE + " = '" + account.getHost() + "'", null);
         mCount.moveToFirst();
         int count = mCount.getInt(0);
         mCount.close();
@@ -293,6 +247,29 @@ public class AccountDAO {
     }
 
 
+    /***
+     * Method to hydrate an Accounts from database
+     * @param c Cursor
+     * @return List<Account>
+     */
+    private List<Account> cursorToListUser(Cursor c) {
+        //No element found
+        if (c.getCount() == 0) {
+            c.close();
+            return null;
+        }
+        List<Account> accounts = new ArrayList<>();
+        while (c.moveToNext()) {
+            Account account = cursorToUser(c);
+            accounts.add(account);
+        }
+        //Close the cursor
+        c.close();
+        //Users list is returned
+        return accounts;
+    }
+
+
     /***
      * Method to hydrate an Account from database
      * @param c Cursor
@@ -308,30 +285,24 @@ public class AccountDAO {
         c.moveToFirst();
         //New user
         Account account = new Account();
-
         account.setId(c.getString(c.getColumnIndex(Sqlite.COL_USER_ID)));
-        account.setUsername(c.getString(c.getColumnIndex(Sqlite.COL_USERNAME)));
+        account.setName(c.getString(c.getColumnIndex(Sqlite.COL_USERNAME)));
-        account.setAcct(c.getString(c.getColumnIndex(Sqlite.COL_ACCT)));
+        account.setDisplayName(c.getString(c.getColumnIndex(Sqlite.COL_DISPLAYED_NAME)));
-        account.setDisplay_name(c.getString(c.getColumnIndex(Sqlite.COL_DISPLAYED_NAME)));
+        account.setFollowersCount(c.getInt(c.getColumnIndex(Sqlite.COL_FOLLOWERS_COUNT)));
-        account.setLocked(c.getInt(c.getColumnIndex(Sqlite.COL_LOCKED)) == 1);
+        account.setFollowingCount(c.getInt(c.getColumnIndex(Sqlite.COL_FOLLOWING_COUNT)));
-        account.setFollowers_count(c.getInt(c.getColumnIndex(Sqlite.COL_FOLLOWERS_COUNT)));
+        account.setDescription(c.getString(c.getColumnIndex(Sqlite.COL_NOTE)));
-        account.setFollowing_count(c.getInt(c.getColumnIndex(Sqlite.COL_FOLLOWING_COUNT)));
-        account.setStatuses_count(c.getInt(c.getColumnIndex(Sqlite.COL_STATUSES_COUNT)));
-        account.setNote(c.getString(c.getColumnIndex(Sqlite.COL_NOTE)));
         account.setUrl(c.getString(c.getColumnIndex(Sqlite.COL_URL)));
-        account.setAvatar(c.getString(c.getColumnIndex(Sqlite.COL_AVATAR)));
+        Avatar avatar = new Avatar();
-        account.setAvatar_static(c.getString(c.getColumnIndex(Sqlite.COL_AVATAR_STATIC)));
+        avatar.setPath(c.getString(c.getColumnIndex(Sqlite.COL_AVATAR)));
-        account.setHeader(c.getString(c.getColumnIndex(Sqlite.COL_HEADER)));
+        account.setAvatar(avatar);
-        account.setHeader_static(c.getString(c.getColumnIndex(Sqlite.COL_HEADER_STATIC)));
+        account.setUpdatedAt(Helper.stringToDate(context, c.getString(c.getColumnIndex(Sqlite.COL_UPDATED_AT))));
-        account.setUpdated_at(Helper.stringToDate(context, c.getString(c.getColumnIndex(Sqlite.COL_UPDATED_AT))));
+        account.setCreatedAt(Helper.stringToDate(context, c.getString(c.getColumnIndex(Sqlite.COL_CREATED_AT))));
-        account.setCreated_at(Helper.stringToDate(context, c.getString(c.getColumnIndex(Sqlite.COL_CREATED_AT))));
+        account.setHost(c.getString(c.getColumnIndex(Sqlite.COL_INSTANCE)));
-        account.setInstance(c.getString(c.getColumnIndex(Sqlite.COL_INSTANCE)));
         account.setToken(c.getString(c.getColumnIndex(Sqlite.COL_OAUTHTOKEN)));
         account.setClient_id(c.getString(c.getColumnIndex(Sqlite.COL_CLIENT_ID)));
         account.setClient_secret(c.getString(c.getColumnIndex(Sqlite.COL_CLIENT_SECRET)));
         account.setRefresh_token(c.getString(c.getColumnIndex(Sqlite.COL_REFRESH_TOKEN)));
-        account.setSensitive(c.getInt(c.getColumnIndex(Sqlite.COL_SENSITIVE)) == 1);
+        account.setAcct(account.getName() + "@" + account.getHost());
-        account.setPrivacy((c.getString(c.getColumnIndex(Sqlite.COL_PRIVACY))));
         //Close the cursor
         c.close();
 
@@ -339,52 +310,5 @@ public class AccountDAO {
         return account;
     }
 
-    /***
-     * Method to hydrate an Accounts from database
-     * @param c Cursor
-     * @return List<Account>
-     */
-    private List<Account> cursorToListUser(Cursor c) {
-        //No element found
-        if (c.getCount() == 0) {
-            c.close();
-            return null;
-        }
-        List<Account> accounts = new ArrayList<>();
-        while (c.moveToNext()) {
-            //New user
-            Account account = new Account();
-
-            account.setId(c.getString(c.getColumnIndex(Sqlite.COL_USER_ID)));
-            account.setUsername(c.getString(c.getColumnIndex(Sqlite.COL_USERNAME)));
-            account.setAcct(c.getString(c.getColumnIndex(Sqlite.COL_ACCT)));
-            account.setDisplay_name(c.getString(c.getColumnIndex(Sqlite.COL_DISPLAYED_NAME)));
-            account.setLocked(c.getInt(c.getColumnIndex(Sqlite.COL_LOCKED)) == 1);
-            account.setFollowers_count(c.getInt(c.getColumnIndex(Sqlite.COL_FOLLOWERS_COUNT)));
-            account.setFollowing_count(c.getInt(c.getColumnIndex(Sqlite.COL_FOLLOWING_COUNT)));
-            account.setStatuses_count(c.getInt(c.getColumnIndex(Sqlite.COL_STATUSES_COUNT)));
-            account.setNote(c.getString(c.getColumnIndex(Sqlite.COL_NOTE)));
-            account.setUrl(c.getString(c.getColumnIndex(Sqlite.COL_URL)));
-            account.setAvatar(c.getString(c.getColumnIndex(Sqlite.COL_AVATAR)));
-            account.setAvatar_static(c.getString(c.getColumnIndex(Sqlite.COL_AVATAR_STATIC)));
-            account.setHeader(c.getString(c.getColumnIndex(Sqlite.COL_HEADER)));
-            account.setHeader_static(c.getString(c.getColumnIndex(Sqlite.COL_HEADER_STATIC)));
-            account.setUpdated_at(Helper.stringToDate(context, c.getString(c.getColumnIndex(Sqlite.COL_UPDATED_AT))));
-            account.setCreated_at(Helper.stringToDate(context, c.getString(c.getColumnIndex(Sqlite.COL_CREATED_AT))));
-            account.setInstance(c.getString(c.getColumnIndex(Sqlite.COL_INSTANCE)));
-            account.setToken(c.getString(c.getColumnIndex(Sqlite.COL_OAUTHTOKEN)));
-            account.setClient_id(c.getString(c.getColumnIndex(Sqlite.COL_CLIENT_ID)));
-            account.setClient_secret(c.getString(c.getColumnIndex(Sqlite.COL_CLIENT_SECRET)));
-            account.setRefresh_token(c.getString(c.getColumnIndex(Sqlite.COL_REFRESH_TOKEN)));
-            account.setSensitive(c.getInt(c.getColumnIndex(Sqlite.COL_SENSITIVE)) == 1);
-            account.setPrivacy((c.getString(c.getColumnIndex(Sqlite.COL_PRIVACY))));
-            accounts.add(account);
-        }
-        //Close the cursor
-        c.close();
-        //Users list is returned
-        return accounts;
-    }
-
 
 }

app/src/main/java/app/fedilab/fedilabtube/viewmodel/AccountsVM.java

@@ -25,7 +25,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 
 
 public class AccountsVM extends AndroidViewModel {
@@ -35,32 +35,20 @@ public class AccountsVM extends AndroidViewModel {
         super(application);
     }
 
-    public LiveData<APIResponse> getAccounts(String max_id, String name, accountFetch type) {
+    public LiveData<APIResponse> getAccounts(RetrofitPeertubeAPI.DataType dataType, String element) {
         apiResponseMutableLiveData = new MutableLiveData<>();
-        loadAccounts(max_id, name, type);
+        loadAccounts(dataType, element);
         return apiResponseMutableLiveData;
     }
 
-    private void loadAccounts(String max_id, String name, accountFetch type) {
+    private void loadAccounts(RetrofitPeertubeAPI.DataType dataType, String element) {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                PeertubeAPI peertubeAPI = new PeertubeAPI(_mContext);
+                RetrofitPeertubeAPI retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext);
-                APIResponse apiResponse = null;
+                APIResponse apiResponse = retrofitPeertubeAPI.getAccountData(dataType, element);
-                if (type == accountFetch.SUBSCRIPTION) {
-                    apiResponse = peertubeAPI.getSubscriptionUsers(max_id);
-                } else if (type == accountFetch.MUTED) {
-                    apiResponse = peertubeAPI.getMuted(max_id);
-                } else if (type == accountFetch.CHANNEL) {
-                    apiResponse = peertubeAPI.getPeertubeChannel(max_id);
-                } else if (type == accountFetch.SINGLE_ACCOUNT) {
-                    apiResponse = peertubeAPI.getPeertubeChannel(name);
-                } else if (type == accountFetch.SINGLE_CHANNEL) {
-                    apiResponse = peertubeAPI.getPeertubeChannelInfo(name);
-                }
                 Handler mainHandler = new Handler(Looper.getMainLooper());
-                APIResponse finalApiResponse = apiResponse;
+                Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
-                Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(finalApiResponse);
                 mainHandler.post(myRunnable);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -68,12 +56,4 @@ public class AccountsVM extends AndroidViewModel {
         }).start();
     }
 
-    public enum accountFetch {
-        SUBSCRIPTION,
-        CHANNEL,
-        MUTED,
-        SINGLE_ACCOUNT,
-        SINGLE_CHANNEL,
-        OWN_ACCOUNTS
-    }
 }

app/src/main/java/app/fedilab/fedilabtube/viewmodel/CaptionsVM.java

@@ -26,7 +26,7 @@ import androidx.lifecycle.MutableLiveData;
 
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.HttpsConnection;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 
 
 public class CaptionsVM extends AndroidViewModel {
@@ -52,7 +52,7 @@ public class CaptionsVM extends AndroidViewModel {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                PeertubeAPI peertubeAPI = new PeertubeAPI(_mContext);
+                RetrofitPeertubeAPI peertubeAPI = new RetrofitPeertubeAPI(_mContext);
                 APIResponse apiResponse = peertubeAPI.getCaptions(videoId);
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);

app/src/main/java/app/fedilab/fedilabtube/viewmodel/ChannelsVM.java

@@ -16,8 +16,6 @@ package app.fedilab.fedilabtube.viewmodel;
 
 import android.app.Application;
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.Handler;
 import android.os.Looper;
 
@@ -27,11 +25,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Account;
-import app.fedilab.fedilabtube.helper.Helper;
-import app.fedilab.fedilabtube.sqlite.AccountDAO;
-import app.fedilab.fedilabtube.sqlite.Sqlite;
 
 
 public class ChannelsVM extends AndroidViewModel {
@@ -41,26 +35,18 @@ public class ChannelsVM extends AndroidViewModel {
         super(application);
     }
 
-    public LiveData<APIResponse> get() {
+    public LiveData<APIResponse> get(RetrofitPeertubeAPI.DataType type, String element) {
         apiResponseMutableLiveData = new MutableLiveData<>();
-        getChannels();
+        getChannels(type, element);
         return apiResponseMutableLiveData;
     }
 
-    private void getChannels() {
+    private void getChannels(RetrofitPeertubeAPI.DataType type, String element) {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                PeertubeAPI peertubeAPI = new PeertubeAPI(_mContext);
+                RetrofitPeertubeAPI retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext);
-                SQLiteDatabase db = Sqlite.getInstance(_mContext.getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+                APIResponse apiResponse = retrofitPeertubeAPI.getChannelData(type, element);
-                SharedPreferences sharedpreferences = _mContext.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
-                String instance = Helper.getLiveInstance(_mContext);
-                Account account = new AccountDAO(_mContext, db).getUniqAccount(userId, instance);
-                if (account == null) {
-                    account = new AccountDAO(_mContext, db).getUniqAccount(userId, Helper.getPeertubeUrl(instance));
-                }
-                APIResponse apiResponse = peertubeAPI.getPeertubeChannel(account.getUsername());
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
                 mainHandler.post(myRunnable);
@@ -70,4 +56,9 @@ public class ChannelsVM extends AndroidViewModel {
         }).start();
     }
 
+    public enum action {
+        CREATE_CHANNEL,
+        UPDATE_CHANNEL
+    }
+
 }

app/src/main/java/app/fedilab/fedilabtube/viewmodel/CommentVM.java

@@ -25,7 +25,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 
 
 public class CommentVM extends AndroidViewModel {
@@ -35,19 +35,25 @@ public class CommentVM extends AndroidViewModel {
         super(application);
     }
 
-    public LiveData<APIResponse> getComment(String instanceName, String videoId) {
+    public LiveData<APIResponse> getThread(String videoId) {
         apiResponseMutableLiveData = new MutableLiveData<>();
-        getSingle(instanceName, videoId);
+        getThreadComments(videoId);
+        return apiResponseMutableLiveData;
+    }
+
+    public LiveData<APIResponse> getRepliesComment(String videoId, String commentId) {
+        apiResponseMutableLiveData = new MutableLiveData<>();
+        getThreadRepliesComments(videoId, commentId);
         return apiResponseMutableLiveData;
     }
 
 
-    private void getSingle(String instanceName, String videoId) {
+    private void getThreadComments(String videoId) {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                PeertubeAPI api = new PeertubeAPI(_mContext);
+                RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(_mContext);
-                APIResponse apiResponse = api.getSinglePeertubeComments(instanceName, videoId);
+                APIResponse apiResponse = api.getComments(CommentVM.action.GET_THREAD, videoId, null);
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
                 mainHandler.post(myRunnable);
@@ -56,4 +62,27 @@ public class CommentVM extends AndroidViewModel {
             }
         }).start();
     }
+
+
+    private void getThreadRepliesComments(String videoId, String commentId) {
+        Context _mContext = getApplication().getApplicationContext();
+        new Thread(() -> {
+            try {
+                RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(_mContext);
+                APIResponse apiResponse = api.getComments(action.GET_REPLIES, videoId, null);
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
+                mainHandler.post(myRunnable);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
+
+    public enum action {
+        ADD_COMMENT,
+        REPLY,
+        GET_THREAD,
+        GET_REPLIES
+    }
 }

app/src/main/java/app/fedilab/fedilabtube/viewmodel/FeedsVM.java

@@ -1,193 +0,0 @@
-package app.fedilab.fedilabtube.viewmodel;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with TubeLab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.app.Application;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Handler;
-import android.os.Looper;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import java.util.List;
-
-import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Peertube;
-import app.fedilab.fedilabtube.helper.Helper;
-import app.fedilab.fedilabtube.sqlite.PeertubeFavoritesDAO;
-import app.fedilab.fedilabtube.sqlite.Sqlite;
-
-
-public class FeedsVM extends AndroidViewModel {
-    private MutableLiveData<APIResponse> apiResponseMutableLiveData;
-
-    public FeedsVM(@NonNull Application application) {
-        super(application);
-    }
-
-    public LiveData<APIResponse> getVideos(Type action, String max_id, String target, String forAccount) {
-        apiResponseMutableLiveData = new MutableLiveData<>();
-        loadVideos(action, max_id, target, forAccount);
-        return apiResponseMutableLiveData;
-    }
-
-
-    public LiveData<APIResponse> getVideo(String instanceName, String videoId) {
-        apiResponseMutableLiveData = new MutableLiveData<>();
-        getSingle(instanceName, videoId);
-        return apiResponseMutableLiveData;
-    }
-
-    public LiveData<APIResponse> updateVideo(Peertube peertube) {
-        apiResponseMutableLiveData = new MutableLiveData<>();
-        update(peertube);
-        return apiResponseMutableLiveData;
-    }
-
-    private void update(Peertube peertube) {
-        Context _mContext = getApplication().getApplicationContext();
-        new Thread(() -> {
-            try {
-                PeertubeAPI peertubeAPI = new PeertubeAPI(_mContext);
-                APIResponse apiResponse = peertubeAPI.updateVideo(peertube);
-                if (apiResponse != null && apiResponse.getPeertubes() != null && apiResponse.getPeertubes().size() > 0)
-                    apiResponse.getPeertubes().get(0).setUpdate(true);
-                Handler mainHandler = new Handler(Looper.getMainLooper());
-                Runnable myRunnable = () -> apiResponseMutableLiveData.postValue(apiResponse);
-                mainHandler.post(myRunnable);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }).start();
-    }
-
-
-    private void getSingle(String instanceName, String videoId) {
-        Context _mContext = getApplication().getApplicationContext();
-        new Thread(() -> {
-            try {
-                PeertubeAPI peertubeAPI = new PeertubeAPI(_mContext);
-                SharedPreferences sharedpreferences = _mContext.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
-                APIResponse apiResponse = peertubeAPI.getSinglePeertube(instanceName, videoId, token);
-                if (apiResponse.getPeertubes() != null && apiResponse.getPeertubes().size() > 0 && apiResponse.getPeertubes().get(0) != null) {
-                    String rate = new PeertubeAPI(_mContext).getRating(videoId);
-                    if (rate != null)
-                        apiResponse.getPeertubes().get(0).setMyRating(rate);
-                }
-                Handler mainHandler = new Handler(Looper.getMainLooper());
-                Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
-                mainHandler.post(myRunnable);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }).start();
-    }
-
-    private void loadVideos(Type action, String max_id, String target, String forAccount) {
-        Context _mContext = getApplication().getApplicationContext();
-        new Thread(() -> {
-            try {
-                PeertubeAPI peertubeAPI = new PeertubeAPI(_mContext);
-                if (action == null)
-                    return;
-                APIResponse apiResponse = null;
-                switch (action) {
-                    case USER:
-                        apiResponse = peertubeAPI.getVideos(target, max_id);
-                        break;
-                    case MYVIDEOS:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getMyVideos(max_id);
-                        break;
-                    case PEERTUBE_HISTORY:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getMyHistory(max_id);
-                        break;
-                    case CHANNEL:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getVideosChannel(target, max_id);
-                        break;
-                    case CACHE_BOOKMARKS_PEERTUBE:
-                        apiResponse = new APIResponse();
-                        SQLiteDatabase db = Sqlite.getInstance(_mContext, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-                        List<Peertube> peertubes = new PeertubeFavoritesDAO(_mContext, db).getAllPeertube();
-                        apiResponse.setPeertubes(peertubes);
-                        break;
-                    case PSUBSCRIPTIONS:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        if (forAccount == null) {
-                            apiResponse = peertubeAPI.getSubscriptionsTL(max_id);
-                        } else {
-                            apiResponse = peertubeAPI.getVideosChannel(forAccount, max_id);
-                        }
-                        break;
-                    case POVERVIEW:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getOverviewTL(max_id);
-                        break;
-                    case PTRENDING:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getTrendingTL(max_id);
-                        break;
-                    case PRECENTLYADDED:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getRecentlyAddedTL(max_id);
-                        break;
-                    case PLOCAL:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getLocalTL(max_id);
-                        break;
-                    case PPUBLIC:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getPublicTL(max_id);
-                        break;
-                    case PMOSTLIKED:
-                        peertubeAPI = new PeertubeAPI(_mContext);
-                        apiResponse = peertubeAPI.getLikedTL(max_id);
-                        break;
-                }
-                Handler mainHandler = new Handler(Looper.getMainLooper());
-                APIResponse finalApiResponse = apiResponse;
-                Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(finalApiResponse);
-                mainHandler.post(myRunnable);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }).start();
-    }
-
-    public enum Type {
-
-        USER,
-        PPUBLIC,
-        PSUBSCRIPTIONS,
-        POVERVIEW,
-        PTRENDING,
-        PRECENTLYADDED,
-        PMOSTLIKED,
-        PLOCAL,
-        CHANNEL,
-        MYVIDEOS,
-        PEERTUBE_HISTORY,
-        CACHE_BOOKMARKS_PEERTUBE,
-    }
-}

app/src/main/java/app/fedilab/fedilabtube/viewmodel/InstancesVM.java

@@ -25,7 +25,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.entities.InstanceParams;
 
 
@@ -46,7 +46,7 @@ public class InstancesVM extends AndroidViewModel {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                APIResponse apiResponse = new PeertubeAPI(_mContext).getInstances(instanceParams);
+                APIResponse apiResponse = new RetrofitPeertubeAPI(_mContext, "instances.joinpeertube.org", null).getInstances(instanceParams);
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
                 mainHandler.post(myRunnable);

app/src/main/java/app/fedilab/fedilabtube/viewmodel/MyVideoVM.java

@@ -0,0 +1,63 @@
+package app.fedilab.fedilabtube.viewmodel;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.app.Application;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import app.fedilab.fedilabtube.client.APIResponse;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
+import app.fedilab.fedilabtube.client.data.VideoData;
+
+
+public class MyVideoVM extends AndroidViewModel {
+    private MutableLiveData<APIResponse> apiResponseMutableLiveData;
+
+    public MyVideoVM(@NonNull Application application) {
+        super(application);
+    }
+
+
+    public LiveData<APIResponse> updateVideo(VideoData.Video peertube) {
+        apiResponseMutableLiveData = new MutableLiveData<>();
+        update(peertube);
+        return apiResponseMutableLiveData;
+    }
+
+    private void update(VideoData.Video peertube) {
+        Context _mContext = getApplication().getApplicationContext();
+        new Thread(() -> {
+            try {
+                RetrofitPeertubeAPI peertubeAPI = new RetrofitPeertubeAPI(_mContext);
+               /* APIResponse apiResponse = peertubeAPI.u(peertube);
+                if (apiResponse != null && apiResponse.getPeertubes() != null && apiResponse.getPeertubes().size() > 0)
+                    apiResponse.getPeertubes().get(0).setUpdate(true);
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                Runnable myRunnable = () -> apiResponseMutableLiveData.postValue(apiResponse);
+                mainHandler.post(myRunnable);*/
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
+
+}

app/src/main/java/app/fedilab/fedilabtube/viewmodel/NotificationsVM.java

@@ -25,8 +25,8 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.client.entities.Error;
 
 
@@ -47,18 +47,18 @@ public class NotificationsVM extends AndroidViewModel {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                PeertubeAPI api;
+                RetrofitPeertubeAPI api;
                 APIResponse apiResponse;
                 if (account == null) {
-                    api = new PeertubeAPI(_mContext);
+                    api = new RetrofitPeertubeAPI(_mContext);
-                    apiResponse = api.getNotifications(max_id);
+                    apiResponse = api.getNotifications(max_id, null);
                 } else {
                     if (_mContext == null) {
                         apiResponse = new APIResponse();
                         apiResponse.setError(new Error());
                     }
-                    api = new PeertubeAPI(_mContext, account.getInstance(), account.getToken());
+                    api = new RetrofitPeertubeAPI(_mContext, account.getHost(), account.getToken());
-                    apiResponse = api.getNotificationsSince(max_id);
+                    apiResponse = api.getNotifications(null, max_id);
                 }
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 APIResponse finalApiResponse = apiResponse;

app/src/main/java/app/fedilab/fedilabtube/viewmodel/PlaylistsVM.java

@@ -26,12 +26,14 @@ import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
+import java.io.File;
 import java.util.ArrayList;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Account;
+import app.fedilab.fedilabtube.client.data.AccountData.Account;
-import app.fedilab.fedilabtube.client.entities.Playlist;
+import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
+import app.fedilab.fedilabtube.client.entities.PlaylistParams;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
@@ -44,13 +46,29 @@ public class PlaylistsVM extends AndroidViewModel {
         super(application);
     }
 
-    public LiveData<APIResponse> manage(action apiAction, Playlist playlist, String videoId, String max_id) {
+    public LiveData<APIResponse> manage(action apiAction, Playlist playlist, String videoId) {
         apiResponseMutableLiveData = new MutableLiveData<>();
-        managePlaylists(apiAction, playlist, videoId, max_id);
+        managePlaylists(apiAction, playlist, videoId);
         return apiResponseMutableLiveData;
     }
 
-    private void managePlaylists(action apiAction, Playlist playlist, String videoId, String max_id) {
+    public LiveData<APIResponse> updateCreate(action apiAction, String playlistId, PlaylistParams playlistParams, File thumbnail) {
+        apiResponseMutableLiveData = new MutableLiveData<>();
+        createOrUpdate(apiAction, playlistId, playlistParams, thumbnail);
+        return apiResponseMutableLiveData;
+    }
+
+    private void createOrUpdate(action apiAction, String playlistId, PlaylistParams playlistParams, File thumbnail) {
+        Context _mContext = getApplication().getApplicationContext();
+        new Thread(() -> {
+            APIResponse apiResponse = new RetrofitPeertubeAPI(_mContext).createOrUpdatePlaylist(apiAction, playlistId, playlistParams, thumbnail);
+            Handler mainHandler = new Handler(Looper.getMainLooper());
+            Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
+            mainHandler.post(myRunnable);
+        }).start();
+    }
+
+    private void managePlaylists(action apiAction, Playlist playlist, String videoId) {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
@@ -63,23 +81,13 @@ public class PlaylistsVM extends AndroidViewModel {
                     account = new AccountDAO(_mContext, db).getUniqAccount(userId, Helper.getPeertubeUrl(instance));
                 }
                 int statusCode = -1;
-                APIResponse apiResponse = null;
+                APIResponse apiResponse;
                 if (account == null) {
                     statusCode = 403;
                     apiResponse = new APIResponse();
                     apiResponse.setPlaylists(new ArrayList<>());
-                } else if (apiAction == action.GET_PLAYLIST) {
+                } else {
-                    apiResponse = new PeertubeAPI(_mContext).getPlayists(account.getUsername());
+                    apiResponse = new RetrofitPeertubeAPI(_mContext).playlistAction(apiAction, playlist.getId(), videoId);
-                } else if (apiAction == action.GET_LIST_VIDEOS) {
-                    apiResponse = new PeertubeAPI(_mContext).getPlaylistVideos(playlist.getId(), max_id, null);
-                } else if (apiAction == action.DELETE_PLAYLIST) {
-                    statusCode = new PeertubeAPI(_mContext).deletePlaylist(playlist.getId());
-                } else if (apiAction == action.ADD_VIDEOS) {
-                    statusCode = new PeertubeAPI(_mContext).addVideoPlaylist(playlist.getId(), videoId);
-                } else if (apiAction == action.DELETE_VIDEOS) {
-                    statusCode = new PeertubeAPI(_mContext).deleteVideoPlaylist(playlist.getId(), videoId);
-                } else if (apiAction == action.GET_PLAYLIST_FOR_VIDEO) {
-                    apiResponse = new PeertubeAPI(_mContext).getPlaylistForVideo(videoId);
                 }
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 if (apiResponse != null) {
@@ -95,9 +103,11 @@ public class PlaylistsVM extends AndroidViewModel {
     }
 
     public enum action {
-        GET_PLAYLIST,
+        GET_PLAYLISTS,
+        GET_PLAYLIST_INFO,
         GET_LIST_VIDEOS,
         CREATE_PLAYLIST,
+        UPDATE_PLAYLIST,
         DELETE_PLAYLIST,
         ADD_VIDEOS,
         DELETE_VIDEOS,

app/src/main/java/app/fedilab/fedilabtube/viewmodel/PostActionsVM.java

@@ -25,7 +25,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 
 
 public class PostActionsVM extends AndroidViewModel {
@@ -35,40 +35,18 @@ public class PostActionsVM extends AndroidViewModel {
         super(application);
     }
 
-    public LiveData<APIResponse> post(PeertubeAPI.StatusAction apiAction, String targetedId, String comment, String targetedComment) {
+    public LiveData<APIResponse> post(RetrofitPeertubeAPI.ActionType apiAction, String id, String element) {
         apiResponseMutableLiveData = new MutableLiveData<>();
-        makeAction(apiAction, targetedId, comment, targetedComment);
+        makeAction(apiAction, id, element);
         return apiResponseMutableLiveData;
     }
 
-    private void makeAction(PeertubeAPI.StatusAction apiAction, String targetedId, String comment, String targetedComment) {
+    private void makeAction(RetrofitPeertubeAPI.ActionType apiAction, String id, String element) {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                PeertubeAPI peertubeAPI = new PeertubeAPI(_mContext);
+                RetrofitPeertubeAPI peertubeAPI = new RetrofitPeertubeAPI(_mContext);
-                int statusCode = -1;
+                APIResponse apiResponse = peertubeAPI.post(apiAction, id, element);
-                if (apiAction == PeertubeAPI.StatusAction.FOLLOW || apiAction == PeertubeAPI.StatusAction.UNFOLLOW
-                        || apiAction == PeertubeAPI.StatusAction.MUTE || apiAction == PeertubeAPI.StatusAction.UNMUTE) {
-                    statusCode = peertubeAPI.postAction(apiAction, targetedId);
-                } else if (apiAction == PeertubeAPI.StatusAction.RATEVIDEO)
-                    statusCode = peertubeAPI.postRating(targetedId, comment);
-                else if (apiAction == PeertubeAPI.StatusAction.PEERTUBECOMMENT)
-                    statusCode = peertubeAPI.postComment(targetedId, comment);
-                else if (apiAction == PeertubeAPI.StatusAction.PEERTUBEREPLY)
-                    statusCode = peertubeAPI.postReply(targetedId, comment, targetedComment);
-                else if (apiAction == PeertubeAPI.StatusAction.PEERTUBEDELETECOMMENT) {
-                    statusCode = peertubeAPI.deleteComment(targetedId, comment);
-                } else if (apiAction == PeertubeAPI.StatusAction.PEERTUBEDELETEVIDEO) {
-                    statusCode = peertubeAPI.deleteVideo(targetedId);
-                } else if (apiAction == PeertubeAPI.StatusAction.REPORT_ACCOUNT) {
-                    statusCode = peertubeAPI.report(PeertubeAPI.reportType.ACCOUNT, targetedId, comment);
-                } else if (apiAction == PeertubeAPI.StatusAction.REPORT_VIDEO) {
-                    statusCode = peertubeAPI.report(PeertubeAPI.reportType.VIDEO, targetedId, comment);
-                }
-                APIResponse apiResponse = new APIResponse();
-                apiResponse.setError(peertubeAPI.getError());
-                apiResponse.setStatusCode(statusCode);
-                apiResponse.setTargetedId(targetedId);
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
                 mainHandler.post(myRunnable);

app/src/main/java/app/fedilab/fedilabtube/viewmodel/RelationshipVM.java

@@ -27,9 +27,7 @@ import androidx.lifecycle.MutableLiveData;
 import java.util.List;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
-import app.fedilab.fedilabtube.client.entities.Error;
-import app.fedilab.fedilabtube.client.entities.Relationship;
 
 
 public class RelationshipVM extends AndroidViewModel {
@@ -39,22 +37,18 @@ public class RelationshipVM extends AndroidViewModel {
         super(application);
     }
 
-    public LiveData<APIResponse> get(String targetedId) {
+    public LiveData<APIResponse> get(List<String> uris) {
         apiResponseMutableLiveData = new MutableLiveData<>();
-        getRelationShip(targetedId);
+        getRelationShip(uris);
         return apiResponseMutableLiveData;
     }
 
-    private void getRelationShip(String targetedId) {
+    private void getRelationShip(List<String> uris) {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                PeertubeAPI api = new PeertubeAPI(_mContext);
+                RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(_mContext);
-                List<Relationship> relationships = api.isFollowing(targetedId);
+                APIResponse apiResponse = api.isFollowing(uris);
-                Error error = api.getError();
-                APIResponse apiResponse = new APIResponse();
-                apiResponse.setRelationships(relationships);
-                apiResponse.setError(error);
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
                 mainHandler.post(myRunnable);

app/src/main/java/app/fedilab/fedilabtube/viewmodel/SearchVM.java

@@ -25,7 +25,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.PeertubeAPI;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 
 
 public class SearchVM extends AndroidViewModel {
@@ -45,7 +45,7 @@ public class SearchVM extends AndroidViewModel {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                PeertubeAPI api = new PeertubeAPI(_mContext);
+                RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(_mContext);
                 APIResponse apiResponse = api.searchPeertube(query, max_id);
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);

app/src/main/java/app/fedilab/fedilabtube/viewmodel/TimelineVM.java

@@ -0,0 +1,93 @@
+package app.fedilab.fedilabtube.viewmodel;
+/* Copyright 2020 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.app.Application;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import app.fedilab.fedilabtube.client.APIResponse;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
+
+
+public class TimelineVM extends AndroidViewModel {
+    private MutableLiveData<APIResponse> apiResponseMutableLiveData;
+
+    public TimelineVM(@NonNull Application application) {
+        super(application);
+    }
+
+    public LiveData<APIResponse> getVideos(RetrofitPeertubeAPI.TimelineType action, String max_id) {
+        apiResponseMutableLiveData = new MutableLiveData<>();
+        loadVideos(action, max_id);
+        return apiResponseMutableLiveData;
+    }
+
+
+    public LiveData<APIResponse> getVideo(String videoId) {
+        apiResponseMutableLiveData = new MutableLiveData<>();
+        getSingle(videoId);
+        return apiResponseMutableLiveData;
+    }
+
+
+    private void getSingle(String videoId) {
+        Context _mContext = getApplication().getApplicationContext();
+        new Thread(() -> {
+            try {
+                RetrofitPeertubeAPI retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext);
+                APIResponse apiResponse = retrofitPeertubeAPI.getVideos(videoId);
+                if (apiResponse.getPeertubes() != null && apiResponse.getPeertubes().size() > 0 && apiResponse.getPeertubes().get(0) != null) {
+                    APIResponse response = new RetrofitPeertubeAPI(_mContext).getRating(videoId);
+                    if (response != null)
+                        apiResponse.getPeertubes().get(0).setMyRating(response.getRating().getRating());
+                }
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
+                mainHandler.post(myRunnable);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
+
+    private void loadVideos(RetrofitPeertubeAPI.TimelineType timeline, String max_id) {
+        Context _mContext = getApplication().getApplicationContext();
+        new Thread(() -> {
+            try {
+                RetrofitPeertubeAPI retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext);
+                if (timeline == null)
+                    return;
+                APIResponse apiResponse;
+                if( timeline != RetrofitPeertubeAPI.TimelineType.OVERVIEW) {
+                    apiResponse = retrofitPeertubeAPI.getTL(timeline, max_id);
+                }else{
+                    apiResponse = retrofitPeertubeAPI.getOverviewVideo(max_id);
+                }
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
+                mainHandler.post(myRunnable);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
+}

app/src/main/res/layout/drawer_account.xml

@@ -69,24 +69,6 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:text="@string/videos" />
-
-                    <TextView
-                        android:id="@+id/account_sc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                </LinearLayout>
-
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -134,16 +116,6 @@
 
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/more_actions"
-        style="@style/Widget.AppCompat.Button.Borderless"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center"
-        android:contentDescription="@string/display_more"
-        android:src="@drawable/ic_baseline_more_vert_24"
-        android:visibility="gone" />
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/account_action"
         android:layout_width="wrap_content"

app/src/main/res/layout/drawer_channel.xml

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2020 Thomas Schneider
+
+    This file is a part of TubeLab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with TubeLab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/main_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/account_pp"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="center_horizontal"
+        android:contentDescription="@string/profile_picture" />
+
+    <LinearLayout
+        android:id="@+id/account_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/account_dn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/account_ac"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:singleLine="true"
+            android:textSize="16sp"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:id="@+id/account_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:orientation="horizontal">
+
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:text="@string/following" />
+
+                    <TextView
+                        android:id="@+id/account_fgc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:text="@string/followers" />
+
+                    <TextView
+                        android:id="@+id/account_frc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/account_ds"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:animateLayoutChanges="true"
+                android:autoLink="web" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/more_actions"
+        style="@style/Widget.AppCompat.Button.Borderless"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/display_more"
+        android:src="@drawable/ic_baseline_more_vert_24"
+        android:visibility="gone" />
+
+</LinearLayout>

app/src/main/res/navigation/mobile_navigation.xml

@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/navigation_discover"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_discover"
         tools:layout="@layout/fragment_video">
         <argument
@@ -19,7 +19,7 @@
 
     <fragment
         android:id="@+id/navigation_trending"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_trending"
         tools:layout="@layout/fragment_video">
         <argument
@@ -30,7 +30,7 @@
 
     <fragment
         android:id="@+id/navigation_most_liked"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_most_liked"
         tools:layout="@layout/fragment_video">
         <argument
@@ -42,7 +42,7 @@
 
     <fragment
         android:id="@+id/navigation_recently_added"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_recently_added"
         tools:layout="@layout/fragment_video">
         <argument
@@ -54,7 +54,7 @@
 
     <fragment
         android:id="@+id/navigation_home"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_home"
         tools:layout="@layout/fragment_video">
         <argument

app/src/main/res/navigation/mobile_navigation_connected.xml

@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/navigation_discover"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_discover"
         tools:layout="@layout/fragment_video">
         <argument
@@ -19,7 +19,7 @@
 
     <fragment
         android:id="@+id/navigation_subscription"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/subscriptions"
         tools:layout="@layout/fragment_video">
         <argument
@@ -31,7 +31,7 @@
 
     <fragment
         android:id="@+id/navigation_trending"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_trending"
         tools:layout="@layout/fragment_video">
         <argument
@@ -42,7 +42,7 @@
 
     <fragment
         android:id="@+id/navigation_most_liked"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_most_liked"
         tools:layout="@layout/fragment_video">
         <argument
@@ -54,7 +54,7 @@
 
     <fragment
         android:id="@+id/navigation_recently_added"
-        android:name="app.fedilab.fedilabtube.fragment.DisplayStatusFragment"
+        android:name="app.fedilab.fedilabtube.fragment.DisplayVideosFragment"
         android:label="@string/title_recently_added"
         tools:layout="@layout/fragment_video">
         <argument