Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a40c160ac6 | ||
|
|
e6861c8436 | ||
|
|
e6a5d97fb8 | ||
|
|
ddeb209d51 | ||
|
|
3283b3a607 | ||
|
|
83a41ca6ce | ||
|
|
6c63eb7d66 | ||
|
|
7cf9de8c2a | ||
|
|
a859682954 | ||
|
|
c844c4f896 | ||
|
|
a49cfe91da | ||
|
|
2bacba2c87 |
No files matched your search
+2
-2
@@ -16,8 +16,8 @@ android {
|
||||
applicationId "io.lbry.browser"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
versionCode 1507
|
||||
versionName "0.15.7"
|
||||
versionCode 1509
|
||||
versionName "0.15.9"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ import android.os.Bundle;
|
||||
import android.text.method.LinkMovementMethod;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.text.HtmlCompat;
|
||||
@@ -20,10 +19,11 @@ import io.lbry.browser.utils.Helper;
|
||||
import io.lbry.browser.utils.Lbry;
|
||||
import io.lbry.browser.utils.LbryAnalytics;
|
||||
import io.lbry.browser.utils.Lbryio;
|
||||
import io.lbry.lbrysdk.LbrynetService;
|
||||
|
||||
public class FirstRunActivity extends AppCompatActivity {
|
||||
|
||||
private BroadcastReceiver sdkReadyReceiver;
|
||||
private BroadcastReceiver sdkReceiver;
|
||||
private BroadcastReceiver authReceiver;
|
||||
|
||||
@Override
|
||||
@@ -45,19 +45,26 @@ public class FirstRunActivity extends AppCompatActivity {
|
||||
registerAuthReceiver();
|
||||
if (!Lbry.SDK_READY) {
|
||||
findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE);
|
||||
IntentFilter filter = new IntentFilter();
|
||||
filter.addAction(MainActivity.ACTION_SDK_READY);
|
||||
sdkReadyReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
// authenticate after we receive the sdk ready event
|
||||
authenticate();
|
||||
}
|
||||
};
|
||||
registerReceiver(sdkReadyReceiver, filter);
|
||||
} else {
|
||||
authenticate();
|
||||
}
|
||||
|
||||
IntentFilter filter = new IntentFilter();
|
||||
filter.addAction(MainActivity.ACTION_SDK_READY);
|
||||
filter.addAction(LbrynetService.ACTION_STOP_SERVICE);
|
||||
sdkReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
String action = intent.getAction();
|
||||
if (MainActivity.ACTION_SDK_READY.equals(action)) {
|
||||
// authenticate after we receive the sdk ready event
|
||||
authenticate();
|
||||
} else if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
|
||||
finish();
|
||||
}
|
||||
}
|
||||
};
|
||||
registerReceiver(sdkReceiver, filter);
|
||||
}
|
||||
|
||||
public void onResume() {
|
||||
@@ -122,7 +129,7 @@ public class FirstRunActivity extends AppCompatActivity {
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
Helper.unregisterReceiver(authReceiver, this);
|
||||
Helper.unregisterReceiver(sdkReadyReceiver, this);
|
||||
Helper.unregisterReceiver(sdkReceiver, this);
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
|
||||
@@ -115,6 +115,7 @@ import io.lbry.browser.listener.DownloadActionListener;
|
||||
import io.lbry.browser.listener.FetchChannelsListener;
|
||||
import io.lbry.browser.listener.FetchClaimsListener;
|
||||
import io.lbry.browser.listener.FilePickerListener;
|
||||
import io.lbry.browser.listener.PIPModeListener;
|
||||
import io.lbry.browser.listener.ScreenOrientationListener;
|
||||
import io.lbry.browser.listener.SdkStatusListener;
|
||||
import io.lbry.browser.listener.StoragePermissionListener;
|
||||
@@ -316,6 +317,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
private List<CameraPermissionListener> cameraPermissionListeners;
|
||||
private List<DownloadActionListener> downloadActionListeners;
|
||||
private List<FilePickerListener> filePickerListeners;
|
||||
private List<PIPModeListener> pipModeListeners;
|
||||
private List<ScreenOrientationListener> screenOrientationListeners;
|
||||
private List<SdkStatusListener> sdkStatusListeners;
|
||||
private List<StoragePermissionListener> storagePermissionListeners;
|
||||
@@ -393,7 +395,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
|
||||
return ViewCompat.onApplyWindowInsets(v,
|
||||
insets.replaceSystemWindowInsets(
|
||||
insets.getSystemWindowInsetLeft(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
insets.getSystemWindowInsetBottom()));
|
||||
@@ -426,6 +428,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
fetchChannelsListeners = new ArrayList<>();
|
||||
fetchClaimsListeners = new ArrayList<>();
|
||||
filePickerListeners = new ArrayList<>();
|
||||
pipModeListeners = new ArrayList<>();
|
||||
screenOrientationListeners = new ArrayList<>();
|
||||
sdkStatusListeners = new ArrayList<>();
|
||||
storagePermissionListeners = new ArrayList<>();
|
||||
@@ -598,6 +601,16 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
filePickerListeners.remove(listener);
|
||||
}
|
||||
|
||||
public void addPIPModeListener(PIPModeListener listener) {
|
||||
if (!pipModeListeners.contains(listener)) {
|
||||
pipModeListeners.add(listener);
|
||||
}
|
||||
}
|
||||
|
||||
public void removePIPModeListener(PIPModeListener listener) {
|
||||
pipModeListeners.remove(listener);
|
||||
}
|
||||
|
||||
public void addCameraPermissionListener(CameraPermissionListener listener) {
|
||||
if (!cameraPermissionListeners.contains(listener)) {
|
||||
cameraPermissionListeners.add(listener);
|
||||
@@ -808,6 +821,10 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
findViewById(R.id.app_bar_main_container).setFitsSystemWindows(true);
|
||||
hideActionBar();
|
||||
|
||||
for (PIPModeListener listener : pipModeListeners) {
|
||||
listener.onEnterPIPMode();
|
||||
}
|
||||
|
||||
PlayerView pipPlayer = findViewById(R.id.pip_player);
|
||||
pipPlayer.setVisibility(View.VISIBLE);
|
||||
pipPlayer.setPlayer(appPlayer);
|
||||
@@ -838,6 +855,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
if (!Lbry.SDK_READY && !inFullscreenMode) {
|
||||
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
|
||||
}
|
||||
for (PIPModeListener listener : pipModeListeners) {
|
||||
listener.onExitPIPMode();
|
||||
}
|
||||
|
||||
PlayerView pipPlayer = findViewById(R.id.pip_player);
|
||||
pipPlayer.setVisibility(View.INVISIBLE);
|
||||
@@ -921,7 +941,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
applyNavbarSigninPadding();
|
||||
checkFirstRun();
|
||||
checkNowPlaying();
|
||||
fetchRewards();
|
||||
|
||||
// check (and start) the LBRY SDK service
|
||||
serviceRunning = isServiceRunning(this, LbrynetService.class);
|
||||
@@ -997,7 +1016,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
|
||||
public boolean canShowUrlSuggestions() {
|
||||
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
return sp.getBoolean(MainActivity.PREFERENCE_KEY_SHOW_URL_SUGGESTIONS, false);
|
||||
return sp.getBoolean(MainActivity.PREFERENCE_KEY_SHOW_URL_SUGGESTIONS, true);
|
||||
}
|
||||
|
||||
public boolean keepSdkBackground() {
|
||||
@@ -1369,6 +1388,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
}
|
||||
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE);
|
||||
findViewById(R.id.app_bar_main_container).setFitsSystemWindows(false);
|
||||
lockDrawer();
|
||||
|
||||
View decorView = getWindow().getDecorView();
|
||||
decorView.setSystemUiVisibility(
|
||||
@@ -1405,6 +1425,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
if (actionBar != null) {
|
||||
actionBar.show();
|
||||
}
|
||||
unlockDrawer();
|
||||
inFullscreenMode = false;
|
||||
}
|
||||
|
||||
@@ -1422,13 +1443,18 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
boolean firstRunCompleted = sp.getBoolean(PREFERENCE_KEY_INTERNAL_FIRST_RUN_COMPLETED, false);
|
||||
if (!firstRunCompleted) {
|
||||
findViewById(R.id.drawer_layout).setVisibility(View.INVISIBLE);
|
||||
startActivity(new Intent(this, FirstRunActivity.class));
|
||||
} else if (!appStarted) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!appStarted) {
|
||||
// first run completed, startup
|
||||
startup();
|
||||
return;
|
||||
}
|
||||
|
||||
fetchRewards();
|
||||
if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
|
||||
openFragment(FollowingFragment.class, false, NavMenuItem.ID_ITEM_FOLLOWING);
|
||||
}
|
||||
@@ -1492,7 +1518,11 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
|
||||
initFloatingWalletBalance();
|
||||
|
||||
checkAndClaimNewAndroidReward();
|
||||
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
boolean firstRunCompleted = sp.getBoolean(PREFERENCE_KEY_INTERNAL_FIRST_RUN_COMPLETED, false);
|
||||
if (firstRunCompleted) {
|
||||
checkAndClaimNewAndroidReward();
|
||||
}
|
||||
}
|
||||
|
||||
public void checkAndClaimNewAndroidReward() {
|
||||
@@ -2196,6 +2226,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
hideActionBar();
|
||||
lockDrawer();
|
||||
findViewById(R.id.splash_view).setVisibility(View.VISIBLE);
|
||||
findViewById(R.id.drawer_layout).setVisibility(View.VISIBLE);
|
||||
LbryAnalytics.setCurrentScreen(MainActivity.this, "Splash", "Splash");
|
||||
initStartupStages();
|
||||
}
|
||||
@@ -2886,11 +2917,17 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
|
||||
public static void requestPermission(String permission, int requestCode, String rationale, Context context, boolean forceRequest) {
|
||||
if (ContextCompat.checkSelfPermission(context, permission) != PackageManager.PERMISSION_GRANTED) {
|
||||
if (!forceRequest && ActivityCompat.shouldShowRequestPermissionRationale((Activity) context, permission)) {
|
||||
Toast.makeText(context, rationale, Toast.LENGTH_LONG).show();
|
||||
} else {
|
||||
if (ActivityCompat.shouldShowRequestPermissionRationale((Activity) context, permission)) {
|
||||
if (context instanceof MainActivity) {
|
||||
((MainActivity) context).showMessage(rationale);
|
||||
}
|
||||
} else if (forceRequest) {
|
||||
startingPermissionRequest = true;
|
||||
ActivityCompat.requestPermissions((Activity) context, new String[] { permission }, requestCode);
|
||||
} else {
|
||||
if (context instanceof MainActivity) {
|
||||
((MainActivity) context).showError(rationale);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
package io.lbry.browser;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.graphics.Color;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
@@ -18,8 +21,10 @@ import io.lbry.browser.listener.SignInListener;
|
||||
import io.lbry.browser.listener.WalletSyncListener;
|
||||
import io.lbry.browser.model.lbryinc.User;
|
||||
import io.lbry.browser.tasks.lbryinc.FetchCurrentUserTask;
|
||||
import io.lbry.browser.utils.Helper;
|
||||
import io.lbry.browser.utils.LbryAnalytics;
|
||||
import io.lbry.browser.utils.Lbryio;
|
||||
import io.lbry.lbrysdk.LbrynetService;
|
||||
|
||||
public class VerificationActivity extends FragmentActivity implements SignInListener, WalletSyncListener {
|
||||
|
||||
@@ -27,6 +32,7 @@ public class VerificationActivity extends FragmentActivity implements SignInList
|
||||
public static final int VERIFICATION_FLOW_REWARDS = 2;
|
||||
public static final int VERIFICATION_FLOW_WALLET = 3;
|
||||
|
||||
private BroadcastReceiver sdkReceiver;
|
||||
private String email;
|
||||
private boolean signedIn;
|
||||
private int flow;
|
||||
@@ -54,6 +60,19 @@ public class VerificationActivity extends FragmentActivity implements SignInList
|
||||
return;
|
||||
}
|
||||
|
||||
IntentFilter filter = new IntentFilter();
|
||||
filter.addAction(LbrynetService.ACTION_STOP_SERVICE);
|
||||
sdkReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
String action = intent.getAction();
|
||||
if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
|
||||
finish();
|
||||
}
|
||||
}
|
||||
};
|
||||
registerReceiver(sdkReceiver, filter);
|
||||
|
||||
setContentView(R.layout.activity_verification);
|
||||
ViewPager2 viewPager = findViewById(R.id.verification_pager);
|
||||
viewPager.setUserInputEnabled(false);
|
||||
@@ -269,4 +288,10 @@ public class VerificationActivity extends FragmentActivity implements SignInList
|
||||
public void onWalletSyncFailed(Exception error) {
|
||||
findViewById(R.id.verification_close_button).setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
Helper.unregisterReceiver(sdkReceiver, this);
|
||||
super.onDestroy();
|
||||
}
|
||||
}
|
||||
@@ -327,7 +327,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
|
||||
}
|
||||
|
||||
boolean isPending = item.getConfirmations() == 0;
|
||||
boolean isSelected = isClaimSelected(item);
|
||||
boolean isSelected = isClaimSelected(original);
|
||||
vh.itemView.setSelected(isSelected);
|
||||
vh.selectedOverlayView.setVisibility(isSelected ? View.VISIBLE : View.GONE);
|
||||
vh.itemView.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@@ -44,7 +44,7 @@ public class InlineChannelSpinnerAdapter extends ArrayAdapter<Claim> {
|
||||
public int getItemPosition(Claim item) {
|
||||
for (int i = 0; i < channels.size(); i++) {
|
||||
Claim channel = channels.get(i);
|
||||
if (item.getClaimId().equalsIgnoreCase(channel.getClaimId())) {
|
||||
if (item.getClaimId() != null && item.getClaimId().equalsIgnoreCase(channel.getClaimId())) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
package io.lbry.browser.listener;
|
||||
|
||||
public interface PIPModeListener {
|
||||
void onEnterPIPMode();
|
||||
void onExitPIPMode();
|
||||
}
|
||||
@@ -289,6 +289,9 @@ public class Claim {
|
||||
Claim signingChannel = new Claim();
|
||||
signingChannel.setClaimId(viewHistory.getPublisherClaimId());
|
||||
signingChannel.setName(viewHistory.getPublisherName());
|
||||
|
||||
LbryUri channelUrl = LbryUri.tryParse(String.format("%s#%s", signingChannel.getName(), signingChannel.getClaimId()));
|
||||
signingChannel.setPermanentUrl(channelUrl != null ? channelUrl.toString() : null);
|
||||
if (!Helper.isNullOrEmpty(viewHistory.getPublisherTitle())) {
|
||||
GenericMetadata channelValue = new GenericMetadata();
|
||||
channelValue.setTitle(viewHistory.getPublisherTitle());
|
||||
|
||||
@@ -73,6 +73,14 @@ public class PublishClaimTask extends AsyncTask<Void, Void, Claim> {
|
||||
options.put("license_url", metadata.getLicenseUrl());
|
||||
}
|
||||
|
||||
if (metadata.getReleaseTime() > 0) {
|
||||
options.put("release_time", metadata.getReleaseTime());
|
||||
} else if (claim.getTimestamp() > 0) {
|
||||
options.put("release_time", claim.getTimestamp());
|
||||
} else {
|
||||
options.put("release_time", Double.valueOf(Math.floor(System.currentTimeMillis() / 1000.0)).intValue());
|
||||
}
|
||||
|
||||
Claim claimResult = null;
|
||||
try {
|
||||
JSONObject result = (JSONObject) Lbry.genericApiCall(Lbry.METHOD_PUBLISH, options);
|
||||
|
||||
@@ -9,7 +9,6 @@ import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.pm.ActivityInfo;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
@@ -31,7 +30,6 @@ import android.widget.RelativeLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.core.content.ContextCompat;
|
||||
@@ -97,6 +95,7 @@ import io.lbry.browser.dialog.SendTipDialogFragment;
|
||||
import io.lbry.browser.exceptions.LbryUriException;
|
||||
import io.lbry.browser.listener.DownloadActionListener;
|
||||
import io.lbry.browser.listener.FetchClaimsListener;
|
||||
import io.lbry.browser.listener.PIPModeListener;
|
||||
import io.lbry.browser.listener.ScreenOrientationListener;
|
||||
import io.lbry.browser.listener.SdkStatusListener;
|
||||
import io.lbry.browser.listener.StoragePermissionListener;
|
||||
@@ -140,8 +139,10 @@ import io.lbry.lbrysdk.LbrynetService;
|
||||
import io.lbry.lbrysdk.Utils;
|
||||
|
||||
public class FileViewFragment extends BaseFragment implements
|
||||
MainActivity.BackPressInterceptor, DownloadActionListener,
|
||||
MainActivity.BackPressInterceptor,
|
||||
DownloadActionListener,
|
||||
FetchClaimsListener,
|
||||
PIPModeListener,
|
||||
ScreenOrientationListener,
|
||||
SdkStatusListener,
|
||||
StoragePermissionListener,
|
||||
@@ -174,6 +175,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
private long startTimeMillis;
|
||||
private GetFileTask getFileTask;
|
||||
|
||||
private boolean storagePermissionRefusedOnce;
|
||||
private View buttonPublishSomething;
|
||||
private View layoutLoadingState;
|
||||
private View layoutNothingAtLocation;
|
||||
@@ -240,6 +242,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
activity.setBackPressInterceptor(this);
|
||||
activity.addDownloadActionListener(this);
|
||||
activity.addFetchClaimsListener(this);
|
||||
activity.addPIPModeListener(this);
|
||||
activity.addScreenOrientationListener(this);
|
||||
activity.addWalletBalanceListener(this);
|
||||
if (!MainActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, context)) {
|
||||
@@ -584,6 +587,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
MainActivity activity = (MainActivity) context;
|
||||
activity.removeDownloadActionListener(this);
|
||||
activity.removeFetchClaimsListener(this);
|
||||
activity.removePIPModeListener(this);
|
||||
activity.removeScreenOrientationListener(this);
|
||||
activity.removeSdkStatusListener(this);
|
||||
activity.removeStoragePermissionListener(this);
|
||||
@@ -1019,6 +1023,12 @@ public class FileViewFragment extends BaseFragment implements
|
||||
if (MainActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, context)) {
|
||||
startDownload();
|
||||
} else {
|
||||
if (storagePermissionRefusedOnce) {
|
||||
showStoragePermissionRefusedError();
|
||||
restoreMainActionButton();
|
||||
return;
|
||||
}
|
||||
|
||||
startDownloadPending = true;
|
||||
MainActivity.requestPermission(
|
||||
Manifest.permission.WRITE_EXTERNAL_STORAGE,
|
||||
@@ -1032,6 +1042,12 @@ public class FileViewFragment extends BaseFragment implements
|
||||
private void checkStoragePermissionAndFileGet() {
|
||||
Context context = getContext();
|
||||
if (!MainActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, context)) {
|
||||
if (storagePermissionRefusedOnce) {
|
||||
showStoragePermissionRefusedError();
|
||||
restoreMainActionButton();
|
||||
return;
|
||||
}
|
||||
|
||||
fileGetPending = true;
|
||||
MainActivity.requestPermission(
|
||||
Manifest.permission.WRITE_EXTERNAL_STORAGE,
|
||||
@@ -1079,11 +1095,12 @@ public class FileViewFragment extends BaseFragment implements
|
||||
}
|
||||
}
|
||||
public void onStoragePermissionRefused() {
|
||||
storagePermissionRefusedOnce = true;
|
||||
fileGetPending = false;
|
||||
startDownloadPending = false;
|
||||
onDownloadAborted();
|
||||
Snackbar.make(getView(), R.string.storage_permission_rationale_download, Snackbar.LENGTH_LONG).
|
||||
setBackgroundTint(Color.RED).setTextColor(Color.WHITE).show();
|
||||
|
||||
showStoragePermissionRefusedError();
|
||||
}
|
||||
|
||||
public void startDownload() {
|
||||
@@ -1898,7 +1915,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
int statusBarHeight = activity.getStatusBarHeight();
|
||||
exoplayerContainer.setPadding(0, 0, 0, statusBarHeight);
|
||||
|
||||
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
|
||||
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2351,4 +2368,28 @@ public class FileViewFragment extends BaseFragment implements
|
||||
return Integer.MAX_VALUE;
|
||||
}
|
||||
}
|
||||
|
||||
public void onEnterPIPMode() {
|
||||
View root = getView();
|
||||
if (root != null) {
|
||||
PlayerView playerView = root.findViewById(R.id.file_view_exoplayer_view);
|
||||
playerView.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
public void onExitPIPMode() {
|
||||
View root = getView();
|
||||
if (root != null) {
|
||||
PlayerView playerView = root.findViewById(R.id.file_view_exoplayer_view);
|
||||
playerView.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
private void showStoragePermissionRefusedError() {
|
||||
View root = getView();
|
||||
if (root != null) {
|
||||
Snackbar.make(root, R.string.storage_permission_rationale_download, Snackbar.LENGTH_LONG).
|
||||
setBackgroundTint(Color.RED).setTextColor(Color.WHITE).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -102,6 +102,7 @@ public class PublishFormFragment extends BaseFragment implements
|
||||
private static final int MAX_VIDEO_DIMENSION = 1920;
|
||||
private static final int MAX_BITRATE = 5000000; // 5mbps
|
||||
|
||||
private boolean storageRefusedOnce;
|
||||
private static final int SUGGESTED_LIMIT = 8;
|
||||
|
||||
private boolean editMode;
|
||||
@@ -1037,6 +1038,16 @@ public class PublishFormFragment extends BaseFragment implements
|
||||
metadata.setLicenseUrl(selectedLicense.getUrl());
|
||||
}
|
||||
|
||||
// set release time from current claim (on edit)
|
||||
if (currentClaim != null) {
|
||||
Claim.StreamMetadata currentMetadata = (Claim.StreamMetadata) currentClaim.getValue();
|
||||
metadata.setReleaseTime(currentMetadata.getReleaseTime());
|
||||
if (metadata.getReleaseTime() == 0) {
|
||||
metadata.setReleaseTime(currentClaim.getTimestamp());
|
||||
}
|
||||
claim.setTimestamp(currentClaim.getTimestamp());
|
||||
}
|
||||
|
||||
claim.setValueType(Claim.TYPE_STREAM);
|
||||
claim.setValue(metadata);
|
||||
|
||||
@@ -1394,7 +1405,10 @@ public class PublishFormFragment extends BaseFragment implements
|
||||
|
||||
@Override
|
||||
public void onStoragePermissionRefused() {
|
||||
showError(getString(R.string.storage_permission_rationale_images));
|
||||
if (!storageRefusedOnce) {
|
||||
showError(getString(R.string.storage_permission_rationale_images));
|
||||
storageRefusedOnce = true;
|
||||
}
|
||||
launchPickerPending = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@ import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.camera.core.Camera;
|
||||
@@ -53,6 +52,7 @@ public class PublishFragment extends BaseFragment implements
|
||||
CameraPermissionListener, FilePickerListener, StoragePermissionListener {
|
||||
|
||||
private boolean cameraPreviewInitialized;
|
||||
private boolean storagePermissionRefusedOnce;
|
||||
private PreviewView cameraPreview;
|
||||
private RecyclerView galleryGrid;
|
||||
private GalleryGridAdapter adapter;
|
||||
@@ -254,7 +254,9 @@ public class PublishFragment extends BaseFragment implements
|
||||
}
|
||||
}
|
||||
|
||||
checkStoragePermissionAndLoadVideos();
|
||||
if (!storagePermissionRefusedOnce) {
|
||||
checkStoragePermissionAndLoadVideos();
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressLint("RestrictedApi")
|
||||
@@ -399,8 +401,15 @@ public class PublishFragment extends BaseFragment implements
|
||||
|
||||
@Override
|
||||
public void onStoragePermissionRefused() {
|
||||
Snackbar.make(getView(), R.string.storage_permission_rationale_videos, Snackbar.LENGTH_LONG).
|
||||
setBackgroundTint(Color.RED).setTextColor(Color.WHITE).show();
|
||||
storagePermissionRefusedOnce = true;
|
||||
View root = getView();
|
||||
if (root != null) {
|
||||
Snackbar.make(root, R.string.storage_permission_rationale_videos, Snackbar.LENGTH_LONG).
|
||||
setBackgroundTint(Color.RED).setTextColor(Color.WHITE).show();
|
||||
Helper.setViewText(noVideosLoaded, R.string.storage_permission_rationale_videos);
|
||||
}
|
||||
|
||||
checkNoVideosLoaded();
|
||||
}
|
||||
|
||||
public String getSuggestedPublishUrl() {
|
||||
|
||||
@@ -239,7 +239,8 @@ public class PublishesFragment extends BaseFragment implements ActionMode.Callba
|
||||
@Override
|
||||
public boolean onPrepareActionMode(androidx.appcompat.view.ActionMode actionMode, Menu menu) {
|
||||
int selectionCount = adapter != null ? adapter.getSelectedCount() : 0;
|
||||
menu.findItem(R.id.action_edit).setVisible(selectionCount == 1);
|
||||
menu.findItem(R.id.action_edit).setVisible(selectionCount == 1 &&
|
||||
Claim.TYPE_STREAM.equalsIgnoreCase(adapter.getSelectedItems().get(0).getValueType()));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import io.lbry.browser.BuildConfig;
|
||||
import io.lbry.browser.MainActivity;
|
||||
import io.lbry.browser.exceptions.LbryioRequestException;
|
||||
import io.lbry.browser.exceptions.LbryioResponseException;
|
||||
@@ -81,6 +82,10 @@ public final class Lbryio {
|
||||
authToken = getAuthToken(context);
|
||||
}
|
||||
|
||||
/*if (BuildConfig.DEBUG) {
|
||||
Log.d(TAG, String.format("Using authToken for request: %s", authToken));
|
||||
}*/
|
||||
|
||||
String url = String.format("%s/%s/%s", CONNECTION_STRING, resource, action);
|
||||
if (Helper.METHOD_GET.equalsIgnoreCase(method)) {
|
||||
Uri.Builder uriBuilder = Uri.parse(url).buildUpon();
|
||||
@@ -94,6 +99,9 @@ public final class Lbryio {
|
||||
}
|
||||
url = uriBuilder.build().toString();
|
||||
}
|
||||
/*if (BuildConfig.DEBUG) {
|
||||
Log.d(TAG, String.format("Request Method: %s, Sending request to URL: %s", method, url));
|
||||
}*/
|
||||
|
||||
Request.Builder builder = new Request.Builder().url(url);
|
||||
if (Helper.METHOD_POST.equalsIgnoreCase(method)) {
|
||||
@@ -142,6 +150,9 @@ public final class Lbryio {
|
||||
}
|
||||
|
||||
generatingAuthToken = true;
|
||||
/*if (BuildConfig.DEBUG) {
|
||||
Log.d(TAG, "Generating a new auth token");
|
||||
}*/
|
||||
|
||||
Map<String, String> options = new HashMap<>();
|
||||
options.put("auth_token", "");
|
||||
@@ -150,6 +161,9 @@ public final class Lbryio {
|
||||
Response response = Lbryio.call("user", "new", options, "post", context);
|
||||
try {
|
||||
JSONObject json = (JSONObject) parseResponse(response);
|
||||
/*if (BuildConfig.DEBUG) {
|
||||
Log.d(TAG, String.format("/user/new response: %s", json.toString(2)));
|
||||
}*/
|
||||
if (!json.has(AUTH_TOKEN_PARAM)) {
|
||||
throw new LbryioResponseException("auth_token was not set in the response");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user