Peertube/TubeLab-App-Android
1
0
Fork 0
mirror of https://framagit.org/tom79/fedilab-tube synced 2025-05-22 06:34:29 +02:00
Code Issues Releases Wiki Activity

some changes

Browse Source
This commit is contained in:
Thomas 2020-09-26 16:46:51 +02:00
parent 55179c6955
commit d878ac780c
26 changed files with 744 additions and 1235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -52,7 +52,7 @@
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name=".ShowAccountActivity" android:name=".ShowChannelActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />

107
app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java
View File

@ -35,19 +35,20 @@ import androidx.core.content.ContextCompat;
import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import app.fedilab.fedilabtube.client.HttpsConnection; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.entities.Oauth;
import app.fedilab.fedilabtube.client.entities.OauthParams;
import app.fedilab.fedilabtube.client.entities.RefreshToken;
import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.helper.Helper;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
import static app.fedilab.fedilabtube.client.HttpsConnection.updateCredential; import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.updateCredential;
public class LoginActivity extends AppCompatActivity { public class LoginActivity extends AppCompatActivity {
@ -55,8 +56,6 @@ public class LoginActivity extends AppCompatActivity {
//Peertube notification type //Peertube notification type
public static int NEW_VIDEO_FROM_SUBSCRIPTION = 1; public static int NEW_VIDEO_FROM_SUBSCRIPTION = 1;
// public static int NEW_COMMENT_ON_MY_VIDEO = 2;
// public static int NEW_VIDEO_ABUSE_FOR_MODERATORS = 3;
public static int BLACKLIST_ON_MY_VIDEO = 4; public static int BLACKLIST_ON_MY_VIDEO = 4;
public static int UNBLACKLIST_ON_MY_VIDEO = 5; public static int UNBLACKLIST_ON_MY_VIDEO = 5;
public static int MY_VIDEO_PUBLISHED = 6; public static int MY_VIDEO_PUBLISHED = 6;
@ -67,7 +66,6 @@ public class LoginActivity extends AppCompatActivity {
private EditText login_uid; private EditText login_uid;
private EditText login_passwd; private EditText login_passwd;
private Button connectionButton; private Button connectionButton;
private String actionToken;
private TextInputEditText login_instance; private TextInputEditText login_instance;
@Override @Override
@ -139,10 +137,7 @@ public class LoginActivity extends AppCompatActivity {
Toasty.error(LoginActivity.this, getString(R.string.email_error)).show(); Toasty.error(LoginActivity.this, getString(R.string.email_error)).show();
return; return;
} }
connectionButton.setEnabled(false); connectionButton.setEnabled(false);
final HashMap<String, String> parameters = new HashMap<>();
String instance, host; String instance, host;
if (!BuildConfig.full_instances) { if (!BuildConfig.full_instances) {
String[] emailArray = login_uid.getText().toString().split("@"); String[] emailArray = login_uid.getText().toString().split("@");
@ -164,27 +159,21 @@ public class LoginActivity extends AppCompatActivity {
if (Arrays.asList(Helper.openid).contains(host) && !BuildConfig.full_instances) { if (Arrays.asList(Helper.openid).contains(host) && !BuildConfig.full_instances) {
new Thread(() -> { new Thread(() -> {
try { try {
actionToken = "/api/v1/oauth-clients/local"; Oauth oauth = new RetrofitPeertubeAPI(LoginActivity.this, instance, null).oauthClient();
String response = new HttpsConnection(LoginActivity.this).get("https://" + instance + actionToken, 30, null, null); if (oauth == null) {
if (response == null) {
runOnUiThread(() -> { runOnUiThread(() -> {
connectionButton.setEnabled(true); connectionButton.setEnabled(true);
Toasty.error(LoginActivity.this, getString(R.string.client_error), Toast.LENGTH_LONG).show(); Toasty.error(LoginActivity.this, getString(R.string.client_error), Toast.LENGTH_LONG).show();
}); });
return; return;
} }
JSONObject resobj; client_id = oauth.getClient_id();
resobj = new JSONObject(response); client_secret = oauth.getClient_secret();
client_id = resobj.get(Helper.CLIENT_ID).toString();
client_secret = resobj.get(Helper.CLIENT_SECRET).toString();
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.CLIENT_ID, client_id); editor.putString(Helper.CLIENT_ID, client_id);
editor.putString(Helper.CLIENT_SECRET, client_secret); editor.putString(Helper.CLIENT_SECRET, client_secret);
editor.apply(); editor.apply();
parameters.clear();
parameters.put(Helper.CLIENT_ID, sharedpreferences.getString(Helper.CLIENT_ID, null));
parameters.put(Helper.CLIENT_SECRET, sharedpreferences.getString(Helper.CLIENT_SECRET, null));
Intent intent = new Intent(LoginActivity.this, WebviewConnectActivity.class); Intent intent = new Intent(LoginActivity.this, WebviewConnectActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString("url", "https://" + Helper.getPeertubeUrl(host) + "/plugins/auth-openid-connect/0.0.1/auth/openid-connect"); b.putString("url", "https://" + Helper.getPeertubeUrl(host) + "/plugins/auth-openid-connect/0.0.1/auth/openid-connect");
@ -201,70 +190,51 @@ public class LoginActivity extends AppCompatActivity {
}).start(); }).start();
} else { } else {
parameters.clear();
parameters.put(Helper.CLIENT_NAME, Helper.CLIENT_NAME_VALUE);
parameters.put(Helper.REDIRECT_URIS, Helper.REDIRECT_CONTENT);
parameters.put(Helper.SCOPES, Helper.OAUTH_SCOPES_PEERTUBE);
parameters.put(Helper.WEBSITE, Helper.WEBSITE_VALUE);
new Thread(() -> { new Thread(() -> {
try { try {
actionToken = "/api/v1/oauth-clients/local"; Oauth oauth = new RetrofitPeertubeAPI(LoginActivity.this, instance, null).oauthClient();
String response = new HttpsConnection(LoginActivity.this).get("https://" + instance + actionToken, 30, parameters, null); if (oauth == null) {
if (response == null) {
runOnUiThread(() -> { runOnUiThread(() -> {
connectionButton.setEnabled(true); connectionButton.setEnabled(true);
Toasty.error(LoginActivity.this, getString(R.string.client_error), Toast.LENGTH_LONG).show(); Toasty.error(LoginActivity.this, getString(R.string.client_error), Toast.LENGTH_LONG).show();
}); });
return; return;
} }
JSONObject resobj;
try { client_id = oauth.getClient_id();
resobj = new JSONObject(response); client_secret = oauth.getClient_secret();
client_id = resobj.get(Helper.CLIENT_ID).toString();
client_secret = resobj.get(Helper.CLIENT_SECRET).toString();
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.CLIENT_ID, client_id); editor.putString(Helper.CLIENT_ID, client_id);
editor.putString(Helper.CLIENT_SECRET, client_secret); editor.putString(Helper.CLIENT_SECRET, client_secret);
editor.apply(); editor.apply();
parameters.clear(); OauthParams oauthParams = new OauthParams();
parameters.put(Helper.CLIENT_ID, sharedpreferences.getString(Helper.CLIENT_ID, null)); oauthParams.setClient_id(sharedpreferences.getString(Helper.CLIENT_ID, null));
parameters.put(Helper.CLIENT_SECRET, sharedpreferences.getString(Helper.CLIENT_SECRET, null)); oauthParams.setClient_secret(sharedpreferences.getString(Helper.CLIENT_SECRET, null));
parameters.put("grant_type", "password"); oauthParams.setGrant_type("password");
try { try {
parameters.put("username", URLEncoder.encode(login_uid.getText().toString().trim(), "UTF-8")); oauthParams.setUsername(URLEncoder.encode(login_uid.getText().toString().trim(), "UTF-8"));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
parameters.put("username", login_uid.getText().toString().trim()); oauthParams.setUsername(login_uid.getText().toString().trim());
} }
try { try {
parameters.put("password", URLEncoder.encode(login_passwd.getText().toString(), "UTF-8")); oauthParams.setPassword(URLEncoder.encode(login_passwd.getText().toString(), "UTF-8"));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
parameters.put("password", login_passwd.getText().toString()); oauthParams.setPassword(login_passwd.getText().toString());
} }
parameters.put("scope", "user");
String oauthUrl = "/api/v1/users/token";
try { try {
String responseLogin = new HttpsConnection(LoginActivity.this).post("https://" + instance + oauthUrl, 30, parameters, null); RefreshToken refreshToken = new RetrofitPeertubeAPI(LoginActivity.this, instance, null).manageToken(oauthParams);
proceedLogin(responseLogin, host); proceedLogin(refreshToken, host);
} catch (final Exception e) { } catch (final Exception e) {
parameters.clear();
parameters.put(Helper.CLIENT_ID, sharedpreferences.getString(Helper.CLIENT_ID, null));
parameters.put(Helper.CLIENT_SECRET, sharedpreferences.getString(Helper.CLIENT_SECRET, null));
parameters.put("grant_type", "password");
try { try {
parameters.put("username", URLEncoder.encode(login_uid.getText().toString().toLowerCase().trim(), "UTF-8")); oauthParams.setUsername(URLEncoder.encode(login_uid.getText().toString().toLowerCase().trim(), "UTF-8"));
} catch (UnsupportedEncodingException e2) { } catch (UnsupportedEncodingException e2) {
parameters.put("username", login_uid.getText().toString().toLowerCase().trim()); oauthParams.setUsername(login_uid.getText().toString().toLowerCase().trim());
} }
try { try {
parameters.put("password", URLEncoder.encode(login_passwd.getText().toString(), "UTF-8")); RefreshToken refreshToken = new RetrofitPeertubeAPI(LoginActivity.this, instance, null).manageToken(oauthParams);
} catch (UnsupportedEncodingException e2) { proceedLogin(refreshToken, host);
parameters.put("password", login_passwd.getText().toString());
}
parameters.put("scope", "user");
try {
String responseLogin = new HttpsConnection(LoginActivity.this).post("https://" + instance + oauthUrl, 30, parameters, null);
proceedLogin(responseLogin, host);
} catch (final Exception e2) { } catch (final Exception e2) {
e2.printStackTrace(); e2.printStackTrace();
runOnUiThread(() -> { runOnUiThread(() -> {
@ -280,11 +250,6 @@ public class LoginActivity extends AppCompatActivity {
}); });
} }
} }
} catch (JSONException e) {
e.printStackTrace();
e.printStackTrace();
runOnUiThread(() -> connectionButton.setEnabled(true));
}
} catch (final Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
runOnUiThread(() -> { runOnUiThread(() -> {
@ -305,24 +270,16 @@ public class LoginActivity extends AppCompatActivity {
}); });
} }
private void proceedLogin(String responseLogin, String host) { private void proceedLogin(RefreshToken refreshToken, String host) {
runOnUiThread(() -> { runOnUiThread(() -> {
JSONObject resobjLogin; JSONObject resobjLogin;
try {
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
resobjLogin = new JSONObject(responseLogin); editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, refreshToken.getAccess_token());
String token = resobjLogin.getString("access_token");
String refresh_token = resobjLogin.getString("refresh_token");
editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
editor.putString(Helper.PREF_INSTANCE, host); editor.putString(Helper.PREF_INSTANCE, host);
editor.apply(); editor.apply();
//Update the account with the token; //Update the account with the token;
updateCredential(LoginActivity.this, token, client_id, client_secret, refresh_token, host); updateCredential(LoginActivity.this, refreshToken.getAccess_token(), client_id, client_secret, refreshToken.getRefresh_token(), host);
} catch (JSONException e) {
e.printStackTrace();
runOnUiThread(() -> connectionButton.setEnabled(true));
}
}); });
} }

13
app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
View File

@ -45,7 +45,9 @@ import org.jetbrains.annotations.NotNull;
import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.data.AccountData.Account; import app.fedilab.fedilabtube.client.data.AccountData.Account;
import app.fedilab.fedilabtube.client.entities.OauthParams;
import app.fedilab.fedilabtube.client.entities.PeertubeInformation; import app.fedilab.fedilabtube.client.entities.PeertubeInformation;
import app.fedilab.fedilabtube.client.entities.WellKnownNodeinfo;
import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.helper.Helper;
import app.fedilab.fedilabtube.services.RetrieveInfoService; import app.fedilab.fedilabtube.services.RetrieveInfoService;
import app.fedilab.fedilabtube.sqlite.AccountDAO; import app.fedilab.fedilabtube.sqlite.AccountDAO;
@ -164,7 +166,12 @@ public class MainActivity extends AppCompatActivity {
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
Account account = new AccountDAO(MainActivity.this, db).getUniqAccount(userId, instance); Account account = new AccountDAO(MainActivity.this, db).getUniqAccount(userId, instance);
if (account != null) { if (account != null) {
new Thread(() -> new RetrofitPeertubeAPI(MainActivity.this).refreshToken(account.getClient_id(), account.getClient_secret(),account.getToken())).start(); OauthParams oauthParams = new OauthParams();
oauthParams.setGrant_type("refresh_token");
oauthParams.setClient_id(account.getClient_id());
oauthParams.setClient_secret(account.getClient_secret());
oauthParams.setRefresh_token(account.getRefresh_token());
new Thread(() -> new RetrofitPeertubeAPI(MainActivity.this).manageToken(oauthParams)).start();
} }
} else { } else {
instanceItem.setVisible(true); instanceItem.setVisible(true);
@ -285,8 +292,8 @@ public class MainActivity extends AppCompatActivity {
(dialog, which) -> new Thread(() -> { (dialog, which) -> new Thread(() -> {
try { try {
String newInstance = input.getText().toString().trim(); String newInstance = input.getText().toString().trim();
InstanceNodeInfo instanceNodeInfo = new RetrofitPeertubeAPI(MainActivity.this).displayNodeInfo(newInstance); WellKnownNodeinfo.NodeInfo instanceNodeInfo = new RetrofitPeertubeAPI(MainActivity.this).getNodeInfo(newInstance);
if (instanceNodeInfo.getName() != null && instanceNodeInfo.getName().trim().toLowerCase().compareTo("peertube") == 0) { if (instanceNodeInfo.getSoftware() != null && instanceNodeInfo.getSoftware().getName().trim().toLowerCase().compareTo("peertube") == 0) {
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.PREF_INSTANCE, newInstance); editor.putString(Helper.PREF_INSTANCE, newInstance);
editor.commit(); editor.commit();

51
app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
View File

@ -83,9 +83,7 @@ import com.google.android.exoplayer2.util.Util;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -97,7 +95,7 @@ import app.fedilab.fedilabtube.client.data.CommentData.Comment;
import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist; import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
import app.fedilab.fedilabtube.client.data.VideoData; import app.fedilab.fedilabtube.client.data.VideoData;
import app.fedilab.fedilabtube.client.entities.File; import app.fedilab.fedilabtube.client.entities.File;
import app.fedilab.fedilabtube.client.entities.PlaylistParams; import app.fedilab.fedilabtube.client.entities.Item;
import app.fedilab.fedilabtube.client.entities.Report; import app.fedilab.fedilabtube.client.entities.Report;
import app.fedilab.fedilabtube.drawer.CommentListAdapter; import app.fedilab.fedilabtube.drawer.CommentListAdapter;
import app.fedilab.fedilabtube.helper.CacheDataSourceFactory; import app.fedilab.fedilabtube.helper.CacheDataSourceFactory;
@ -115,6 +113,10 @@ import app.fedilab.fedilabtube.webview.MastalabWebChromeClient;
import app.fedilab.fedilabtube.webview.MastalabWebViewClient; import app.fedilab.fedilabtube.webview.MastalabWebViewClient;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.ADD_COMMENT;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.RATEVIDEO;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_VIDEO;
import static app.fedilab.fedilabtube.helper.Helper.getAttColor; import static app.fedilab.fedilabtube.helper.Helper.getAttColor;
import static app.fedilab.fedilabtube.helper.Helper.getLiveInstance; import static app.fedilab.fedilabtube.helper.Helper.getLiveInstance;
import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn; import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn;
@ -142,7 +144,7 @@ public class PeertubeActivity extends AppCompatActivity {
private ImageView send; private ImageView send;
private TextView add_comment_read; private TextView add_comment_read;
private EditText add_comment_write; private EditText add_comment_write;
private List<PlaylistParams> playlistForVideo; private List<Playlist> playlistForVideo;
private List<Playlist> playlists; private List<Playlist> playlists;
private PlaylistsVM playlistsViewModel; private PlaylistsVM playlistsViewModel;
private boolean playInMinimized; private boolean playInMinimized;
@ -371,8 +373,8 @@ public class PeertubeActivity extends AppCompatActivity {
dialogBuilder.setNeutralButton(R.string.cancel, (dialog, id) -> dialog.dismiss()); dialogBuilder.setNeutralButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
androidx.appcompat.app.AlertDialog alertDialog = dialogBuilder.create(); androidx.appcompat.app.AlertDialog alertDialog = dialogBuilder.create();
alertDialog.show(); alertDialog.show();
report_video.setOnClickListener(v -> reportAlert(RetrofitPeertubeAPI.reportType.VIDEO, alertDialog)); report_video.setOnClickListener(v -> reportAlert(REPORT_VIDEO, alertDialog));
report_account.setOnClickListener(v -> reportAlert(PeertubeAPI.reportType.ACCOUNT, alertDialog)); report_account.setOnClickListener(v -> reportAlert(REPORT_ACCOUNT, alertDialog));
return true; return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
@ -467,7 +469,7 @@ public class PeertubeActivity extends AppCompatActivity {
String comment = add_comment_write.getText().toString(); String comment = add_comment_write.getText().toString();
if (comment.trim().length() > 0) { if (comment.trim().length() > 0) {
PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class); PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
viewModel.post(RetrofitPeertubeAPI.ActionType.PEERTUBECOMMENT, peertube.getAccount().getId(), comment, null).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.PEERTUBECOMMENT, apiResponse1)); viewModel.comment(ADD_COMMENT, peertube.getId(), null, comment).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(ADD_COMMENT, apiResponse1));
add_comment_write.setText(""); add_comment_write.setText("");
add_comment_read.setVisibility(View.VISIBLE); add_comment_read.setVisibility(View.VISIBLE);
add_comment_write.setVisibility(View.GONE); add_comment_write.setVisibility(View.GONE);
@ -488,12 +490,12 @@ public class PeertubeActivity extends AppCompatActivity {
String title = null; String title = null;
boolean isPresent = false; boolean isPresent = false;
String elementId = null; String elementId = null;
PlaylistParams playlistElementFinal = null; Playlist playlistElementFinal = null;
for (PlaylistParams playlistElement : playlistForVideo) { for (Playlist playlistElement : playlistForVideo) {
if (playlist.getId().equals(playlistElement.getPlaylistId())) { if (playlist.getId().equals(playlistElement.getId())) {
title = "✔ " + playlist.getDisplayName(); title = "✔ " + playlist.getDisplayName();
isPresent = true; isPresent = true;
elementId = playlistElement.getPlaylistElementId(); elementId = playlistElement.getId();
playlistElementFinal = playlistElement; playlistElementFinal = playlistElement;
break; break;
} }
@ -504,7 +506,7 @@ public class PeertubeActivity extends AppCompatActivity {
MenuItem item = popup.getMenu().add(0, 0, Menu.NONE, title); MenuItem item = popup.getMenu().add(0, 0, Menu.NONE, title);
boolean finalIsPresent = isPresent; boolean finalIsPresent = isPresent;
String finalElementId = elementId; String finalElementId = elementId;
PlaylistParams finalPlaylistElementFinal = playlistElementFinal; Playlist finalPlaylistElementFinal = playlistElementFinal;
item.setOnMenuItemClickListener(item1 -> { item.setOnMenuItemClickListener(item1 -> {
item1.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW); item1.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
item1.setActionView(new View(PeertubeActivity.this)); item1.setActionView(new View(PeertubeActivity.this));
@ -526,9 +528,8 @@ public class PeertubeActivity extends AppCompatActivity {
} else { } else {
item1.setTitle("✔ " + playlist.getDisplayName()); item1.setTitle("✔ " + playlist.getDisplayName());
playlistsViewModel.manage(PlaylistsVM.action.ADD_VIDEOS, playlist, peertube.getId()).observe(PeertubeActivity.this, apiResponse3 -> manageVIewPlaylists(PlaylistsVM.action.ADD_VIDEOS, apiResponse3)); playlistsViewModel.manage(PlaylistsVM.action.ADD_VIDEOS, playlist, peertube.getId()).observe(PeertubeActivity.this, apiResponse3 -> manageVIewPlaylists(PlaylistsVM.action.ADD_VIDEOS, apiResponse3));
PlaylistParams playlistElement = new PlaylistParams(); Playlist playlistElement = new Playlist();
playlistElement.setPlaylistElementId(null); playlistElement.setId(playlist.getId());
playlistElement.setPlaylistId(playlist.getId());
playlistForVideo.add(playlistElement); playlistForVideo.add(playlistElement);
} }
return false; return false;
@ -541,7 +542,7 @@ public class PeertubeActivity extends AppCompatActivity {
if (peertube.isCommentsEnabled()) { if (peertube.isCommentsEnabled()) {
CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class); CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class);
commentViewModel.getComment(peertubeInstance, videoId).observe(PeertubeActivity.this, this::manageVIewComment); commentViewModel.getThread(videoId).observe(PeertubeActivity.this, this::manageVIewComment);
write_comment_container.setVisibility(View.VISIBLE); write_comment_container.setVisibility(View.VISIBLE);
} else { } else {
@ -567,7 +568,7 @@ public class PeertubeActivity extends AppCompatActivity {
if (isLoggedIn(PeertubeActivity.this)) { if (isLoggedIn(PeertubeActivity.this)) {
String newState = peertube.getMyRating().equals("like") ? "none" : "like"; String newState = peertube.getMyRating().equals("like") ? "none" : "like";
PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class); PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
viewModel.post(RetrofitPeertubeAPI.ActionType.RATEVIDEO, peertube.getId(), newState, null).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.RATEVIDEO, apiResponse1)); viewModel.post(RATEVIDEO, peertube.getId(), newState).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(RATEVIDEO, apiResponse1));
peertube.setMyRating(newState); peertube.setMyRating(newState);
int count = Integer.parseInt(peertube_like_count.getText().toString()); int count = Integer.parseInt(peertube_like_count.getText().toString());
if (newState.compareTo("none") == 0) { if (newState.compareTo("none") == 0) {
@ -588,7 +589,7 @@ public class PeertubeActivity extends AppCompatActivity {
if (isLoggedIn(PeertubeActivity.this)) { if (isLoggedIn(PeertubeActivity.this)) {
String newState = peertube.getMyRating().equals("dislike") ? "none" : "dislike"; String newState = peertube.getMyRating().equals("dislike") ? "none" : "dislike";
PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class); PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
viewModel.post(RetrofitPeertubeAPI.ActionType.RATEVIDEO, peertube.getId(), newState).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(PeertubeAPI.StatusAction.RATEVIDEO, apiResponse1)); viewModel.post(RATEVIDEO, peertube.getId(), newState).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(RATEVIDEO, apiResponse1));
peertube.setMyRating(newState); peertube.setMyRating(newState);
int count = Integer.parseInt(peertube_dislike_count.getText().toString()); int count = Integer.parseInt(peertube_dislike_count.getText().toString());
if (newState.compareTo("none") == 0) { if (newState.compareTo("none") == 0) {
@ -690,10 +691,9 @@ public class PeertubeActivity extends AppCompatActivity {
int i = 1; int i = 1;
if (captions.size() > 0) { if (captions.size() > 0) {
for (Caption caption : captions) { for (Caption caption : captions) {
Iterator<Map.Entry<String, String>> it = caption.getLanguage().entrySet().iterator(); Item lang = caption.getLanguage();
Map.Entry<String, String> pair = it.next(); itemsLabelLanguage[i] = String.valueOf(lang.getId());
itemsLabelLanguage[i] = pair.getValue(); itemsKeyLanguage[i] = lang.getLabel();
itemsKeyLanguage[i] = pair.getKey();
i++; i++;
} }
} }
@ -944,10 +944,9 @@ public class PeertubeActivity extends AppCompatActivity {
@SuppressWarnings({"unused", "RedundantSuppression"}) @SuppressWarnings({"unused", "RedundantSuppression"})
public void manageVIewPostActions(RetrofitPeertubeAPI.ActionType statusAction, APIResponse apiResponse) { public void manageVIewPostActions(RetrofitPeertubeAPI.ActionType statusAction, APIResponse apiResponse) {
if (peertube.isCommentsEnabled() && statusAction == ADD_COMMENT) {
if (peertube.isCommentsEnabled() && statusAction == RetrofitPeertubeAPI.ActionType.PEERTUBECOMMENT) {
CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class); CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class);
commentViewModel.getComment(peertubeInstance, videoId).observe(PeertubeActivity.this, this::manageVIewComment); commentViewModel.getThread(videoId).observe(PeertubeActivity.this, this::manageVIewComment);
} else if (statusAction == RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT) { } else if (statusAction == RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT) {
Toasty.success(PeertubeActivity.this, getString(R.string.successful_report), Toasty.LENGTH_LONG).show(); Toasty.success(PeertubeActivity.this, getString(R.string.successful_report), Toasty.LENGTH_LONG).show();
} else if (statusAction == RetrofitPeertubeAPI.ActionType.REPORT_VIDEO) { } else if (statusAction == RetrofitPeertubeAPI.ActionType.REPORT_VIDEO) {
@ -1037,7 +1036,7 @@ public class PeertubeActivity extends AppCompatActivity {
public void manageVIewPlaylists(PlaylistsVM.action actionType, APIResponse apiResponse) { public void manageVIewPlaylists(PlaylistsVM.action actionType, APIResponse apiResponse) {
if (actionType == GET_PLAYLIST_FOR_VIDEO && apiResponse != null) { if (actionType == GET_PLAYLIST_FOR_VIDEO && apiResponse != null) {
playlistForVideo = apiResponse.getPlaylistForVideos(); playlistForVideo = apiResponse.getPlaylists();
} else if (actionType == GET_PLAYLISTS && apiResponse != null) { } else if (actionType == GET_PLAYLISTS && apiResponse != null) {
playlists = apiResponse.getPlaylists(); playlists = apiResponse.getPlaylists();
} }

203
app/src/main/java/app/fedilab/fedilabtube/ShowAccountActivity.java → app/src/main/java/app/fedilab/fedilabtube/ShowChannelActivity.java
View File

@ -48,40 +48,46 @@ import com.google.android.material.tabs.TabLayout;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.APIResponse;
import app.fedilab.fedilabtube.client.PeertubeAPI; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.data.AccountData.Account; import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
import app.fedilab.fedilabtube.client.entities.Relationship;
import app.fedilab.fedilabtube.fragment.DisplayAccountsFragment; import app.fedilab.fedilabtube.fragment.DisplayAccountsFragment;
import app.fedilab.fedilabtube.fragment.DisplayVideosFragment; import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.helper.Helper;
import app.fedilab.fedilabtube.viewmodel.AccountsVM; import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
import app.fedilab.fedilabtube.viewmodel.TimelineVM; import app.fedilab.fedilabtube.viewmodel.TimelineVM;
import app.fedilab.fedilabtube.viewmodel.PostActionsVM; import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
import app.fedilab.fedilabtube.viewmodel.RelationshipVM; import app.fedilab.fedilabtube.viewmodel.RelationshipVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY; import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.FOLLOW;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.MUTE;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.UNFOLLOW;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.CHANNEL;
import static app.fedilab.fedilabtube.helper.Helper.getLiveInstance; import static app.fedilab.fedilabtube.helper.Helper.getLiveInstance;
import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn; import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn;
public class ShowAccountActivity extends AppCompatActivity { public class ShowChannelActivity extends AppCompatActivity {
private Button account_follow; private Button account_follow;
private ViewPager mPager; private ViewPager mPager;
private TabLayout tabLayout; private TabLayout tabLayout;
private TextView account_note, subscriber_count; private TextView account_note, subscriber_count;
private Relationship relationship; private List<Map<String, Boolean>> relationship;
private ImageView account_pp; private ImageView account_pp;
private TextView account_dn; private TextView account_dn;
private Account account; private Channel channel;
private String accountId;
private boolean ischannel;
private action doAction; private action doAction;
private String channelAcct;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -96,15 +102,10 @@ public class ShowAccountActivity extends AppCompatActivity {
account_dn = findViewById(R.id.account_dn); account_dn = findViewById(R.id.account_dn);
account_pp.setBackgroundResource(R.drawable.account_pp_border); account_pp.setBackgroundResource(R.drawable.account_pp_border);
if (b != null) { if (b != null) {
account = b.getParcelable("account"); channel = b.getParcelable("channel");
if (account == null) { channelAcct = b.getString("channelId");
accountId = b.getString("accountId");
} else { } else {
accountId = account.getId(); Toasty.error(ShowChannelActivity.this, getString(R.string.toast_error_loading_account), Toast.LENGTH_LONG).show();
}
ischannel = b.getBoolean("ischannel", false);
} else {
Toasty.error(ShowAccountActivity.this, getString(R.string.toast_error_loading_account), Toast.LENGTH_LONG).show();
} }
if (getSupportActionBar() != null) { if (getSupportActionBar() != null) {
@ -115,19 +116,16 @@ public class ShowAccountActivity extends AppCompatActivity {
account_note = findViewById(R.id.account_note); account_note = findViewById(R.id.account_note);
AccountsVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(AccountsVM.class); ChannelsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(ChannelsVM.class);
if (account != null) {
manageAccount(); manageChannel();
viewModel.getAccounts(null, account.getAcct(), AccountsVM.accountFetch.SINGLE_CHANNEL).observe(ShowAccountActivity.this, this::manageViewAccounts); viewModel.get(CHANNEL, channelAcct==null?channel.getAcct():channelAcct).observe(ShowChannelActivity.this, this::manageViewAccounts);
} else {
viewModel.getAccounts(null, accountId, AccountsVM.accountFetch.SINGLE_CHANNEL).observe(ShowAccountActivity.this, this::manageViewAccounts);
}
} }
@Override @Override
public boolean onCreateOptionsMenu(@NotNull Menu menu) { public boolean onCreateOptionsMenu(@NotNull Menu menu) {
getMenuInflater().inflate(R.menu.main_account, menu); getMenuInflater().inflate(R.menu.main_account, menu);
if (!Helper.isLoggedIn(ShowAccountActivity.this)) { if (!Helper.isLoggedIn(ShowChannelActivity.this)) {
menu.findItem(R.id.action_mute).setVisible(false); menu.findItem(R.id.action_mute).setVisible(false);
} }
return true; return true;
@ -139,21 +137,21 @@ public class ShowAccountActivity extends AppCompatActivity {
finish(); finish();
return true; return true;
} else if (item.getItemId() == R.id.action_mute) { } else if (item.getItemId() == R.id.action_mute) {
PostActionsVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(PostActionsVM.class); PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
viewModel.post(PeertubeAPI.StatusAction.MUTE, account.getchannelOwner() != null ? account.getchannelOwner().getAcct() : account.getAcct(), null, null).observe(ShowAccountActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.MUTE, apiResponse)); viewModel.post(MUTE, channel.getOwnerAccount() != null ? channel.getOwnerAccount().getAcct() : channel.getAcct(), null).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(MUTE, apiResponse));
} else if (item.getItemId() == R.id.action_report) { } else if (item.getItemId() == R.id.action_report) {
androidx.appcompat.app.AlertDialog.Builder dialogBuilder = new androidx.appcompat.app.AlertDialog.Builder(ShowAccountActivity.this); androidx.appcompat.app.AlertDialog.Builder dialogBuilder = new androidx.appcompat.app.AlertDialog.Builder(ShowChannelActivity.this);
LayoutInflater inflater1 = getLayoutInflater(); LayoutInflater inflater1 = getLayoutInflater();
View dialogView = inflater1.inflate(R.layout.popup_report, new LinearLayout(ShowAccountActivity.this), false); View dialogView = inflater1.inflate(R.layout.popup_report, new LinearLayout(ShowChannelActivity.this), false);
dialogBuilder.setView(dialogView); dialogBuilder.setView(dialogView);
EditText report_content = dialogView.findViewById(R.id.report_content); EditText report_content = dialogView.findViewById(R.id.report_content);
dialogBuilder.setNeutralButton(R.string.cancel, (dialog, id) -> dialog.dismiss()); dialogBuilder.setNeutralButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
dialogBuilder.setPositiveButton(R.string.report, (dialog, id) -> { dialogBuilder.setPositiveButton(R.string.report, (dialog, id) -> {
if (report_content.getText().toString().trim().length() == 0) { if (report_content.getText().toString().trim().length() == 0) {
Toasty.info(ShowAccountActivity.this, getString(R.string.report_comment_size), Toasty.LENGTH_LONG).show(); Toasty.info(ShowChannelActivity.this, getString(R.string.report_comment_size), Toasty.LENGTH_LONG).show();
} else { } else {
PostActionsVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(PostActionsVM.class); PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
viewModel.post(PeertubeAPI.StatusAction.REPORT_ACCOUNT, account.getId(), report_content.getText().toString(), null).observe(ShowAccountActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.REPORT_ACCOUNT, apiResponse)); viewModel.post(REPORT_ACCOUNT, channel.getId(), report_content.getText().toString()).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(REPORT_ACCOUNT, apiResponse));
dialog.dismiss(); dialog.dismiss();
} }
}); });
@ -163,36 +161,30 @@ public class ShowAccountActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
private void manageAccount() { private void manageChannel() {
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
String accountIdRelation = account.getAcct(); String accountIdRelation = channel.getAcct();
if (isLoggedIn(ShowAccountActivity.this)) { if (isLoggedIn(ShowChannelActivity.this)) {
RelationshipVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(RelationshipVM.class); RelationshipVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(RelationshipVM.class);
viewModel.get(accountIdRelation).observe(ShowAccountActivity.this, this::manageVIewRelationship); List<String> uids = new ArrayList<>();
uids.add(accountIdRelation);
viewModel.get(uids).observe(ShowChannelActivity.this, this::manageVIewRelationship);
} }
setTitle(account.getAcct()); setTitle(channel.getAcct());
mPager = findViewById(R.id.account_viewpager); mPager = findViewById(R.id.account_viewpager);
if (!ischannel) {
tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.videos)));
tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.channels)));
mPager.setOffscreenPageLimit(2);
} else {
tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.videos))); tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.videos)));
mPager.setOffscreenPageLimit(1); mPager.setOffscreenPageLimit(1);
}
PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
mPager.setAdapter(mPagerAdapter); mPager.setAdapter(mPagerAdapter);
if (ischannel) {
ViewGroup.LayoutParams params = tabLayout.getLayoutParams(); ViewGroup.LayoutParams params = tabLayout.getLayoutParams();
params.height = 0; params.height = 0;
tabLayout.setLayoutParams(params); tabLayout.setLayoutParams(params);
}
mPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { mPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override @Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@ -245,39 +237,39 @@ public class ShowAccountActivity extends AppCompatActivity {
} }
}); });
account_dn.setText(account.getDisplay_name()); account_dn.setText(channel.getDisplayName());
manageNotes(account); manageNotes(channel);
Helper.loadGiF(ShowAccountActivity.this, account, account_pp); Helper.loadGiF(ShowChannelActivity.this, channel.getAvatar().getPath(), account_pp);
//Follow button //Follow button
String target = account.getAcct(); String target = channel.getAcct();
account_follow.setOnClickListener(v -> { account_follow.setOnClickListener(v -> {
if (doAction == action.NOTHING) { if (doAction == action.NOTHING) {
Toasty.info(ShowAccountActivity.this, getString(R.string.nothing_to_do), Toast.LENGTH_LONG).show(); Toasty.info(ShowChannelActivity.this, getString(R.string.nothing_to_do), Toast.LENGTH_LONG).show();
} else if (doAction == action.FOLLOW) { } else if (doAction == action.FOLLOW) {
account_follow.setEnabled(false); account_follow.setEnabled(false);
PostActionsVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(PostActionsVM.class); PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
viewModel.post(PeertubeAPI.StatusAction.FOLLOW, target, null, null).observe(ShowAccountActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.FOLLOW, apiResponse)); viewModel.post(FOLLOW, target, null).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(FOLLOW, apiResponse));
} else if (doAction == action.UNFOLLOW) { } else if (doAction == action.UNFOLLOW) {
boolean confirm_unfollow = sharedpreferences.getBoolean(Helper.SET_UNFOLLOW_VALIDATION, true); boolean confirm_unfollow = sharedpreferences.getBoolean(Helper.SET_UNFOLLOW_VALIDATION, true);
if (confirm_unfollow) { if (confirm_unfollow) {
AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(ShowAccountActivity.this); AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(ShowChannelActivity.this);
unfollowConfirm.setTitle(getString(R.string.unfollow_confirm)); unfollowConfirm.setTitle(getString(R.string.unfollow_confirm));
unfollowConfirm.setMessage(account.getAcct()); unfollowConfirm.setMessage(channel.getAcct());
unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss()); unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
unfollowConfirm.setPositiveButton(R.string.yes, (dialog, which) -> { unfollowConfirm.setPositiveButton(R.string.yes, (dialog, which) -> {
account_follow.setEnabled(false); account_follow.setEnabled(false);
PostActionsVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(PostActionsVM.class); PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
viewModel.post(PeertubeAPI.StatusAction.UNFOLLOW, target, null, null).observe(ShowAccountActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.UNFOLLOW, apiResponse)); viewModel.post(UNFOLLOW, target, null).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(UNFOLLOW, apiResponse));
dialog.dismiss(); dialog.dismiss();
}); });
unfollowConfirm.show(); unfollowConfirm.show();
} else { } else {
account_follow.setEnabled(false); account_follow.setEnabled(false);
PostActionsVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(PostActionsVM.class); PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
viewModel.post(PeertubeAPI.StatusAction.UNFOLLOW, target, null, null).observe(ShowAccountActivity.this, apiResponse -> manageVIewPostActions(PeertubeAPI.StatusAction.UNFOLLOW, apiResponse)); viewModel.post(UNFOLLOW, target, null).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(UNFOLLOW, apiResponse));
} }
} }
@ -288,11 +280,10 @@ public class ShowAccountActivity extends AppCompatActivity {
public void manageVIewRelationship(APIResponse apiResponse) { public void manageVIewRelationship(APIResponse apiResponse) {
if (apiResponse.getError() != null) { if (apiResponse.getError() != null) {
Toasty.error(ShowAccountActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); Toasty.error(ShowChannelActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
return; return;
} }
List<Relationship> relationships = apiResponse.getRelationships(); this.relationship = apiResponse.getRelationships();
this.relationship = relationships.get(0);
manageButtonVisibility(); manageButtonVisibility();
invalidateOptionsMenu(); invalidateOptionsMenu();
@ -313,36 +304,27 @@ public class ShowAccountActivity extends AppCompatActivity {
}; };
int[] colors = new int[]{ int[] colors = new int[]{
ContextCompat.getColor(ShowAccountActivity.this, Helper.getColorAccent()), ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
ContextCompat.getColor(ShowAccountActivity.this, Helper.getColorAccent()), ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
ContextCompat.getColor(ShowAccountActivity.this, Helper.getColorAccent()), ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
ContextCompat.getColor(ShowAccountActivity.this, Helper.getColorAccent()) ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent())
}; };
account_follow.setBackgroundTintList(new ColorStateList(states, colors)); account_follow.setBackgroundTintList(new ColorStateList(states, colors));
} }
account_follow.setEnabled(true); account_follow.setEnabled(true);
if (relationship.isFollowing()) {
boolean isFollowing = relationship.get(0).get(channel.getAcct());
if (isFollowing) {
account_follow.setText(R.string.action_unfollow); account_follow.setText(R.string.action_unfollow);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
account_follow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ShowAccountActivity.this, R.color.red_1))); account_follow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ShowChannelActivity.this, R.color.red_1)));
} }
doAction = action.UNFOLLOW; doAction = action.UNFOLLOW;
if (ischannel) {
account_follow.setVisibility(View.VISIBLE); account_follow.setVisibility(View.VISIBLE);
} else { } else {
account_follow.setVisibility(View.GONE);
}
} else if (!relationship.isFollowing()) {
account_follow.setText(R.string.action_follow); account_follow.setText(R.string.action_follow);
doAction = action.FOLLOW; doAction = action.FOLLOW;
if (ischannel) {
account_follow.setVisibility(View.VISIBLE); account_follow.setVisibility(View.VISIBLE);
} else {
account_follow.setVisibility(View.GONE);
}
} else {
account_follow.setVisibility(View.GONE);
doAction = action.NOTHING;
} }
} }
@ -358,54 +340,55 @@ public class ShowAccountActivity extends AppCompatActivity {
} }
public void manageVIewPostActions(PeertubeAPI.StatusAction statusAction, APIResponse apiResponse) { public void manageVIewPostActions(RetrofitPeertubeAPI.ActionType statusAction, APIResponse apiResponse) {
if (apiResponse.getError() != null) { if (apiResponse.getError() != null) {
Toasty.error(ShowAccountActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); Toasty.error(ShowChannelActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
return; return;
} }
String target = account.getAcct(); String target = channel.getAcct();
//IF action is unfollow or mute, sends an intent to remove statuses //IF action is unfollow or mute, sends an intent to remove statuses
if (statusAction == PeertubeAPI.StatusAction.UNFOLLOW) { if (statusAction == RetrofitPeertubeAPI.ActionType.UNFOLLOW) {
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString("receive_action", apiResponse.getTargetedId()); b.putString("receive_action", apiResponse.getTargetedId());
Intent intentBC = new Intent(Helper.RECEIVE_ACTION); Intent intentBC = new Intent(Helper.RECEIVE_ACTION);
intentBC.putExtras(b); intentBC.putExtras(b);
} }
if (statusAction == PeertubeAPI.StatusAction.UNFOLLOW || statusAction == PeertubeAPI.StatusAction.FOLLOW) { if (statusAction == RetrofitPeertubeAPI.ActionType.UNFOLLOW || statusAction == RetrofitPeertubeAPI.ActionType.FOLLOW) {
RelationshipVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(RelationshipVM.class); RelationshipVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(RelationshipVM.class);
viewModel.get(target).observe(ShowAccountActivity.this, this::manageVIewRelationship); List<String> uris = new ArrayList<>();
} else if (statusAction == PeertubeAPI.StatusAction.MUTE) { uris.add(target);
Toasty.info(ShowAccountActivity.this, getString(R.string.muted_done), Toast.LENGTH_LONG).show(); viewModel.get(uris).observe(ShowChannelActivity.this, this::manageVIewRelationship);
} else if (statusAction == RetrofitPeertubeAPI.ActionType.MUTE) {
Toasty.info(ShowChannelActivity.this, getString(R.string.muted_done), Toast.LENGTH_LONG).show();
} }
} }
public void manageViewAccounts(APIResponse apiResponse) { public void manageViewAccounts(APIResponse apiResponse) {
if (apiResponse.getAccounts() != null && apiResponse.getAccounts().size() == 1) { if (apiResponse.getChannels() != null && apiResponse.getChannels().size() == 1) {
Account account = apiResponse.getAccounts().get(0); Channel channel = apiResponse.getChannels().get(0);
if (this.account == null) { if (this.channel == null) {
this.account = account; this.channel = channel;
manageAccount(); manageChannel();
} }
if (account.getchannelOwner() != null) { if (channel.getOwnerAccount() != null) {
this.account.setchannelOwner(account.getchannelOwner()); this.channel.setOwnerAccount(channel.getOwnerAccount());
} }
subscriber_count.setText(getString(R.string.followers_count, Helper.withSuffix(account.getFollowers_count()))); subscriber_count.setText(getString(R.string.followers_count, Helper.withSuffix(channel.getFollowersCount())));
subscriber_count.setVisibility(View.VISIBLE); subscriber_count.setVisibility(View.VISIBLE);
manageNotes(account); manageNotes(channel);
} }
} }
private void manageNotes(Account account) { private void manageNotes(Channel channel) {
if (account.getNote() != null && account.getNote().compareTo("null") != 0 && account.getNote().trim().length() > 0) { if (channel.getDescription() != null && channel.getDescription().compareTo("null") != 0 && channel.getDescription().trim().length() > 0) {
SpannableString spannableString; SpannableString spannableString;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
spannableString = new SpannableString(Html.fromHtml(account.getNote(), FROM_HTML_MODE_LEGACY)); spannableString = new SpannableString(Html.fromHtml(channel.getDescription(), FROM_HTML_MODE_LEGACY));
else else
spannableString = new SpannableString(Html.fromHtml(account.getNote())); spannableString = new SpannableString(Html.fromHtml(channel.getDescription()));
account.setNoteSpan(spannableString); account_note.setText(spannableString, TextView.BufferType.SPANNABLE);
account_note.setText(account.getNoteSpan(), TextView.BufferType.SPANNABLE);
account_note.setMovementMethod(LinkMovementMethod.getInstance()); account_note.setMovementMethod(LinkMovementMethod.getInstance());
account_note.setVisibility(View.VISIBLE); account_note.setVisibility(View.VISIBLE);
} else { } else {
@ -435,16 +418,15 @@ public class ShowAccountActivity extends AppCompatActivity {
if (position == 0) { if (position == 0) {
DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment(); DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
bundle = new Bundle(); bundle = new Bundle();
bundle.putSerializable("type", TimelineVM.Type.USER); bundle.putSerializable("type", TimelineVM.TimelineType.USER_VIDEOS);
bundle.putString("targetedid", account.getAcct()); bundle.putString("channelId", channel.getAcct());
bundle.putBoolean("ischannel", ischannel);
displayVideosFragment.setArguments(bundle); displayVideosFragment.setArguments(bundle);
return displayVideosFragment; return displayVideosFragment;
} }
DisplayAccountsFragment displayAccountsFragment = new DisplayAccountsFragment(); DisplayAccountsFragment displayAccountsFragment = new DisplayAccountsFragment();
bundle.putString("targetedid", account.getId()); bundle.putString("targetedid", channel.getId());
bundle.putString("instance", getLiveInstance(ShowAccountActivity.this)); bundle.putString("instance", getLiveInstance(ShowChannelActivity.this));
bundle.putString("name", account.getAcct()); bundle.putString("name", channel.getAcct());
displayAccountsFragment.setArguments(bundle); displayAccountsFragment.setArguments(bundle);
return displayAccountsFragment; return displayAccountsFragment;
} }
@ -452,10 +434,7 @@ public class ShowAccountActivity extends AppCompatActivity {
@Override @Override
public int getCount() { public int getCount() {
if (ischannel)
return 1; return 1;
else
return 2;
} }
} }

40
app/src/main/java/app/fedilab/fedilabtube/WebviewConnectActivity.java
View File

@ -28,18 +28,16 @@ import android.widget.ProgressBar;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import org.json.JSONObject;
import java.net.URL; import java.net.URL;
import java.util.HashMap;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import app.fedilab.fedilabtube.client.HttpsConnection; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.entities.OauthParams;
import app.fedilab.fedilabtube.client.entities.RefreshToken;
import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.helper.Helper;
import app.fedilab.fedilabtube.webview.CustomWebview; import app.fedilab.fedilabtube.webview.CustomWebview;
import static app.fedilab.fedilabtube.client.HttpsConnection.updateCredential; import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.updateCredential;
public class WebviewConnectActivity extends AppCompatActivity { public class WebviewConnectActivity extends AppCompatActivity {
@ -118,24 +116,20 @@ public class WebviewConnectActivity extends AppCompatActivity {
String username = matcher.group(2); String username = matcher.group(2);
new Thread(() -> { new Thread(() -> {
try { try {
String newUrl = "https://" + new URL(url).getHost() + "/api/v1/users/token"; OauthParams oauthParams = new OauthParams();
HashMap<String, String> params = new HashMap<>(); oauthParams.setClient_id(sharedpreferences.getString(Helper.CLIENT_ID, null));
clientId = sharedpreferences.getString(Helper.CLIENT_ID, "null"); oauthParams.setClient_secret(sharedpreferences.getString(Helper.CLIENT_SECRET, null));
clientSecret = sharedpreferences.getString(Helper.CLIENT_SECRET, "null"); oauthParams.setGrant_type("password");
params.put("client_id", clientId); oauthParams.setUsername(username);
params.put("client_secret", clientSecret); oauthParams.setExternalAuthToken(externalAuthToken);
params.put("username", username); String instance = new URL(url).getHost();
params.put("grant_type", "password"); RefreshToken refreshToken = new RetrofitPeertubeAPI(WebviewConnectActivity.this, instance, null).manageToken(oauthParams);
params.put("externalAuthToken", externalAuthToken);
String response = new HttpsConnection(WebviewConnectActivity.this).post(newUrl, 30, params, null);
JSONObject jsonObject = new JSONObject(response);
String token = jsonObject.getString("access_token");
String refresh_token = jsonObject.getString("refresh_token");
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token); editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, refreshToken.getAccess_token());
editor.putString(Helper.PREF_INSTANCE, new URL(url).getHost()); editor.putString(Helper.PREF_INSTANCE, instance);
editor.apply(); editor.apply();
updateCredential(WebviewConnectActivity.this, token, clientId, clientSecret, refresh_token, new URL(url).getHost()); updateCredential(WebviewConnectActivity.this, refreshToken.getAccess_token(), clientId, clientSecret, refreshToken.getRefresh_token(), new URL(url).getHost());
finish(); finish();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -144,8 +138,6 @@ public class WebviewConnectActivity extends AppCompatActivity {
} }
super.onPageFinished(view, url); super.onPageFinished(view, url);
} }
}); });
webView.loadUrl(url); webView.loadUrl(url);

704
app/src/main/java/app/fedilab/fedilabtube/client/HttpsConnection.java
View File

@ -1,704 +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 android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.text.Html;
import android.text.SpannableString;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.PasswordAuthentication;
import java.net.Proxy;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.net.ssl.HttpsURLConnection;
import app.fedilab.fedilabtube.MainActivity;
import app.fedilab.fedilabtube.R;
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;
@SuppressWarnings({"unused", "RedundantSuppression"})
public class HttpsConnection {
private static final String LINE_FEED = "\r\n";
private HttpsURLConnection httpsURLConnection;
private String since_id, max_id;
private Context context;
private int CHUNK_SIZE = 4096;
private Proxy proxy;
public HttpsConnection(Context context) {
this.context = context;
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean proxyEnabled = sharedpreferences.getBoolean(Helper.SET_PROXY_ENABLED, false);
int type = sharedpreferences.getInt(Helper.SET_PROXY_TYPE, 0);
proxy = null;
if (proxyEnabled) {
try {
String host = sharedpreferences.getString(Helper.SET_PROXY_HOST, "127.0.0.1");
int port = sharedpreferences.getInt(Helper.SET_PROXY_PORT, 8118);
if (type == 0)
proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
else
proxy = new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(host, port));
final String login = sharedpreferences.getString(Helper.SET_PROXY_LOGIN, null);
final String pwd = sharedpreferences.getString(Helper.SET_PROXY_PASSWORD, null);
if (login != null) {
Authenticator authenticator = new Authenticator() {
public PasswordAuthentication getPasswordAuthentication() {
assert pwd != null;
return (new PasswordAuthentication(login,
pwd.toCharArray()));
}
};
Authenticator.setDefault(authenticator);
}
} catch (Exception e) {
proxy = null;
}
}
}
/**
* Update user credentials
*
* @param _mContext Context
* @param token String
* @param client_id String
* @param client_secret String
* @param refresh_token String
* @param host String
*/
public static void updateCredential(Context _mContext, String token, String client_id, String client_secret, String refresh_token, String host) {
new Thread(() -> {
Account account;
String instance;
if (host.startsWith("tube")) {
instance = host;
} else {
instance = Helper.getPeertubeUrl(host);
}
account = new PeertubeAPI(_mContext).verifyCredentials(token, instance);
if (account == null)
return;
try {
//At the state the instance can be encoded
instance = URLDecoder.decode(instance, "utf-8");
} catch (UnsupportedEncodingException ignored) {
}
SharedPreferences sharedpreferences = _mContext.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
account.setToken(token);
account.setClient_id(client_id);
account.setClient_secret(client_secret);
account.setRefresh_token(refresh_token);
account.setInstance(instance);
SQLiteDatabase db = Sqlite.getInstance(_mContext.getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
boolean userExists = new AccountDAO(_mContext, db).userExist(account);
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.PREF_KEY_ID, account.getId());
editor.putBoolean(Helper.PREF_IS_MODERATOR, account.isModerator());
editor.putBoolean(Helper.PREF_IS_ADMINISTRATOR, account.isAdmin());
if (!host.startsWith("tube")) {
editor.putString(Helper.PREF_INSTANCE, host);
}
editor.apply();
if (userExists)
new AccountDAO(_mContext, db).updateAccountCredential(account);
else {
if (account.getUsername() != null && account.getCreated_at() != null)
new AccountDAO(_mContext, db).insertAccount(account);
}
Handler mainHandler = new Handler(Looper.getMainLooper());
Runnable myRunnable = () -> {
Intent mainActivity = new Intent(_mContext, MainActivity.class);
mainActivity.putExtra(Helper.INTENT_ACTION, Helper.ADD_USER_INTENT);
_mContext.startActivity(mainActivity);
((Activity) _mContext).finish();
};
mainHandler.post(myRunnable);
}).start();
}
/**
* Get calls
*
* @param urlConnection String url
* @param timeout int timeout
* @param paramaters HashMap<String, String> paramaters
* @param token String token
* @return String
* @throws IOException IOException
* @throws NoSuchAlgorithmException NoSuchAlgorithmException
* @throws KeyManagementException KeyManagementException
* @throws HttpsConnectionException HttpsConnectionException
*/
public String get(String urlConnection, int timeout, HashMap<String, String> paramaters, String token) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
Map<String, Object> params = new LinkedHashMap<>();
if (paramaters != null) {
Iterator<Map.Entry<String, String>> it = paramaters.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, String> pair = it.next();
params.put(pair.getKey(), pair.getValue());
it.remove();
}
}
StringBuilder postData = new StringBuilder();
URL url;
if (params.size() > 0) {
for (Map.Entry<String, Object> param : params.entrySet()) {
if (postData.length() != 0) postData.append('&');
postData.append(param.getKey());
postData.append('=');
postData.append(param.getValue());
}
url = new URL(urlConnection + "?" + postData);
} else {
url = new URL(urlConnection);
}
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
else
httpsURLConnection = (HttpsURLConnection) url.openConnection();
httpsURLConnection.setConnectTimeout(timeout * 1000);
httpsURLConnection.setRequestProperty("http.keepAlive", "false");
httpsURLConnection.setRequestProperty("Content-Type", "application/json");
httpsURLConnection.setRequestProperty("Accept", "application/json");
httpsURLConnection.setUseCaches(true);
httpsURLConnection.setDefaultUseCaches(true);
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
if (token != null)
httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
httpsURLConnection.setRequestMethod("GET");
String response;
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
response = converToString(httpsURLConnection.getInputStream());
} else {
String error = null;
if (httpsURLConnection.getErrorStream() != null) {
InputStream stream = httpsURLConnection.getErrorStream();
if (stream == null) {
stream = httpsURLConnection.getInputStream();
}
try (Scanner scanner = new Scanner(stream)) {
scanner.useDelimiter("\\Z");
if (scanner.hasNext()) {
error = scanner.next();
}
} catch (Exception e) {
e.printStackTrace();
}
}
int responseCode = httpsURLConnection.getResponseCode();
try {
httpsURLConnection.getInputStream().close();
} catch (Exception ignored) {
}
throw new HttpsConnectionException(responseCode, error);
}
getSinceMaxId();
httpsURLConnection.getInputStream().close();
return response;
}
public String get(String urlConnection) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
URL url = new URL(urlConnection);
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
else
httpsURLConnection = (HttpsURLConnection) url.openConnection();
httpsURLConnection.setConnectTimeout(30 * 1000);
httpsURLConnection.setRequestProperty("http.keepAlive", "false");
httpsURLConnection.setRequestProperty("Content-Type", "application/json");
httpsURLConnection.setRequestProperty("Accept", "application/json");
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
httpsURLConnection.setRequestMethod("GET");
httpsURLConnection.setDefaultUseCaches(true);
httpsURLConnection.setUseCaches(true);
String response;
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
getSinceMaxId();
response = converToString(httpsURLConnection.getInputStream());
} else {
String error = null;
if (httpsURLConnection.getErrorStream() != null) {
InputStream stream = httpsURLConnection.getErrorStream();
if (stream == null) {
stream = httpsURLConnection.getInputStream();
}
try (Scanner scanner = new Scanner(stream)) {
scanner.useDelimiter("\\Z");
if (scanner.hasNext()) {
error = scanner.next();
}
} catch (Exception e) {
e.printStackTrace();
}
}
int responseCode = httpsURLConnection.getResponseCode();
try {
httpsURLConnection.getInputStream().close();
} catch (Exception ignored) {
}
throw new HttpsConnectionException(responseCode, error);
}
getSinceMaxId();
httpsURLConnection.getInputStream().close();
return response;
}
public String postBoundary(boundaryType type, String urlConnection, int timeout, LinkedHashMap<String, String> paramaters, String token) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
URL url = new URL(urlConnection);
String boundary = "----TubeLabBoundary" + System.currentTimeMillis();
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
else
httpsURLConnection = (HttpsURLConnection) url.openConnection();
httpsURLConnection.setConnectTimeout(timeout * 1000);
httpsURLConnection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
httpsURLConnection.setDoOutput(true);
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
if (type == boundaryType.POST) {
httpsURLConnection.setRequestMethod("POST");
} else if (type == boundaryType.PUT) {
httpsURLConnection.setRequestMethod("PUT");
}
if (token != null)
httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
StringBuilder postData = new StringBuilder();
if (paramaters != null) {
Iterator<Map.Entry<String, String>> it = paramaters.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, String> pair = it.next();
postData = addFormField(postData, pair.getKey(), pair.getValue(), boundary);
it.remove();
}
postData.append("--").append(boundary).append("--");
}
byte[] postDataBytes = postData.toString().getBytes(StandardCharsets.UTF_8);
httpsURLConnection.setRequestProperty("Content-Length", String.valueOf(postDataBytes.length));
OutputStream outputStream = httpsURLConnection.getOutputStream();
outputStream.write(postDataBytes);
String response;
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
getSinceMaxId();
response = converToString(httpsURLConnection.getInputStream());
} else {
String error = null;
if (httpsURLConnection.getErrorStream() != null) {
InputStream stream = httpsURLConnection.getErrorStream();
if (stream == null) {
stream = httpsURLConnection.getInputStream();
}
try (Scanner scanner = new Scanner(stream)) {
scanner.useDelimiter("\\Z");
if (scanner.hasNext()) {
error = scanner.next();
}
} catch (Exception e) {
e.printStackTrace();
}
}
int responseCode = httpsURLConnection.getResponseCode();
try {
httpsURLConnection.getInputStream().close();
} catch (Exception ignored) {
}
throw new HttpsConnectionException(responseCode, error);
}
getSinceMaxId();
httpsURLConnection.getInputStream().close();
return response;
}
/**
* Adds a form field to the request
*
* @param writer StringBuilder
* @param name field name
* @param value field value
*/
private StringBuilder addFormField(StringBuilder writer, String name, String value, String boundary) {
if (writer != null) {
writer.append("--").append(boundary).append(LINE_FEED);
writer.append("Content-Disposition: form-data; name=\"").append(name).append("\"")
.append(LINE_FEED);
writer.append("Content-Type: text/plain; charset=").append(StandardCharsets.UTF_8).append(
LINE_FEED);
writer.append(LINE_FEED);
writer.append(value).append(LINE_FEED);
}
return writer;
}
public String post(String urlConnection, int timeout, HashMap<String, String> paramaters, String token) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
URL url = new URL(urlConnection);
Map<String, Object> params = new LinkedHashMap<>();
if (paramaters != null) {
Iterator<Map.Entry<String, String>> it = paramaters.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, String> pair = it.next();
params.put(pair.getKey(), pair.getValue());
it.remove();
}
}
StringBuilder postData = new StringBuilder();
for (Map.Entry<String, Object> param : params.entrySet()) {
if (postData.length() != 0) postData.append('&');
postData.append(param.getKey());
postData.append('=');
postData.append(param.getValue());
}
byte[] postDataBytes = postData.toString().getBytes(StandardCharsets.UTF_8);
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
else
httpsURLConnection = (HttpsURLConnection) url.openConnection();
httpsURLConnection.setConnectTimeout(timeout * 1000);
httpsURLConnection.setDoOutput(true);
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
httpsURLConnection.setRequestMethod("POST");
if (token != null)
httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
httpsURLConnection.setRequestProperty("Content-Length", String.valueOf(postDataBytes.length));
httpsURLConnection.getOutputStream().write(postDataBytes);
String response;
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
getSinceMaxId();
response = converToString(httpsURLConnection.getInputStream());
} else {
String error = null;
if (httpsURLConnection.getErrorStream() != null) {
InputStream stream = httpsURLConnection.getErrorStream();
if (stream == null) {
stream = httpsURLConnection.getInputStream();
}
try (Scanner scanner = new Scanner(stream)) {
scanner.useDelimiter("\\Z");
if (scanner.hasNext()) {
error = scanner.next();
}
} catch (Exception e) {
e.printStackTrace();
}
}
int responseCode = httpsURLConnection.getResponseCode();
try {
httpsURLConnection.getInputStream().close();
} catch (Exception ignored) {
}
throw new HttpsConnectionException(responseCode, error);
}
getSinceMaxId();
httpsURLConnection.getInputStream().close();
return response;
}
public InputStream getPicture(final String downloadUrl) {
URL url;
try {
url = new URL(downloadUrl);
} catch (MalformedURLException e) {
return null;
}
try {
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
else
httpsURLConnection = (HttpsURLConnection) url.openConnection();
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
int responseCode = httpsURLConnection.getResponseCode();
// always check HTTP response code first
if (responseCode == HttpURLConnection.HTTP_OK) {
// opens input stream from the HTTP connection
return httpsURLConnection.getInputStream();
}
httpsURLConnection.getInputStream().close();
} catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) {
}
if (httpsURLConnection != null)
try {
httpsURLConnection.getInputStream().close();
} catch (Exception ignored) {
}
return null;
}
public String put(String urlConnection, int timeout, HashMap<String, String> paramaters, String token) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
URL url = new URL(urlConnection);
Map<String, Object> params = new LinkedHashMap<>();
if (paramaters != null) {
Iterator<Map.Entry<String, String>> it = paramaters.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, String> pair = it.next();
params.put(pair.getKey(), pair.getValue());
it.remove();
}
}
StringBuilder postData = new StringBuilder();
for (Map.Entry<String, Object> param : params.entrySet()) {
if (postData.length() != 0) postData.append('&');
postData.append(param.getKey());
postData.append('=');
postData.append(param.getValue());
}
byte[] postDataBytes = postData.toString().getBytes(StandardCharsets.UTF_8);
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
else
httpsURLConnection = (HttpsURLConnection) url.openConnection();
httpsURLConnection.setConnectTimeout(timeout * 1000);
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
if (token != null)
httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
httpsURLConnection.setRequestProperty("Content-Length", String.valueOf(postDataBytes.length));
httpsURLConnection.setRequestMethod("PUT");
httpsURLConnection.setDoInput(true);
httpsURLConnection.setDoOutput(true);
httpsURLConnection.getOutputStream().write(postDataBytes);
String response;
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
getSinceMaxId();
response = converToString(httpsURLConnection.getInputStream());
} else {
String error = null;
if (httpsURLConnection.getErrorStream() != null) {
InputStream stream = httpsURLConnection.getErrorStream();
if (stream == null) {
stream = httpsURLConnection.getInputStream();
}
try (Scanner scanner = new Scanner(stream)) {
scanner.useDelimiter("\\Z");
if (scanner.hasNext()) {
error = scanner.next();
}
} catch (Exception e) {
e.printStackTrace();
}
}
int responseCode = httpsURLConnection.getResponseCode();
try {
httpsURLConnection.getInputStream().close();
} catch (Exception ignored) {
}
throw new HttpsConnectionException(responseCode, error);
}
getSinceMaxId();
httpsURLConnection.getInputStream().close();
return response;
}
public void delete(String urlConnection, int timeout, HashMap<String, String> paramaters, String token) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
URL url = new URL(urlConnection);
Map<String, Object> params = new LinkedHashMap<>();
if (paramaters != null) {
Iterator<Map.Entry<String, String>> it = paramaters.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, String> pair = it.next();
params.put(pair.getKey(), pair.getValue());
it.remove();
}
}
StringBuilder postData = new StringBuilder();
for (Map.Entry<String, Object> param : params.entrySet()) {
if (postData.length() != 0) postData.append('&');
postData.append(param.getKey());
postData.append('=');
postData.append(param.getValue());
}
byte[] postDataBytes = postData.toString().getBytes(StandardCharsets.UTF_8);
if (proxy != null)
httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
else
httpsURLConnection = (HttpsURLConnection) url.openConnection();
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
if (token != null)
httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
httpsURLConnection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
httpsURLConnection.setRequestMethod("DELETE");
httpsURLConnection.setConnectTimeout(timeout * 1000);
httpsURLConnection.setRequestProperty("Content-Length", String.valueOf(postDataBytes.length));
httpsURLConnection.getOutputStream().write(postDataBytes);
if (httpsURLConnection.getResponseCode() >= 200 && httpsURLConnection.getResponseCode() < 400) {
getSinceMaxId();
httpsURLConnection.getInputStream().close();
httpsURLConnection.getResponseCode();
} else {
String error = null;
if (httpsURLConnection.getErrorStream() != null) {
InputStream stream = httpsURLConnection.getErrorStream();
if (stream == null) {
stream = httpsURLConnection.getInputStream();
}
try (Scanner scanner = new Scanner(stream)) {
scanner.useDelimiter("\\Z");
if (scanner.hasNext()) {
error = scanner.next();
}
} catch (Exception e) {
e.printStackTrace();
}
}
int responseCode = httpsURLConnection.getResponseCode();
try {
httpsURLConnection.getInputStream().close();
} catch (Exception ignored) {
}
throw new HttpsConnectionException(responseCode, error);
}
}
public String getSince_id() {
return since_id;
}
public String getMax_id() {
return max_id;
}
private void getSinceMaxId() {
if (httpsURLConnection == null)
return;
Map<String, List<String>> map = httpsURLConnection.getHeaderFields();
for (Map.Entry<String, List<String>> entry : map.entrySet()) {
if (entry.toString().startsWith("Link") || entry.toString().startsWith("link")) {
Pattern patternMaxId = Pattern.compile("max_id=([0-9a-zA-Z]+).*");
Matcher matcherMaxId = patternMaxId.matcher(entry.toString());
if (matcherMaxId.find()) {
max_id = matcherMaxId.group(1);
}
if (entry.toString().startsWith("Link")) {
Pattern patternSinceId = Pattern.compile("since_id=([0-9a-zA-Z]+).*");
Matcher matcherSinceId = patternSinceId.matcher(entry.toString());
if (matcherSinceId.find()) {
since_id = matcherSinceId.group(1);
}
}
} else if (entry.toString().startsWith("Min-Id") || entry.toString().startsWith("min-id")) {
Pattern patternMaxId = Pattern.compile("min-id=\\[([0-9a-zA-Z]+).*]");
Matcher matcherMaxId = patternMaxId.matcher(entry.toString());
if (matcherMaxId.find()) {
max_id = matcherMaxId.group(1);
}
}
}
}
private String converToString(InputStream inputStream) {
Scanner s = new Scanner(inputStream).useDelimiter("\\A");
return s.hasNext() ? s.next() : "";
}
int getActionCode() {
try {
return httpsURLConnection.getResponseCode();
} catch (IOException e) {
return -1;
}
}
public enum boundaryType {
POST,
PUT
}
public class HttpsConnectionException extends Exception {
private int statusCode;
private String message;
HttpsConnectionException(int statusCode, String message) {
this.statusCode = statusCode;
SpannableString spannableString;
if (message != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
spannableString = new SpannableString(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY));
else
spannableString = new SpannableString(Html.fromHtml(message));
} else {
spannableString = new SpannableString(context.getString(R.string.toast_error));
}
this.message = spannableString.toString();
}
public int getStatusCode() {
return statusCode;
}
@Override
public String getMessage() {
return message;
}
}
}

18
app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java
View File

@ -27,6 +27,8 @@ import app.fedilab.fedilabtube.client.data.PlaylistData;
import app.fedilab.fedilabtube.client.data.VideoData; import app.fedilab.fedilabtube.client.data.VideoData;
import app.fedilab.fedilabtube.client.entities.CaptionsParams; import app.fedilab.fedilabtube.client.entities.CaptionsParams;
import app.fedilab.fedilabtube.client.entities.ChannelParams; import app.fedilab.fedilabtube.client.entities.ChannelParams;
import app.fedilab.fedilabtube.client.entities.Oauth;
import app.fedilab.fedilabtube.client.entities.OauthParams;
import app.fedilab.fedilabtube.client.entities.OverviewVideo; import app.fedilab.fedilabtube.client.entities.OverviewVideo;
import app.fedilab.fedilabtube.client.entities.PlaylistExist; import app.fedilab.fedilabtube.client.entities.PlaylistExist;
import app.fedilab.fedilabtube.client.entities.PlaylistParams; import app.fedilab.fedilabtube.client.entities.PlaylistParams;
@ -34,6 +36,7 @@ import app.fedilab.fedilabtube.client.entities.Rating;
import app.fedilab.fedilabtube.client.entities.RefreshToken; import app.fedilab.fedilabtube.client.entities.RefreshToken;
import app.fedilab.fedilabtube.client.entities.Report; import app.fedilab.fedilabtube.client.entities.Report;
import app.fedilab.fedilabtube.client.entities.VideoParams; import app.fedilab.fedilabtube.client.entities.VideoParams;
import app.fedilab.fedilabtube.client.entities.WellKnownNodeinfo;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.Body; import retrofit2.http.Body;
@ -53,6 +56,15 @@ public interface PeertubeService {
Call<InstanceData> getInstances(@QueryMap Map<String, String> params, @Query("nsfwPolicy[]") String nsfwPolicy, @Query("categoriesOr[]") List<Integer> categories, @Query("languagesOr[]") List<String> languages); Call<InstanceData> getInstances(@QueryMap Map<String, String> params, @Query("nsfwPolicy[]") String nsfwPolicy, @Query("categoriesOr[]") List<Integer> categories, @Query("languagesOr[]") List<String> languages);
//Server settings //Server settings
@GET(".well-known/nodeinfo")
Call<WellKnownNodeinfo> getWellKnownNodeinfo();
@GET("{nodeInfoPath}")
Call<WellKnownNodeinfo.NodeInfo> getNodeinfo(@Path("nodeInfoPath") String nodeInfoPath);
@GET("{captionContent}")
Call<String> getCaptionContent(@Path("captionContent") String captionContent);
@GET("videos/categories") @GET("videos/categories")
Call<Map<Integer, String>> getCategories(); Call<Map<Integer, String>> getCategories();
@ -75,7 +87,7 @@ public interface PeertubeService {
//TOKEN //TOKEN
//Refresh //Refresh
@POST("users/token") @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); Call<RefreshToken> manageToken(@Body OauthParams oauthParams);
@GET("users/me") @GET("users/me")
Call<AccountData.Account> verifyCredentials(@Header("Authorization") String credentials); Call<AccountData.Account> verifyCredentials(@Header("Authorization") String credentials);
@ -138,6 +150,10 @@ public interface PeertubeService {
Call<String> deleteVideo(@Header("Authorization") String credentials, @Path("id") String videoId); Call<String> deleteVideo(@Header("Authorization") String credentials, @Path("id") String videoId);
@GET("oauth-clients/local")
Call<Oauth> getOauth();
//Post/Update/Delete channel //Post/Update/Delete channel
//Channels for account //Channels for account
@GET("accounts/{accountId}/video-channels") @GET("accounts/{accountId}/video-channels")

195
app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java
View File

@ -14,11 +14,18 @@ package app.fedilab.fedilabtube.client;
* You should have received a copy of the GNU General Public License along with TubeLab; if not, * You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Handler;
import android.os.Looper;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@ -26,6 +33,7 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import app.fedilab.fedilabtube.MainActivity;
import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.client.data.AccountData; import app.fedilab.fedilabtube.client.data.AccountData;
import app.fedilab.fedilabtube.client.data.CaptionData; import app.fedilab.fedilabtube.client.data.CaptionData;
@ -39,6 +47,8 @@ import app.fedilab.fedilabtube.client.entities.AccountCreation;
import app.fedilab.fedilabtube.client.entities.ChannelParams; import app.fedilab.fedilabtube.client.entities.ChannelParams;
import app.fedilab.fedilabtube.client.entities.Error; import app.fedilab.fedilabtube.client.entities.Error;
import app.fedilab.fedilabtube.client.entities.InstanceParams; import app.fedilab.fedilabtube.client.entities.InstanceParams;
import app.fedilab.fedilabtube.client.entities.Oauth;
import app.fedilab.fedilabtube.client.entities.OauthParams;
import app.fedilab.fedilabtube.client.entities.OverviewVideo; import app.fedilab.fedilabtube.client.entities.OverviewVideo;
import app.fedilab.fedilabtube.client.entities.PeertubeInformation; import app.fedilab.fedilabtube.client.entities.PeertubeInformation;
import app.fedilab.fedilabtube.client.entities.PlaylistParams; import app.fedilab.fedilabtube.client.entities.PlaylistParams;
@ -46,7 +56,10 @@ import app.fedilab.fedilabtube.client.entities.Rating;
import app.fedilab.fedilabtube.client.entities.RefreshToken; import app.fedilab.fedilabtube.client.entities.RefreshToken;
import app.fedilab.fedilabtube.client.entities.Report; import app.fedilab.fedilabtube.client.entities.Report;
import app.fedilab.fedilabtube.client.entities.VideoParams; import app.fedilab.fedilabtube.client.entities.VideoParams;
import app.fedilab.fedilabtube.client.entities.WellKnownNodeinfo;
import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.helper.Helper;
import app.fedilab.fedilabtube.sqlite.AccountDAO;
import app.fedilab.fedilabtube.sqlite.Sqlite;
import app.fedilab.fedilabtube.viewmodel.ChannelsVM; import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
import app.fedilab.fedilabtube.viewmodel.CommentVM; import app.fedilab.fedilabtube.viewmodel.CommentVM;
import app.fedilab.fedilabtube.viewmodel.PlaylistsVM; import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
@ -104,9 +117,9 @@ public class RetrofitPeertubeAPI {
* Verifiy credential of the authenticated user *synchronously* * Verifiy credential of the authenticated user *synchronously*
* @return Account * @return Account
*/ */
public RefreshToken refreshToken(String client_id, String client_secret, String refresh_token) { public RefreshToken manageToken(OauthParams oauthParams) {
PeertubeService peertubeService = init(); PeertubeService peertubeService = init();
Call<RefreshToken> refreshTokenCall = peertubeService.refreshToken("refresh_token", client_id, client_secret, refresh_token); Call<RefreshToken> refreshTokenCall = peertubeService.manageToken(oauthParams);
try { try {
Response<RefreshToken> response = refreshTokenCall.execute(); Response<RefreshToken> response = refreshTokenCall.execute();
if (response.isSuccessful()) { if (response.isSuccessful()) {
@ -160,6 +173,78 @@ public class RetrofitPeertubeAPI {
return apiResponse; return apiResponse;
} }
/**
* Get caption content
* @param path String path to caption
* @return APIResponse
*/
public APIResponse getCaptionContent(String path) {
APIResponse apiResponse = new APIResponse();
PeertubeService peertubeService = init();
Call<String> captionContentCall = peertubeService.getCaptionContent(path);
try {
Response<String> response = captionContentCall.execute();
if (response.isSuccessful()) {
apiResponse.setCaptionText(response.body());
} else {
Error error = new Error();
error.setStatusCode(response.code());
if (response.errorBody() != null) {
error.setError(response.message());
} else {
error.setError(_context.getString(R.string.toast_error));
}
apiResponse.setError(error);
}
} catch (IOException e) {
Error error = new Error();
error.setError(_context.getString(R.string.toast_error));
apiResponse.setError(error);
e.printStackTrace();
}
return apiResponse;
}
/**
* Get videos in a channel
* @param channelId String id of the channel
* @param max_id String pagination
* @return APIResponse
*/
public APIResponse getVideosForChannel(String channelId, String max_id) {
APIResponse apiResponse = new APIResponse();
PeertubeService peertubeService = init();
Call<List<VideoData.Video>> videoCall = peertubeService.getChannelVideos(channelId, max_id);
if (videoCall != null) {
try {
Response<List<VideoData.Video>> response = videoCall.execute();
if (response.isSuccessful()) {
apiResponse.setPeertubes(response.body());
} else {
Error error = new Error();
error.setStatusCode(response.code());
if (response.errorBody() != null) {
error.setError(response.message());
} else {
error.setError(_context.getString(R.string.toast_error));
}
apiResponse.setError(error);
}
} catch (IOException e) {
Error error = new Error();
error.setError(_context.getString(R.string.toast_error));
apiResponse.setError(error);
e.printStackTrace();
}
}
return apiResponse;
}
public APIResponse getTL(TimelineVM.TimelineType timelineType, String max_id) { public APIResponse getTL(TimelineVM.TimelineType timelineType, String max_id) {
APIResponse apiResponse = new APIResponse(); APIResponse apiResponse = new APIResponse();
PeertubeService peertubeService = init(); PeertubeService peertubeService = init();
@ -773,6 +858,52 @@ public class RetrofitPeertubeAPI {
} }
/**
* Get Oauth
* @return APIResponse
*/
public Oauth oauthClient() {
PeertubeService peertubeService = init();
try {
Call<Oauth> oauth = peertubeService.getOauth();
Response<Oauth> response = oauth.execute();
if( response.isSuccessful() && response.body() != null) {
return response.body();
}
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
/**
* Get NodeInfo
* @param instance String
* @return APIResponse
*/
public WellKnownNodeinfo.NodeInfo getNodeInfo(String instance) {
PeertubeService peertubeService = init();
try {
Call<WellKnownNodeinfo> wellKnownNodeinfoCall = peertubeService.getWellKnownNodeinfo();
Response<WellKnownNodeinfo> response = wellKnownNodeinfoCall.execute();
if( response.isSuccessful() && response.body() != null) {
if (response.body().getHref() != null) {
Call<WellKnownNodeinfo.NodeInfo> nodeinfo = peertubeService.getNodeinfo(response.body().getHref());
Response<WellKnownNodeinfo.NodeInfo> responseNodeInfo = nodeinfo.execute();
return responseNodeInfo.body();
}
}
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
/** /**
* Get channel data * Get channel data
* *
@ -1017,12 +1148,12 @@ public class RetrofitPeertubeAPI {
* @param text String text * @param text String text
* @return APIResponse * @return APIResponse
*/ */
public APIResponse commentAction(CommentVM.action type, String videoId, String toCommentId, String text) { public APIResponse commentAction(RetrofitPeertubeAPI.ActionType type, String videoId, String toCommentId, String text) {
PeertubeService peertubeService = init(); PeertubeService peertubeService = init();
APIResponse apiResponse = new APIResponse(); APIResponse apiResponse = new APIResponse();
try { try {
if (type == CommentVM.action.ADD_COMMENT) { if (type == ActionType.ADD_COMMENT) {
Call<String> stringCall = peertubeService.postComment(token, videoId, text); Call<String> stringCall = peertubeService.postComment(token, videoId, text);
Response<String> response = stringCall.execute(); Response<String> response = stringCall.execute();
if (response.isSuccessful()) { if (response.isSuccessful()) {
@ -1031,7 +1162,7 @@ public class RetrofitPeertubeAPI {
Error error = generateError(response.code(), response.message()); Error error = generateError(response.code(), response.message());
apiResponse.setError(error); apiResponse.setError(error);
} }
} else if (type == CommentVM.action.REPLY) { } else if (type == ActionType.REPLY) {
Call<String> stringCall = peertubeService.postReply(token, videoId, toCommentId, text); Call<String> stringCall = peertubeService.postReply(token, videoId, toCommentId, text);
Response<String> response = stringCall.execute(); Response<String> response = stringCall.execute();
if (response.isSuccessful()) { if (response.isSuccessful()) {
@ -1158,6 +1289,56 @@ public class RetrofitPeertubeAPI {
} }
public static void updateCredential(Context _mContext, String token, String client_id, String client_secret, String refresh_token, String host) {
new Thread(() -> {
AccountData.Account account;
String instance;
if (host.startsWith("tube")) {
instance = host;
} else {
instance = Helper.getPeertubeUrl(host);
}
account = new RetrofitPeertubeAPI(_mContext).verifyCredentials(token, instance);
if (account == null)
return;
try {
//At the state the instance can be encoded
instance = URLDecoder.decode(instance, "utf-8");
} catch (UnsupportedEncodingException ignored) {
}
SharedPreferences sharedpreferences = _mContext.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
account.setToken(token);
account.setClient_id(client_id);
account.setClient_secret(client_secret);
account.setRefresh_token(refresh_token);
account.setHost(instance);
SQLiteDatabase db = Sqlite.getInstance(_mContext.getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
boolean userExists = new AccountDAO(_mContext, db).userExist(account);
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.PREF_KEY_ID, account.getId());
if (!host.startsWith("tube")) {
editor.putString(Helper.PREF_INSTANCE, host);
}
editor.apply();
if (userExists)
new AccountDAO(_mContext, db).updateAccountCredential(account);
else {
if (account.getName() != null && account.getCreatedAt() != null)
new AccountDAO(_mContext, db).insertAccount(account);
}
Handler mainHandler = new Handler(Looper.getMainLooper());
Runnable myRunnable = () -> {
Intent mainActivity = new Intent(_mContext, MainActivity.class);
mainActivity.putExtra(Helper.INTENT_ACTION, Helper.ADD_USER_INTENT);
_mContext.startActivity(mainActivity);
((Activity) _mContext).finish();
};
mainHandler.post(myRunnable);
}).start();
}
public enum DataType { public enum DataType {
SUBSCRIBER, SUBSCRIBER,
@ -1178,7 +1359,9 @@ public class RetrofitPeertubeAPI {
PEERTUBEDELETEVIDEO, PEERTUBEDELETEVIDEO,
REPORT_VIDEO, REPORT_VIDEO,
REPORT_ACCOUNT, REPORT_ACCOUNT,
DELETE_CHANNEL DELETE_CHANNEL,
ADD_COMMENT,
REPLY,
} }

32
app/src/main/java/app/fedilab/fedilabtube/client/entities/NodeInfo.java → app/src/main/java/app/fedilab/fedilabtube/client/entities/Oauth.java
View File

@ -1,5 +1,4 @@
package app.fedilab.fedilabtube.client.entities; package app.fedilab.fedilabtube.client.entities;
/* Copyright 2020 Thomas Schneider /* Copyright 2020 Thomas Schneider
* *
* This file is a part of TubeLab * This file is a part of TubeLab
@ -14,24 +13,31 @@ package app.fedilab.fedilabtube.client.entities;
* *
* You should have received a copy of the GNU General Public License along with TubeLab; if not, * You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
@SuppressWarnings("unused")
public class NodeInfo {
private String rel;
private String href;
public String getRel() { import com.google.gson.annotations.SerializedName;
return rel;
public class Oauth {
@SerializedName("client_id")
private String client_id;
@SerializedName("client_secret")
private String client_secret;
public String getClient_id() {
return client_id;
} }
public void setRel(String rel) { public void setClient_id(String client_id) {
this.rel = rel; this.client_id = client_id;
} }
public String getHref() { public String getClient_secret() {
return href; return client_secret;
} }
public void setHref(String href) { public void setClient_secret(String client_secret) {
this.href = href; this.client_secret = client_secret;
} }
} }

102
app/src/main/java/app/fedilab/fedilabtube/client/entities/OauthParams.java Normal file
View File

@ -0,0 +1,102 @@
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 OauthParams {
@SerializedName("grant_type")
private String grant_type;
@SerializedName("client_secret")
private String client_secret;
@SerializedName("client_id")
private String client_id;
@SerializedName("username")
private String username;
@SerializedName("password")
private String password;
@SerializedName("scope")
private String scope = "user";
@SerializedName("externalAuthToken")
private String externalAuthToken;
@SerializedName("refresh_token")
private String refresh_token;
public String getClient_secret() {
return client_secret;
}
public void setClient_secret(String client_secret) {
this.client_secret = client_secret;
}
public String getClient_id() {
return client_id;
}
public void setClient_id(String client_id) {
this.client_id = client_id;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getScope() {
return scope;
}
public void setScope(String scope) {
this.scope = scope;
}
public String getGrant_type() {
return grant_type;
}
public void setGrant_type(String grant_type) {
this.grant_type = grant_type;
}
public String getExternalAuthToken() {
return externalAuthToken;
}
public void setExternalAuthToken(String externalAuthToken) {
this.externalAuthToken = externalAuthToken;
}
public String getRefresh_token() {
return refresh_token;
}
public void setRefresh_token(String refresh_token) {
this.refresh_token = refresh_token;
}
}

88
app/src/main/java/app/fedilab/fedilabtube/client/entities/WellKnownNodeinfo.java Normal file
View File

@ -0,0 +1,88 @@
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 WellKnownNodeinfo {
@SerializedName("reel")
private String reel;
@SerializedName("href")
private String href;
public String getReel() {
return reel;
}
public void setReel(String reel) {
this.reel = reel;
}
public String getHref() {
return href;
}
public void setHref(String href) {
this.href = href;
}
public static class NodeInfo {
@SerializedName("version")
private String version;
@SerializedName("software")
private Software software;
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public Software getSoftware() {
return software;
}
public void setSoftware(Software software) {
this.software = software;
}
}
public static class Software{
@SerializedName("name")
private String name;
@SerializedName("version")
private String version;
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;
}
}
}

9
app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java
View File

@ -40,7 +40,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.util.List; import java.util.List;
import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.ShowAccountActivity; import app.fedilab.fedilabtube.ShowChannelActivity;
import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.APIResponse;
import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.data.AccountData.Account; import app.fedilab.fedilabtube.client.data.AccountData.Account;
@ -107,12 +107,9 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
holder.account_pp.setOnClickListener(v -> { holder.account_pp.setOnClickListener(v -> {
Intent intent = new Intent(context, ShowAccountActivity.class); Intent intent = new Intent(context, ShowChannelActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putBoolean("peertubeaccount", true); b.putParcelable("channel", account);
b.putBoolean("ischannel", true);
b.putString("targetedid", account.getName());
b.putParcelable("account", account);
intent.putExtras(b); intent.putExtras(b);
context.startActivity(intent); context.startActivity(intent);
}); });

9
app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java
View File

@ -39,7 +39,7 @@ import java.util.List;
import app.fedilab.fedilabtube.AccountActivity; import app.fedilab.fedilabtube.AccountActivity;
import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.ShowAccountActivity; import app.fedilab.fedilabtube.ShowChannelActivity;
import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.data.ChannelData.Channel; import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.helper.Helper;
@ -131,12 +131,9 @@ public class ChannelListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
}); });
holder.account_pp.setOnClickListener(v -> { holder.account_pp.setOnClickListener(v -> {
Intent intent = new Intent(context, ShowAccountActivity.class); Intent intent = new Intent(context, ShowChannelActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putBoolean("peertubeaccount", true); b.putParcelable("channel", channel);
b.putBoolean("ischannel", true);
b.putString("targetedid", channel.getName());
b.putParcelable("account", channel);
intent.putExtras(b); intent.putExtras(b);
context.startActivity(intent); context.startActivity(intent);
}); });

9
app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
View File

@ -33,7 +33,7 @@ import java.util.List;
import app.fedilab.fedilabtube.PeertubeActivity; import app.fedilab.fedilabtube.PeertubeActivity;
import app.fedilab.fedilabtube.PeertubeEditUploadActivity; import app.fedilab.fedilabtube.PeertubeEditUploadActivity;
import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.ShowAccountActivity; import app.fedilab.fedilabtube.ShowChannelActivity;
import app.fedilab.fedilabtube.client.data.AccountData.Account; import app.fedilab.fedilabtube.client.data.AccountData.Account;
import app.fedilab.fedilabtube.client.data.VideoData; import app.fedilab.fedilabtube.client.data.VideoData;
import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.helper.Helper;
@ -88,13 +88,12 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
if (!ownVideos) { if (!ownVideos) {
holder.peertube_profile.setOnClickListener(v -> { holder.peertube_profile.setOnClickListener(v -> {
Intent intent = new Intent(context, ShowAccountActivity.class); Intent intent = new Intent(context, ShowChannelActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
if (peertube.getChannel() == null) { if (peertube.getChannel() == null) {
b.putParcelable("account", peertube.getAccount()); b.putParcelable("channel", peertube.getAccount());
} else { } else {
b.putParcelable("account", peertube.getChannel()); b.putParcelable("channel", peertube.getChannel());
b.putBoolean("ischannel", true);
} }
intent.putExtras(b); intent.putExtras(b);
context.startActivity(intent); context.startActivity(intent);

12
app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java
View File

@ -34,7 +34,7 @@ import java.util.List;
import app.fedilab.fedilabtube.LoginActivity; import app.fedilab.fedilabtube.LoginActivity;
import app.fedilab.fedilabtube.PeertubeActivity; import app.fedilab.fedilabtube.PeertubeActivity;
import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.ShowAccountActivity; import app.fedilab.fedilabtube.ShowChannelActivity;
import app.fedilab.fedilabtube.client.data.AccountData; import app.fedilab.fedilabtube.client.data.AccountData;
import app.fedilab.fedilabtube.client.data.NotificationData.Notification; import app.fedilab.fedilabtube.client.data.NotificationData.Notification;
import app.fedilab.fedilabtube.client.entities.Actor; import app.fedilab.fedilabtube.client.entities.Actor;
@ -84,10 +84,9 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
else else
holder.peertube_notif_message.setText(Html.fromHtml(message)); holder.peertube_notif_message.setText(Html.fromHtml(message));
holder.peertube_notif_pp.setOnClickListener(v -> { holder.peertube_notif_pp.setOnClickListener(v -> {
Intent intent = new Intent(context, ShowAccountActivity.class); Intent intent = new Intent(context, ShowChannelActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString("accountId", accountActionFollow.getName() + "@" + accountActionFollow.getHost()); b.putString("channelId", accountActionFollow.getName() + "@" + accountActionFollow.getHost());
b.putBoolean("ischannel", true);
intent.putExtras(b); intent.putExtras(b);
context.startActivity(intent); context.startActivity(intent);
}); });
@ -149,10 +148,9 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
AccountData.Account finalAccountAction = accountAction; AccountData.Account finalAccountAction = accountAction;
holder.peertube_notif_pp.setOnClickListener(v -> { holder.peertube_notif_pp.setOnClickListener(v -> {
if (finalAccountAction != null) { if (finalAccountAction != null) {
Intent intent = new Intent(context, ShowAccountActivity.class); Intent intent = new Intent(context, ShowChannelActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString("accountId", finalAccountAction.getName() + "@" + finalAccountAction.getHost()); b.putString("channelId", finalAccountAction.getName() + "@" + finalAccountAction.getHost());
b.putBoolean("ischannel", true);
intent.putExtras(b); intent.putExtras(b);
context.startActivity(intent); context.startActivity(intent);
} }

51
app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java
View File

@ -46,6 +46,7 @@ import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.APIResponse;
import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.data.AccountData.Account; import app.fedilab.fedilabtube.client.data.AccountData.Account;
import app.fedilab.fedilabtube.client.data.PlaylistData;
import app.fedilab.fedilabtube.client.data.VideoData; import app.fedilab.fedilabtube.client.data.VideoData;
import app.fedilab.fedilabtube.drawer.AccountsHorizontalListAdapter; import app.fedilab.fedilabtube.drawer.AccountsHorizontalListAdapter;
import app.fedilab.fedilabtube.drawer.PeertubeAdapter; import app.fedilab.fedilabtube.drawer.PeertubeAdapter;
@ -55,9 +56,6 @@ import app.fedilab.fedilabtube.viewmodel.TimelineVM;
import app.fedilab.fedilabtube.viewmodel.SearchVM; import app.fedilab.fedilabtube.viewmodel.SearchVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
import static app.fedilab.fedilabtube.viewmodel.TimelineVM.Type.POVERVIEW;
import static app.fedilab.fedilabtube.viewmodel.TimelineVM.Type.PSUBSCRIPTIONS;
public class DisplayVideosFragment extends Fragment implements AccountsHorizontalListAdapter.EventListener { public class DisplayVideosFragment extends Fragment implements AccountsHorizontalListAdapter.EventListener {
@ -71,23 +69,22 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
private String max_id, max_id_accounts; private String max_id, max_id_accounts;
private List<VideoData.Video> peertubes; private List<VideoData.Video> peertubes;
private List<Account> accounts; private List<Account> accounts;
private TimelineVM.Type type; private TimelineVM.TimelineType timelineType;
private RelativeLayout mainLoader, nextElementLoader, textviewNoAction; private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
private boolean firstLoad; private boolean firstLoad;
private SwipeRefreshLayout swipeRefreshLayout; private SwipeRefreshLayout swipeRefreshLayout;
private SharedPreferences sharedpreferences; private SharedPreferences sharedpreferences;
private String search_peertube; private String search_peertube;
private TextView textviewNoActionText; private TextView textviewNoActionText;
private boolean ischannel;
private View rootView; private View rootView;
private RecyclerView lv_status; private RecyclerView lv_status;
private String targetedId;
private boolean check_ScrollingUp; private boolean check_ScrollingUp;
private String forAccount; private String forAccount;
private ConstraintLayout top_account_container; private ConstraintLayout top_account_container;
private TimelineVM viewModelFeeds; private TimelineVM viewModelFeeds;
private SearchVM viewModelSearch; private SearchVM viewModelSearch;
private AccountsVM viewModelAccounts; private AccountsVM viewModelAccounts;
private String channelId;
public DisplayVideosFragment() { public DisplayVideosFragment() {
} }
@ -105,18 +102,12 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
if (bundle != null) { if (bundle != null) {
search_peertube = bundle.getString("search_peertube", null); search_peertube = bundle.getString("search_peertube", null);
targetedId = bundle.getString("targetedid", null); channelId = bundle.getString("channelId", null);
ischannel = bundle.getBoolean("ischannel", false); timelineType = (TimelineVM.TimelineType) bundle.get("timelineType");
type = (TimelineVM.Type) bundle.get("type");
} }
if (getArguments() != null && type == null) { if (getArguments() != null && timelineType == null) {
type = DisplayVideosFragment.fromBundle(getArguments()).getType(); timelineType = DisplayVideosFragment.fromBundle(getArguments()).getType();
}
if (ischannel) {
type = TimelineVM.Type.CHANNEL;
} }
forAccount = null; forAccount = null;
@ -166,7 +157,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
swipeRefreshLayout.setOnRefreshListener(this::pullToRefresh); swipeRefreshLayout.setOnRefreshListener(this::pullToRefresh);
//Load data depending of the value //Load data depending of the value
if (search_peertube == null) { //Not a Peertube search if (search_peertube == null) { //Not a Peertube search
viewModelFeeds.getVideos(type, "0", targetedId, forAccount).observe(DisplayVideosFragment.this.requireActivity(), this::manageVIewVideos); viewModelFeeds.getVideos(timelineType, "0").observe(DisplayVideosFragment.this.requireActivity(), this::manageVIewVideos);
} else { } else {
viewModelSearch.getVideos("0", search_peertube).observe(DisplayVideosFragment.this.requireActivity(), this::manageVIewVideos); viewModelSearch.getVideos("0", search_peertube).observe(DisplayVideosFragment.this.requireActivity(), this::manageVIewVideos);
} }
@ -185,10 +176,10 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
}); });
if (type != POVERVIEW) { if (timelineType != TimelineVM.TimelineType.OVERVIEW) {
lv_status.addOnScrollListener(new RecyclerView.OnScrollListener() { lv_status.addOnScrollListener(new RecyclerView.OnScrollListener() {
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
if (type == PSUBSCRIPTIONS) { if (timelineType == TimelineVM.TimelineType.SUBSCRIBTIONS) {
if (dy > 0) { if (dy > 0) {
if (check_ScrollingUp) { if (check_ScrollingUp) {
top_account_container.setVisibility(View.GONE); top_account_container.setVisibility(View.GONE);
@ -213,7 +204,11 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
if (!flag_loading) { if (!flag_loading) {
flag_loading = true; flag_loading = true;
if (search_peertube == null) { //Not a Peertube search if (search_peertube == null) { //Not a Peertube search
viewModelFeeds.getVideos(type, max_id, null, forAccount).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse)); if( timelineType != TimelineVM.TimelineType.USER_VIDEOS){
viewModelFeeds.getVideosInChannel(channelId, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
}else {
viewModelFeeds.getVideos(timelineType, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
}
} else { } else {
viewModelSearch.getVideos(max_id, search_peertube).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse)); viewModelSearch.getVideos(max_id, search_peertube).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
} }
@ -232,10 +227,15 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
if (!flag_loading) { if (!flag_loading) {
flag_loading = true; flag_loading = true;
if (search_peertube == null) { //Not a Peertube search if (search_peertube == null) { //Not a Peertube search
viewModelFeeds.getVideos(type, max_id, null, forAccount).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse)); if( timelineType != TimelineVM.TimelineType.USER_VIDEOS){
viewModelFeeds.getVideosInChannel(channelId, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
}else {
viewModelFeeds.getVideos(timelineType, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
}
} else { } else {
viewModelSearch.getVideos(max_id, search_peertube).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse)); viewModelSearch.getVideos(max_id, search_peertube).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
} }
nextElementLoader.setVisibility(View.VISIBLE); nextElementLoader.setVisibility(View.VISIBLE);
} }
} else { } else {
@ -246,7 +246,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
} }
}); });
} }
if (type == PSUBSCRIPTIONS) { if (timelineType == TimelineVM.TimelineType.SUBSCRIBTIONS) {
AccountsVM viewModel = new ViewModelProvider(this).get(AccountsVM.class); AccountsVM viewModel = new ViewModelProvider(this).get(AccountsVM.class);
viewModel.getAccounts(RetrofitPeertubeAPI.DataType.SUBSCRIBER, max_id).observe(DisplayVideosFragment.this.requireActivity(), this::manageViewAccounts); viewModel.getAccounts(RetrofitPeertubeAPI.DataType.SUBSCRIBER, max_id).observe(DisplayVideosFragment.this.requireActivity(), this::manageViewAccounts);
} }
@ -401,7 +401,12 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
accountsHorizontalListAdapter.notifyItemRangeRemoved(0, accounts.size()); accountsHorizontalListAdapter.notifyItemRangeRemoved(0, accounts.size());
} }
if (search_peertube == null) { //Not a Peertube search if (search_peertube == null) { //Not a Peertube search
viewModelFeeds.getVideos(type, "0", targetedId, forAccount).observe(this.requireActivity(), this::manageVIewVideos);
if( timelineType != TimelineVM.TimelineType.USER_VIDEOS){
viewModelFeeds.getVideosInChannel(channelId, "0").observe(this.requireActivity(), this::manageVIewVideos);
}else {
viewModelFeeds.getVideos(timelineType, "0").observe(this.requireActivity(), this::manageVIewVideos);
}
} else { } else {
viewModelSearch.getVideos("0", search_peertube).observe(this.requireActivity(), this::manageVIewVideos); viewModelSearch.getVideos("0", search_peertube).observe(this.requireActivity(), this::manageVIewVideos);
} }

8
app/src/main/java/app/fedilab/fedilabtube/services/RetrieveInfoService.java
View File

@ -31,7 +31,6 @@ import java.util.LinkedHashMap;
import java.util.Objects; import java.util.Objects;
import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.client.HttpsConnection;
import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.entities.PeertubeInformation; import app.fedilab.fedilabtube.client.entities.PeertubeInformation;
import app.fedilab.fedilabtube.helper.NetworkStateReceiver; import app.fedilab.fedilabtube.helper.NetworkStateReceiver;
@ -136,13 +135,8 @@ public class RetrieveInfoService extends Service implements NetworkStateReceiver
peertubeInformation.setPrivacies(new LinkedHashMap<>()); peertubeInformation.setPrivacies(new LinkedHashMap<>());
peertubeInformation.setPlaylistPrivacies(new LinkedHashMap<>()); peertubeInformation.setPlaylistPrivacies(new LinkedHashMap<>());
peertubeInformation.setTranslations(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); stopForeground(true);
} }
}; };
thread.start(); thread.start();

145
app/src/main/java/app/fedilab/fedilabtube/sqlite/PeertubeFavoritesDAO.java
View File

@ -1,145 +0,0 @@
package app.fedilab.fedilabtube.sqlite;
/* 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.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import app.fedilab.fedilabtube.client.PeertubeAPI;
import app.fedilab.fedilabtube.client.entities.Peertube;
import app.fedilab.fedilabtube.helper.Helper;
public class PeertubeFavoritesDAO {
public Context context;
private SQLiteDatabase db;
public PeertubeFavoritesDAO(Context context, SQLiteDatabase db) {
//Creation of the DB with tables
this.context = context;
this.db = db;
}
//------- INSERTIONS -------
/**
* Insert a status in database
*
* @param peertube Peertube
* @return boolean
*/
public long insert(Peertube peertube) {
ContentValues values = new ContentValues();
values.put(Sqlite.COL_UUID, peertube.getUuid());
values.put(Sqlite.COL_INSTANCE, peertube.getInstance());
values.put(Sqlite.COL_DATE, Helper.dateToString(new Date()));
values.put(Sqlite.COL_CACHE, peertube.getCache().toString());
//Inserts cached peertube
long last_id;
try {
last_id = db.insert(Sqlite.TABLE_PEERTUBE_FAVOURITES, null, values);
} catch (Exception e) {
last_id = -1;
}
return last_id;
}
//------- REMOVE -------
/***
* Remove stored status
* @return int
*/
public int remove(Peertube peertube) {
return db.delete(Sqlite.TABLE_PEERTUBE_FAVOURITES, Sqlite.COL_UUID + " = \"" + peertube.getUuid() + "\" AND " + Sqlite.COL_INSTANCE + " = \"" + peertube.getInstance() + "\"", null);
}
/***
* Remove stored status
* @return int
*/
public int removeAll() {
return db.delete(Sqlite.TABLE_PEERTUBE_FAVOURITES, null, null);
}
//------- GETTERS -------
/**
* Returns all cached Peertube
*
* @return stored peertube List<Peertube>
*/
public List<Peertube> getAllPeertube() {
try {
Cursor c = db.query(Sqlite.TABLE_PEERTUBE_FAVOURITES, null, null, null, null, null, Sqlite.COL_DATE + " DESC");
return cursorToListPeertube(c);
} catch (Exception e) {
return null;
}
}
/**
* Returns a cached Peertube
*
* @return stored peertube List<Peertube>
*/
public List<Peertube> getSinglePeertube(Peertube peertube) {
try {
Cursor c = db.query(Sqlite.TABLE_PEERTUBE_FAVOURITES, null, Sqlite.COL_UUID + " = \"" + peertube.getUuid() + "\" AND " + Sqlite.COL_INSTANCE + " = \"" + peertube.getInstance() + "\"", null, null, null, Sqlite.COL_DATE + " DESC");
return cursorToListPeertube(c);
} catch (Exception e) {
return null;
}
}
/***
* Method to hydrate cached statuses from database
* @param c Cursor
* @return List<Peertube>
*/
private List<Peertube> cursorToListPeertube(Cursor c) {
//No element found
if (c.getCount() == 0) {
c.close();
return null;
}
List<Peertube> peertubes = new ArrayList<>();
while (c.moveToNext()) {
//Restore cached status
try {
Peertube peertube = PeertubeAPI.parsePeertube(new JSONObject(c.getString(c.getColumnIndex(Sqlite.COL_CACHE))));
if (peertube != null) {
peertubes.add(peertube);
}
} catch (JSONException e) {
e.printStackTrace();
}
}
//Close the cursor
c.close();
//Peertubes list is returned
return peertubes;
}
}

8
app/src/main/java/app/fedilab/fedilabtube/viewmodel/CaptionsVM.java
View File

@ -23,12 +23,11 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.APIResponse;
import app.fedilab.fedilabtube.client.HttpsConnection;
import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
public class CaptionsVM extends AndroidViewModel { public class CaptionsVM extends AndroidViewModel {
private MutableLiveData<APIResponse> apiResponseMutableLiveData; private MutableLiveData<APIResponse> apiResponseMutableLiveData;
@ -67,9 +66,8 @@ public class CaptionsVM extends AndroidViewModel {
Context _mContext = getApplication().getApplicationContext(); Context _mContext = getApplication().getApplicationContext();
new Thread(() -> { new Thread(() -> {
try { try {
String captionText = new HttpsConnection(_mContext).get(url); RetrofitPeertubeAPI peertubeAPI = new RetrofitPeertubeAPI(_mContext);
APIResponse apiResponse = new APIResponse(); APIResponse apiResponse = peertubeAPI.getCaptionContent(url);
apiResponse.setCaptionText(captionText);
Handler mainHandler = new Handler(Looper.getMainLooper()); Handler mainHandler = new Handler(Looper.getMainLooper());
Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse); Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
mainHandler.post(myRunnable); mainHandler.post(myRunnable);

2
app/src/main/java/app/fedilab/fedilabtube/viewmodel/CommentVM.java
View File

@ -80,8 +80,6 @@ public class CommentVM extends AndroidViewModel {
} }
public enum action { public enum action {
ADD_COMMENT,
REPLY,
GET_THREAD, GET_THREAD,
GET_REPLIES GET_REPLIES
} }

22
app/src/main/java/app/fedilab/fedilabtube/viewmodel/PostActionsVM.java
View File

@ -48,6 +48,12 @@ public class PostActionsVM extends AndroidViewModel {
return apiResponseMutableLiveData; return apiResponseMutableLiveData;
} }
public LiveData<APIResponse> comment(RetrofitPeertubeAPI.ActionType type, String videoId, String commentId, String content) {
apiResponseMutableLiveData = new MutableLiveData<>();
postComment(type, videoId, commentId, content);
return apiResponseMutableLiveData;
}
private void makeAction(RetrofitPeertubeAPI.ActionType apiAction, String id, String element) { private void makeAction(RetrofitPeertubeAPI.ActionType apiAction, String id, String element) {
Context _mContext = getApplication().getApplicationContext(); Context _mContext = getApplication().getApplicationContext();
new Thread(() -> { new Thread(() -> {
@ -78,4 +84,20 @@ public class PostActionsVM extends AndroidViewModel {
}).start(); }).start();
} }
private void postComment(RetrofitPeertubeAPI.ActionType type, String videoId, String commentId, String content) {
Context _mContext = getApplication().getApplicationContext();
new Thread(() -> {
try {
RetrofitPeertubeAPI peertubeAPI = new RetrofitPeertubeAPI(_mContext);
APIResponse apiResponse = peertubeAPI.commentAction(type, videoId, commentId, content);
Handler mainHandler = new Handler(Looper.getMainLooper());
Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
mainHandler.post(myRunnable);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
} }

27
app/src/main/java/app/fedilab/fedilabtube/viewmodel/TimelineVM.java
View File

@ -48,6 +48,26 @@ public class TimelineVM extends AndroidViewModel {
return apiResponseMutableLiveData; return apiResponseMutableLiveData;
} }
public LiveData<APIResponse> getVideosInChannel(String channelId, String max_id) {
apiResponseMutableLiveData = new MutableLiveData<>();
loadVideosForChannel(channelId, max_id);
return apiResponseMutableLiveData;
}
private void loadVideosForChannel(String channelId, String max_id) {
Context _mContext = getApplication().getApplicationContext();
new Thread(() -> {
try {
RetrofitPeertubeAPI retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext);
APIResponse apiResponse = retrofitPeertubeAPI.getVideosForChannel(channelId, max_id);
Handler mainHandler = new Handler(Looper.getMainLooper());
Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
mainHandler.post(myRunnable);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
private void getSingle(String videoId) { private void getSingle(String videoId) {
Context _mContext = getApplication().getApplicationContext(); Context _mContext = getApplication().getApplicationContext();
@ -77,10 +97,10 @@ public class TimelineVM extends AndroidViewModel {
if (timeline == null) if (timeline == null)
return; return;
APIResponse apiResponse; APIResponse apiResponse;
if( timeline != TimelineType.OVERVIEW) { if( timeline == TimelineType.OVERVIEW) {
apiResponse = retrofitPeertubeAPI.getTL(timeline, max_id);
}else{
apiResponse = retrofitPeertubeAPI.getOverviewVideo(max_id); apiResponse = retrofitPeertubeAPI.getOverviewVideo(max_id);
}else{
apiResponse = retrofitPeertubeAPI.getTL(timeline, max_id);
} }
Handler mainHandler = new Handler(Looper.getMainLooper()); Handler mainHandler = new Handler(Looper.getMainLooper());
Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse); Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
@ -93,6 +113,7 @@ public class TimelineVM extends AndroidViewModel {
public enum TimelineType { public enum TimelineType {
USER_VIDEOS,
SUBSCRIBTIONS, SUBSCRIBTIONS,
MY_VIDEOS, MY_VIDEOS,
LOCAL, LOCAL,

2
app/src/main/res/layout/activity_show_account.xml
View File

@ -20,7 +20,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".ShowAccountActivity"> tools:context=".ShowChannelActivity">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"

20
app/src/main/res/navigation/mobile_navigation.xml
View File

@ -12,8 +12,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="POVERVIEW" android:defaultValue="OVERVIEW"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
@ -24,8 +24,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="PTRENDING" android:defaultValue="TRENDING"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
<fragment <fragment
@ -35,8 +35,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="PMOSTLIKED" android:defaultValue="MOST_LIKED"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
@ -47,8 +47,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="PRECENTLYADDED" android:defaultValue="RECENT"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
@ -59,7 +59,7 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="PLOCAL" android:defaultValue="LOCAL"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
</navigation> </navigation>

20
app/src/main/res/navigation/mobile_navigation_connected.xml
View File

@ -12,8 +12,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="POVERVIEW" android:defaultValue="OVERVIEW"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
@ -24,8 +24,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="PSUBSCRIPTIONS" android:defaultValue="SUBSCRIBTIONS"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
@ -36,8 +36,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="PTRENDING" android:defaultValue="TRENDING"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
<fragment <fragment
@ -47,8 +47,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="PMOSTLIKED" android:defaultValue="MOST_LIKED"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
@ -59,8 +59,8 @@
tools:layout="@layout/fragment_video"> tools:layout="@layout/fragment_video">
<argument <argument
android:name="type" android:name="type"
android:defaultValue="PRECENTLYADDED" android:defaultValue="RECENT"
app:argType="app.fedilab.fedilabtube.viewmodel.FeedsVM$Type" /> app:argType="app.fedilab.fedilabtube.viewmodel.TimelineVM$TimelineType" />
</fragment> </fragment>
</navigation> </navigation>