Compare commits
22
Commits
0.17.0
..
dep-update
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2d50a30d46 | ||
|
|
1e3a74cae1 | ||
|
|
ca08f71a72 | ||
|
|
b60ca39df1 | ||
|
|
696bc86b7c | ||
|
|
4c163c6244 | ||
|
|
2ad49ca281 | ||
|
|
56caeef72b | ||
|
|
84bb014557 | ||
|
|
9278e74e85 | ||
|
|
cf6f09c60d | ||
|
|
f2cbed48d9 | ||
|
|
f1ead0c247 | ||
|
|
5f2c72ec4d | ||
|
|
a6869eb2e6 | ||
|
|
cbae6c476a | ||
|
|
48d257ceaf | ||
|
|
5355456498 | ||
|
|
1436895ace | ||
|
|
6e32f7724f | ||
|
|
3f5104d60a | ||
|
|
d8fdb3b818 |
No files matched your search
@@ -66,3 +66,4 @@ app/twitter.properties
|
||||
*.hprof
|
||||
app/build
|
||||
bin
|
||||
app/debuglib
|
||||
+6
-6
@@ -9,8 +9,8 @@ build apk:
|
||||
image: lbry/android-base:platform-28
|
||||
before_script:
|
||||
- echo "$PGP_PRIVATE_KEY" | gpg --batch --import
|
||||
- echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
|
||||
- wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
|
||||
- echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list
|
||||
- wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add -
|
||||
- apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret
|
||||
- git secret reveal
|
||||
- chmod u+x $CI_PROJECT_DIR/gradlew
|
||||
@@ -36,8 +36,8 @@ deploy build.lbry.io:
|
||||
before_script:
|
||||
- apt-get -y update && apt-get -y install apt-transport-https
|
||||
- echo "$PGP_PRIVATE_KEY" | gpg --batch --import
|
||||
- echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
|
||||
- wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
|
||||
- echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list
|
||||
- wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add -
|
||||
- apt-get -y update && apt-get -y install openjdk-8-jdk git git-secret
|
||||
- pip install awscli
|
||||
- chmod u+x $CI_PROJECT_DIR/gradlew
|
||||
@@ -60,8 +60,8 @@ release apk:
|
||||
before_script:
|
||||
- apt-get -y update && apt-get -y install apt-transport-https
|
||||
- echo "$PGP_PRIVATE_KEY" | gpg --batch --import
|
||||
- echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
|
||||
- wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
|
||||
- echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list
|
||||
- wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add -
|
||||
- apt-get -y update && apt-get -y install openjdk-8-jdk git git-secret
|
||||
- pip install awscli githubrelease
|
||||
- git secret reveal
|
||||
|
||||
@@ -37,7 +37,7 @@ Contributions to this project are welcome, encouraged, and compensated. For more
|
||||
This project is MIT licensed. For the full license, see [LICENSE](LICENSE).
|
||||
|
||||
## Security
|
||||
We take security seriously. Please contact security@lbry.com regarding any security issues. Our PGP key is [here](https://keybase.io/lbry/key.asc) if you need it.
|
||||
We take security seriously. Please contact security@lbry.com regarding any security issues. Our PGP key is [here](https://lbry.com/faq/pgp-key) if you need it.
|
||||
|
||||
## Contact
|
||||
The primary contact for this project is [@akinwale](https://github.com/akinwale) (akinwale@lbry.com)
|
||||
+49
-43
@@ -3,8 +3,7 @@ import com.google.gms.googleservices.GoogleServicesPlugin
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion "29.0.2"
|
||||
compileSdkVersion 33
|
||||
flavorDimensions "default"
|
||||
|
||||
compileOptions {
|
||||
@@ -14,18 +13,19 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
applicationId "io.lbry.browser"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
versionCode 1700
|
||||
versionName "0.17.0"
|
||||
minSdkVersion 24
|
||||
targetSdkVersion 33
|
||||
versionCode 1702
|
||||
versionName "0.17.2"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
exclude 'META-INF/DEPENDENCIES'
|
||||
exclude 'lib/x86_64/darwin/libscrypt.dylib'
|
||||
packagingOptions {
|
||||
resources {
|
||||
excludes += ['META-INF/DEPENDENCIES', 'lib/x86_64/darwin/libscrypt.dylib']
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
productFlavors {
|
||||
__32bit {
|
||||
versionCode android.defaultConfig.versionCode * 10 + 1
|
||||
@@ -57,6 +57,7 @@ android {
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
namespace 'io.lbry.browser'
|
||||
}
|
||||
|
||||
task printVersionName {
|
||||
@@ -75,66 +76,71 @@ configurations {
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
|
||||
implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
|
||||
implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
|
||||
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
||||
implementation 'com.google.android.material:material:1.3.0-alpha01'
|
||||
implementation 'com.google.android.material:material:1.8.0-alpha02'
|
||||
implementation "androidx.cardview:cardview:1.0.0"
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||
implementation 'androidx.navigation:navigation-fragment:2.3.1'
|
||||
implementation 'androidx.navigation:navigation-ui:2.3.1'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||
implementation 'androidx.navigation:navigation-fragment:2.5.3'
|
||||
implementation 'androidx.navigation:navigation-ui:2.5.3'
|
||||
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
|
||||
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
|
||||
implementation 'androidx.preference:preference:1.1.1'
|
||||
implementation 'androidx.webkit:webkit:1.4.0-rc01'
|
||||
implementation 'androidx.camera:camera-core:1.0.0-beta03'
|
||||
implementation 'androidx.camera:camera-camera2:1.0.0-beta03'
|
||||
implementation 'androidx.camera:camera-lifecycle:1.0.0-beta03'
|
||||
implementation 'androidx.camera:camera-view:1.0.0-alpha10'
|
||||
implementation 'androidx.browser:browser:1.2.0'
|
||||
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
|
||||
implementation 'androidx.preference:preference:1.2.0'
|
||||
implementation 'androidx.webkit:webkit:1.6.0-alpha03'
|
||||
implementation 'androidx.camera:camera-core:1.3.0-alpha01'
|
||||
implementation 'androidx.camera:camera-camera2:1.3.0-alpha01'
|
||||
implementation 'androidx.camera:camera-lifecycle:1.3.0-alpha01'
|
||||
implementation 'androidx.camera:camera-view:1.3.0-alpha01'
|
||||
implementation 'androidx.browser:browser:1.4.0'
|
||||
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
|
||||
|
||||
implementation 'com.github.bumptech.glide:glide:4.11.0'
|
||||
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
|
||||
implementation 'com.google.firebase:firebase-analytics:18.0.0'
|
||||
implementation 'com.google.android.gms:play-services-base:17.5.0'
|
||||
implementation 'com.google.firebase:firebase-messaging:21.0.0'
|
||||
implementation 'com.google.firebase:firebase-iid:21.1.0'
|
||||
implementation 'com.google.firebase:firebase-analytics:21.2.0'
|
||||
implementation 'com.google.android.gms:play-services-base:18.1.0'
|
||||
implementation 'com.google.firebase:firebase-messaging:23.1.0'
|
||||
implementation 'com.google.oauth-client:google-oauth-client:1.30.4'
|
||||
|
||||
implementation 'com.android.billingclient:billing:3.0.2'
|
||||
implementation 'com.android.billingclient:billing:5.1.0'
|
||||
|
||||
implementation 'com.google.code.gson:gson:2.8.6'
|
||||
implementation 'com.google.android.exoplayer:exoplayer-core:2.12.2'
|
||||
implementation 'com.google.android.exoplayer:exoplayer-dash:2.12.2'
|
||||
implementation 'com.google.android.exoplayer:exoplayer-ui:2.12.2'
|
||||
implementation 'com.google.android.exoplayer:extension-cast:2.12.2'
|
||||
implementation 'com.google.android.exoplayer:extension-mediasession:2.12.2'
|
||||
implementation 'com.google.android.exoplayer:exoplayer-core:2.18.1'
|
||||
implementation 'com.google.android.exoplayer:exoplayer-dash:2.18.1'
|
||||
implementation 'com.google.android.exoplayer:exoplayer-ui:2.18.1'
|
||||
implementation 'com.google.android.exoplayer:extension-cast:2.18.1'
|
||||
implementation 'com.google.android.exoplayer:extension-mediasession:2.18.1'
|
||||
|
||||
implementation 'com.google.android:flexbox:2.0.1'
|
||||
implementation 'com.google.android.flexbox:flexbox:3.0.0'
|
||||
|
||||
implementation 'com.hbb20:ccp:2.3.8'
|
||||
implementation 'com.hbb20:ccp:2.5.1'
|
||||
|
||||
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
|
||||
implementation 'com.atlassian.commonmark:commonmark:0.14.0'
|
||||
|
||||
implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.3.1.LTS'
|
||||
implementation 'com.arthenica:mobile-ffmpeg-full:4.4.LTS'
|
||||
|
||||
implementation 'commons-codec:commons-codec:1.15'
|
||||
implementation 'org.bitcoinj:bitcoinj-tools:0.14.7'
|
||||
implementation 'org.java-websocket:Java-WebSocket:1.5.1'
|
||||
|
||||
implementation ('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
|
||||
implementation 'com.google.zxing:core:3.3.0'
|
||||
|
||||
compileOnly 'org.projectlombok:lombok:1.18.10'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.10'
|
||||
testAnnotationProcessor("org.projectlombok:lombok:1.18.10")
|
||||
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
|
||||
|
||||
testImplementation 'junit:junit:4.12'
|
||||
androidTestImplementation 'androidx.test:runner:1.3.0'
|
||||
androidTestImplementation 'androidx.test:rules:1.3.0'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
androidTestImplementation 'androidx.test:runner:1.5.1'
|
||||
androidTestImplementation 'androidx.test:rules:1.5.0'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
|
||||
|
||||
__32bitImplementation 'io.lbry:lbrysdk32:0.91.0'
|
||||
__64bitImplementation 'io.lbry:lbrysdk64:0.91.0'
|
||||
__32bitImplementation 'io.lbry:lbrysdk32:0.102.0'
|
||||
__64bitImplementation 'io.lbry:lbrysdk64:0.102.0'
|
||||
//__64bitImplementation(name: 'lbrysdk', ext: 'aar')
|
||||
}
|
||||
|
||||
apply plugin: 'com.google.gms.google-services'
|
||||
GoogleServicesPlugin.config.disableVersionCheck = true
|
||||
@@ -1,17 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="io.lbry.browser"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:installLocation="auto">
|
||||
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false" />
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="com.android.vending.BILLING" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
|
||||
<uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
@@ -42,7 +45,7 @@
|
||||
<activity
|
||||
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout"
|
||||
android:name=".MainActivity"
|
||||
android:label="@string/app_name"
|
||||
android:exported="true"
|
||||
android:supportsPictureInPicture="true"
|
||||
android:theme="@style/AppTheme.NoActionBar"
|
||||
android:launchMode="singleTask"
|
||||
@@ -98,6 +101,11 @@
|
||||
android:theme="@style/AppTheme.NoActionBarTranslucent"
|
||||
android:windowSoftInputMode="adjustResize" />
|
||||
|
||||
<activity
|
||||
android:name="com.journeyapps.barcodescanner.CaptureActivity"
|
||||
android:screenOrientation="fullSensor"
|
||||
tools:replace="screenOrientation" />
|
||||
|
||||
<service
|
||||
android:name="io.lbry.browser.LbrynetMessagingService"
|
||||
android:exported="false">
|
||||
|
||||
@@ -2102,7 +2102,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
if (nowPlayingClaimBitmap == null &&
|
||||
nowPlayingClaim != null &&
|
||||
!Helper.isNullOrEmpty(nowPlayingClaim.getThumbnailUrl())) {
|
||||
Glide.with(getApplicationContext()).asBitmap().load(nowPlayingClaim.getThumbnailUrl()).into(new CustomTarget<Bitmap>() {
|
||||
Glide.with(getApplicationContext()).asBitmap().load(nowPlayingClaim.getThumbnailUrl(0, 0, 75)).into(new CustomTarget<Bitmap>() {
|
||||
@Override
|
||||
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
|
||||
nowPlayingClaimBitmap = resource;
|
||||
@@ -2781,15 +2781,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
}
|
||||
|
||||
private Fragment getCurrentFragment() {
|
||||
int backCount = getSupportFragmentManager().getBackStackEntryCount();
|
||||
if (backCount > 0) {
|
||||
try {
|
||||
return getSupportFragmentManager().getFragments().get(backCount - 1);
|
||||
} catch (IndexOutOfBoundsException ex) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
return getSupportFragmentManager().findFragmentById(R.id.content_main);
|
||||
}
|
||||
|
||||
public void hideActionBar() {
|
||||
@@ -3495,6 +3487,18 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
||||
return;
|
||||
}
|
||||
|
||||
if (currentFragment != null && ((BaseFragment) currentFragment).getParams() != null
|
||||
&& ((BaseFragment) currentFragment).getParams().containsKey("source")
|
||||
&& ((BaseFragment) currentFragment).getParams().get("source").equals("notification")) {
|
||||
|
||||
Map<String, Object> currentParams = new HashMap<>(1);
|
||||
|
||||
if (((BaseFragment) currentFragment).getParams().containsKey("url"))
|
||||
currentParams.put("url", ((BaseFragment) currentFragment).getParams().get("url"));
|
||||
|
||||
((BaseFragment) currentFragment).setParams(currentParams);
|
||||
}
|
||||
|
||||
//fragment.setRetainInstance(true);
|
||||
FragmentManager manager = getSupportFragmentManager();
|
||||
FragmentTransaction transaction = manager.beginTransaction().replace(R.id.content_main, fragment);
|
||||
|
||||
@@ -95,7 +95,7 @@ public class ChannelFilterListAdapter extends RecyclerView.Adapter<ChannelFilter
|
||||
vh.allView.setVisibility(claim.isPlaceholder() ? View.VISIBLE : View.GONE);
|
||||
|
||||
vh.titleView.setText(Helper.isNullOrEmpty(claim.getTitle()) ? claim.getName() : claim.getTitle());
|
||||
String thumbnailUrl = claim.getThumbnailUrl();
|
||||
String thumbnailUrl = claim.getThumbnailUrl(vh.thumbnailView.getLayoutParams().width, vh.thumbnailView.getLayoutParams().height, 85);
|
||||
if (!Helper.isNullOrEmpty(thumbnailUrl) && context != null) {
|
||||
Glide.with(context.getApplicationContext()).load(thumbnailUrl).apply(RequestOptions.circleCropTransform()).into(vh.thumbnailView);
|
||||
}
|
||||
|
||||
@@ -334,7 +334,8 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
|
||||
if (metadata instanceof Claim.StreamMetadata) {
|
||||
streamMetadata = (Claim.StreamMetadata) metadata;
|
||||
}
|
||||
String thumbnailUrl = item.getThumbnailUrl();
|
||||
|
||||
String thumbnailUrl = item.getThumbnailUrl(vh.thumbnailView.getLayoutParams().width, vh.thumbnailView.getLayoutParams().height, 85);
|
||||
long publishTime = (streamMetadata != null && streamMetadata.getReleaseTime() > 0) ? streamMetadata.getReleaseTime() * 1000 : item.getTimestamp() * 1000;
|
||||
int bgColor = Helper.generateRandomColorForValue(item.getClaimId());
|
||||
if (bgColor == 0) {
|
||||
|
||||
@@ -190,7 +190,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<CommentListAdapter.
|
||||
int bgColor = Helper.generateRandomColorForValue(comment.getChannelId());
|
||||
Helper.setIconViewBackgroundColor(holder.noThumbnailView, bgColor, false, context);
|
||||
if (hasThumbnail) {
|
||||
Glide.with(context.getApplicationContext()).asBitmap().load(comment.getPoster().getThumbnailUrl()).
|
||||
Glide.with(context.getApplicationContext()).asBitmap().load(comment.getPoster().getThumbnailUrl(holder.thumbnailView.getLayoutParams().width, holder.thumbnailView.getLayoutParams().height, 85)).
|
||||
apply(RequestOptions.circleCropTransform()).into(holder.thumbnailView);
|
||||
}
|
||||
holder.alphaView.setText(comment.getChannelName() != null ? comment.getChannelName().substring(1, 2).toUpperCase() : null);
|
||||
|
||||
@@ -193,7 +193,7 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
|
||||
vh.thumbnailView.setVisibility(notification.getCommentAuthor() == null ? View.INVISIBLE : View.VISIBLE);
|
||||
if (notification.getCommentAuthor() != null) {
|
||||
Glide.with(context.getApplicationContext()).load(
|
||||
notification.getCommentAuthor().getThumbnailUrl()).apply(RequestOptions.circleCropTransform()).into(vh.thumbnailView);
|
||||
notification.getCommentAuthor().getThumbnailUrl(vh.thumbnailView.getLayoutParams().width, vh.thumbnailView.getLayoutParams().height, 85)).apply(RequestOptions.circleCropTransform()).into(vh.thumbnailView);
|
||||
}
|
||||
|
||||
vh.iconView.setVisibility(notification.getCommentAuthor() != null ? View.INVISIBLE : View.VISIBLE);
|
||||
|
||||
@@ -89,7 +89,8 @@ public class SuggestedChannelGridAdapter extends RecyclerView.Adapter<SuggestedC
|
||||
@Override
|
||||
public void onBindViewHolder(SuggestedChannelGridAdapter.ViewHolder vh, int position) {
|
||||
Claim claim = items.get(position);
|
||||
String thumbnailUrl = claim.getThumbnailUrl();
|
||||
ViewGroup.LayoutParams lp = vh.thumbnailView.getLayoutParams();
|
||||
String thumbnailUrl = claim.getThumbnailUrl(lp.width, lp.height, 85);
|
||||
|
||||
int bgColor = Helper.generateRandomColorForValue(claim.getClaimId());
|
||||
Helper.setIconViewBackgroundColor(vh.noThumbnailView, bgColor, false, context);
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package io.lbry.browser.model;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.google.gson.FieldNamingPolicy;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
@@ -137,6 +139,14 @@ public class Claim {
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean hasSource() {
|
||||
if (value instanceof StreamMetadata) {
|
||||
StreamMetadata metadata = (StreamMetadata) value;
|
||||
return metadata.getSource() != null;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean isPlayable() {
|
||||
if (value instanceof StreamMetadata) {
|
||||
StreamMetadata metadata = (StreamMetadata) value;
|
||||
@@ -176,6 +186,21 @@ public class Claim {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the URL from the CDN where getting the image file
|
||||
* @param width Pass zero for width and height for the full size image file
|
||||
* @param height Pass zero for width and height for the full size image file
|
||||
* @param q Desired quality for the image to be retrieved
|
||||
* @return URL from the CDN from where image can be retrieved
|
||||
*/
|
||||
public String getThumbnailUrl(int width, int height, int q) {
|
||||
if (value != null && value.getThumbnail() != null) {
|
||||
ImageCDNUrl imageCDNUrl = new ImageCDNUrl(Math.max(width, 0), Math.max(height, 0), q, null, value.getThumbnail().getUrl());
|
||||
return imageCDNUrl.toString();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getCoverUrl() {
|
||||
if (TYPE_CHANNEL.equals(valueType) && value != null && value instanceof ChannelMetadata && ((ChannelMetadata) value).getCover() != null) {
|
||||
return ((ChannelMetadata) value).getCover().getUrl();
|
||||
@@ -483,6 +508,30 @@ public class Claim {
|
||||
private String url;
|
||||
}
|
||||
|
||||
/**
|
||||
* Object to be instantiated. In order to get the URLto the CDN, call toString() on it
|
||||
*/
|
||||
static class ImageCDNUrl {
|
||||
private String appendedPath = "";
|
||||
|
||||
public ImageCDNUrl(int width, int height, int quality, @Nullable String format, String thumbnailUrl) {
|
||||
if (width != 0 && height != 0)
|
||||
appendedPath = "s:".concat(String.valueOf(width)).concat(":").concat(String.valueOf(height)).concat("/");
|
||||
|
||||
appendedPath = appendedPath.concat("quality:").concat(String.valueOf(quality)).concat("/");
|
||||
|
||||
appendedPath = appendedPath.concat("plain/").concat(thumbnailUrl);
|
||||
|
||||
if (format != null)
|
||||
appendedPath = appendedPath.concat("@").concat(format);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
String url = "https://image-processor.vanwanet.com/optimize/";
|
||||
return url.concat(appendedPath);
|
||||
}
|
||||
}
|
||||
@Data
|
||||
public static class StreamInfo {
|
||||
private long duration; // video / audio
|
||||
|
||||
@@ -16,8 +16,10 @@ import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import io.lbry.browser.MainActivity;
|
||||
import io.lbry.browser.data.DatabaseHelper;
|
||||
@@ -47,7 +49,9 @@ public class NotificationListTask extends AsyncTask<Void, Void, List<LbryNotific
|
||||
List<LbryNotification> notifications = new ArrayList<>();
|
||||
SQLiteDatabase db = null;
|
||||
try {
|
||||
JSONArray array = (JSONArray) Lbryio.parseResponse(Lbryio.call("notification", "list", context));
|
||||
Map<String, String> parameters = new HashMap<>(1);
|
||||
parameters.put("is_app_readable", "true");
|
||||
JSONArray array = (JSONArray) Lbryio.parseResponse(Lbryio.call("notification", "list", parameters, context));
|
||||
if (array != null) {
|
||||
for (int i = 0; i < array.length(); i++) {
|
||||
JSONObject item = array.getJSONObject(i);
|
||||
|
||||
@@ -64,7 +64,7 @@ public class BaseFragment extends Fragment {
|
||||
}
|
||||
}
|
||||
|
||||
if (params != null && params.containsKey("source") && "notification".equalsIgnoreCase(params.get("source").toString())) {
|
||||
if (params != null && params.containsKey("source") && params.get("source") != null && "notification".equalsIgnoreCase(params.get("source").toString())) {
|
||||
Context context = getContext();
|
||||
if (context instanceof MainActivity) {
|
||||
((MainActivity) context).navigateBackToNotifications();
|
||||
|
||||
@@ -467,7 +467,7 @@ public class ChannelCommentsFragment extends Fragment implements SdkStatusListen
|
||||
if (hasThumbnail && context != null) {
|
||||
Glide.with(context.getApplicationContext()).
|
||||
asBitmap().
|
||||
load(channel.getThumbnailUrl()).
|
||||
load(channel.getThumbnailUrl(commentPostAsThumbnail.getLayoutParams().width, commentPostAsThumbnail.getLayoutParams().height, 85)).
|
||||
apply(RequestOptions.circleCropTransform()).
|
||||
into(commentPostAsThumbnail);
|
||||
}
|
||||
|
||||
@@ -230,7 +230,8 @@ public class ChannelContentFragment extends Fragment implements DownloadActionLi
|
||||
0,
|
||||
0,
|
||||
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
|
||||
Helper.CONTENT_PAGE_SIZE);
|
||||
Helper.CONTENT_PAGE_SIZE,
|
||||
true);
|
||||
}
|
||||
|
||||
private List<String> getContentSortOrder() {
|
||||
|
||||
@@ -285,7 +285,7 @@ public class ChannelFormFragment extends BaseFragment implements
|
||||
coverUrl = currentClaim.getCoverUrl();
|
||||
}
|
||||
if (!Helper.isNullOrEmpty(currentClaim.getThumbnailUrl())) {
|
||||
Glide.with(context.getApplicationContext()).load(currentClaim.getThumbnailUrl()).apply(RequestOptions.circleCropTransform()).into(imageThumbnail);
|
||||
Glide.with(context.getApplicationContext()).load(currentClaim.getThumbnailUrl(imageThumbnail.getLayoutParams().width, imageThumbnail.getLayoutParams().height, 85)).apply(RequestOptions.circleCropTransform()).into(imageThumbnail);
|
||||
thumbnailUrl = currentClaim.getThumbnailUrl();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,6 +73,7 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
|
||||
private TextView textFollowerCount;
|
||||
private TabLayout tabLayout;
|
||||
private ViewPager2 tabPager;
|
||||
ViewPager2.OnPageChangeCallback opcc;
|
||||
|
||||
private View buttonEdit;
|
||||
private View buttonDelete;
|
||||
@@ -91,6 +92,8 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
|
||||
// if this is set, scroll to the specific comment on load
|
||||
private String commentHash;
|
||||
|
||||
private float floatingWalletPositionY;
|
||||
|
||||
public View onCreateView(@NonNull LayoutInflater inflater,
|
||||
ViewGroup container, Bundle savedInstanceState) {
|
||||
View root = inflater.inflate(R.layout.fragment_channel, container, false);
|
||||
@@ -122,6 +125,25 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
|
||||
tabLayout = root.findViewById(R.id.channel_view_tabs);
|
||||
tabPager.setSaveEnabled(false);
|
||||
|
||||
View floatingBalance = getActivity().findViewById(R.id.floating_balance_main_container);
|
||||
floatingWalletPositionY = floatingBalance.getY();
|
||||
|
||||
opcc = new ViewPager2.OnPageChangeCallback() {
|
||||
@Override
|
||||
public void onPageSelected(int position) {
|
||||
super.onPageSelected(position);
|
||||
|
||||
if (position > 0) {
|
||||
// Hide floating wallet for the About and the Comment tabs as they are mostly text
|
||||
((MainActivity) getContext()).translateFloatingWallet(floatingWalletPositionY);
|
||||
} else {
|
||||
((MainActivity) getContext()).restoreWalletContainerPosition();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
tabPager.registerOnPageChangeCallback(opcc);
|
||||
|
||||
buttonEdit.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
@@ -380,6 +402,15 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
|
||||
super.onPause();
|
||||
}
|
||||
|
||||
public void onStop() {
|
||||
Context context = getContext();
|
||||
if (context instanceof MainActivity) {
|
||||
((MainActivity) context ).restoreWalletContainerPosition();
|
||||
}
|
||||
tabPager.unregisterOnPageChangeCallback(opcc);
|
||||
super.onStop();
|
||||
}
|
||||
|
||||
private void checkParams() {
|
||||
boolean updateRequired = false;
|
||||
Map<String, Object> params = getParams();
|
||||
@@ -507,11 +538,15 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
|
||||
else
|
||||
buttonTip.setVisibility(View.VISIBLE);
|
||||
|
||||
String thumbnailUrl = claim.getThumbnailUrl();
|
||||
String thumbnailUrl = "";
|
||||
String coverUrl = claim.getCoverUrl();
|
||||
textTitle.setText(Helper.isNullOrEmpty(claim.getTitle()) ? claim.getName() : claim.getTitle());
|
||||
|
||||
Context context = getContext();
|
||||
|
||||
if (context != null) {
|
||||
thumbnailUrl = claim.getThumbnailUrl(imageThumbnail.getLayoutParams().width, imageThumbnail.getLayoutParams().height, 85);
|
||||
}
|
||||
if (context != null && !Helper.isNullOrEmpty(coverUrl)) {
|
||||
Glide.with(context.getApplicationContext()).load(coverUrl).centerCrop().into(imageCover);
|
||||
}
|
||||
|
||||
@@ -421,7 +421,8 @@ public class AllContentFragment extends BaseFragment implements DownloadActionLi
|
||||
0,
|
||||
0,
|
||||
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
|
||||
Helper.CONTENT_PAGE_SIZE);
|
||||
Helper.CONTENT_PAGE_SIZE,
|
||||
true);
|
||||
}
|
||||
|
||||
private List<String> getContentSortOrder() {
|
||||
|
||||
@@ -79,7 +79,8 @@ public class EditorsChoiceFragment extends BaseFragment {
|
||||
Arrays.asList(Claim.ORDER_BY_RELEASE_TIME),
|
||||
null,
|
||||
1,
|
||||
99);
|
||||
99,
|
||||
true);
|
||||
}
|
||||
|
||||
public void onResume() {
|
||||
|
||||
@@ -12,6 +12,7 @@ import android.graphics.Color;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.os.Environment;
|
||||
import android.text.Editable;
|
||||
import android.text.TextWatcher;
|
||||
import android.text.format.DateUtils;
|
||||
@@ -52,7 +53,8 @@ import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.github.chrisbanes.photoview.PhotoView;
|
||||
import com.google.android.exoplayer2.C;
|
||||
import com.google.android.exoplayer2.DefaultControlDispatcher;
|
||||
//import com.google.android.exoplayer2.DefaultControlDispatcher;
|
||||
import com.google.android.exoplayer2.ForwardingPlayer;
|
||||
import com.google.android.exoplayer2.ParserException;
|
||||
import com.google.android.exoplayer2.PlaybackParameters;
|
||||
import com.google.android.exoplayer2.Player;
|
||||
@@ -64,10 +66,11 @@ import com.google.android.exoplayer2.source.MediaSource;
|
||||
import com.google.android.exoplayer2.source.ProgressiveMediaSource;
|
||||
import com.google.android.exoplayer2.ui.PlayerControlView;
|
||||
import com.google.android.exoplayer2.ui.PlayerView;
|
||||
import com.google.android.exoplayer2.ui.StyledPlayerView;
|
||||
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
|
||||
import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy;
|
||||
import com.google.android.exoplayer2.upstream.Loader;
|
||||
import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
|
||||
//import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
|
||||
import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
|
||||
import com.google.android.exoplayer2.upstream.cache.SimpleCache;
|
||||
import com.google.android.exoplayer2.util.Util;
|
||||
@@ -87,8 +90,12 @@ import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.text.DecimalFormat;
|
||||
import java.text.NumberFormat;
|
||||
import java.util.ArrayList;
|
||||
@@ -162,6 +169,10 @@ import io.lbry.lbrysdk.DownloadManager;
|
||||
import io.lbry.lbrysdk.LbrynetService;
|
||||
import io.lbry.lbrysdk.Utils;
|
||||
|
||||
import static android.os.Environment.DIRECTORY_DOWNLOADS;
|
||||
import static android.os.Environment.DIRECTORY_MOVIES;
|
||||
import static android.os.Environment.DIRECTORY_PICTURES;
|
||||
|
||||
public class FileViewFragment extends BaseFragment implements
|
||||
MainActivity.BackPressInterceptor,
|
||||
DownloadActionListener,
|
||||
@@ -191,7 +202,8 @@ public class FileViewFragment extends BaseFragment implements
|
||||
private ClaimListAdapter relatedContentAdapter;
|
||||
private CommentListAdapter commentListAdapter;
|
||||
private BroadcastReceiver sdkReceiver;
|
||||
private Player.EventListener fileViewPlayerListener;
|
||||
//private Player.EventListener fileViewPlayerListener;
|
||||
private Player.Listener fileViewPlayerListener;
|
||||
|
||||
private long elapsedDuration = 0;
|
||||
private long totalDuration = 0;
|
||||
@@ -287,7 +299,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
|
||||
initUi(root);
|
||||
|
||||
fileViewPlayerListener = new Player.EventListener() {
|
||||
fileViewPlayerListener = new Player.Listener() {
|
||||
@Override
|
||||
public void onPlaybackStateChanged(@Player.State int playbackState) {
|
||||
if (playbackState == Player.STATE_READY) {
|
||||
@@ -307,7 +319,10 @@ public class FileViewFragment extends BaseFragment implements
|
||||
hideBuffering();
|
||||
|
||||
if (loadingNewClaim) {
|
||||
MainActivity.appPlayer.setPlayWhenReady(Objects.requireNonNull((MainActivity) (getActivity())).isMediaAutoplayEnabled());
|
||||
Context context = getContext();
|
||||
if (context instanceof MainActivity) {
|
||||
MainActivity.appPlayer.setPlayWhenReady(((MainActivity) context).isMediaAutoplayEnabled());
|
||||
}
|
||||
loadingNewClaim = false;
|
||||
}
|
||||
} else if (playbackState == Player.STATE_BUFFERING) {
|
||||
@@ -1196,18 +1211,19 @@ public class FileViewFragment extends BaseFragment implements
|
||||
}
|
||||
});
|
||||
|
||||
PlayerView playerView = root.findViewById(R.id.file_view_exoplayer_view);
|
||||
StyledPlayerView playerView = root.findViewById(R.id.file_view_exoplayer_view);
|
||||
View playbackSpeedContainer = playerView.findViewById(R.id.player_playback_speed);
|
||||
TextView textPlaybackSpeed = playerView.findViewById(R.id.player_playback_speed_label);
|
||||
textPlaybackSpeed.setText(DEFAULT_PLAYBACK_SPEED);
|
||||
|
||||
/* TODO: Removed until better method is rewritten
|
||||
playerView.setControlDispatcher(new DefaultControlDispatcher() {
|
||||
@Override
|
||||
public boolean dispatchSetPlayWhenReady(Player player, boolean playWhenReady) {
|
||||
isPlaying = playWhenReady;
|
||||
return super.dispatchSetPlayWhenReady(player, playWhenReady);
|
||||
}
|
||||
});
|
||||
});*/
|
||||
|
||||
playbackSpeedContainer.setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
|
||||
@Override
|
||||
@@ -1514,7 +1530,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
Helper.setViewVisibility(layoutLoadingState, View.GONE);
|
||||
Helper.setViewVisibility(layoutNothingAtLocation, View.GONE);
|
||||
|
||||
if (claim.getTags().contains("disable-support") || claim.getSigningChannel().getTags().contains("disable-support"))
|
||||
if ((claim.getTags() != null && claim.getTags().contains("disable-support")) || (claim.getSigningChannel() != null && claim.getSigningChannel().getTags().contains("disable-support")))
|
||||
Helper.setViewVisibility(tipButton, View.GONE);
|
||||
else
|
||||
Helper.setViewVisibility(tipButton, View.VISIBLE);
|
||||
@@ -1557,7 +1573,8 @@ public class FileViewFragment extends BaseFragment implements
|
||||
int bgColor = Helper.generateRandomColorForValue(signingChannel.getClaimId());
|
||||
Helper.setIconViewBackgroundColor(root.findViewById(R.id.file_view_publisher_no_thumbnail), bgColor, false, context);
|
||||
if (hasPublisherThumbnail && context != null) {
|
||||
Glide.with(context.getApplicationContext()).load(signingChannel.getThumbnailUrl()).
|
||||
ViewGroup.LayoutParams lp = root.findViewById(R.id.file_view_publisher_thumbnail).getLayoutParams();
|
||||
Glide.with(context.getApplicationContext()).load(signingChannel.getThumbnailUrl(lp.width, lp.height, 85)).
|
||||
apply(RequestOptions.circleCropTransform()).into((ImageView) root.findViewById(R.id.file_view_publisher_thumbnail));
|
||||
}
|
||||
((TextView) root.findViewById(R.id.file_view_publisher_thumbnail_alpha)).
|
||||
@@ -1597,7 +1614,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
Claim.GenericMetadata metadata = claim.getValue();
|
||||
if (!Helper.isNullOrEmpty(claim.getThumbnailUrl())) {
|
||||
ImageView thumbnailView = root.findViewById(R.id.file_view_thumbnail);
|
||||
Glide.with(context.getApplicationContext()).asBitmap().load(claim.getThumbnailUrl()).centerCrop().into(thumbnailView);
|
||||
Glide.with(context.getApplicationContext()).asBitmap().load(claim.getThumbnailUrl(context.getResources().getDisplayMetrics().widthPixels, thumbnailView.getLayoutParams().height, 85)).centerCrop().into(thumbnailView);
|
||||
} else {
|
||||
// display first x letters of claim name, with random background
|
||||
}
|
||||
@@ -1617,7 +1634,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
root.findViewById(R.id.file_view_open_external_button).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
openClaimExternally(claim, claim.getMediaType());
|
||||
openClaimExternally(claim, claim.getMediaType(), !claim.hasSource());
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1675,12 +1692,16 @@ public class FileViewFragment extends BaseFragment implements
|
||||
restoreMainActionButton();
|
||||
}
|
||||
|
||||
if (Lbry.SDK_READY && !claim.isPlayable() && !claim.isViewable() && Helper.isNullOrEmpty(commentHash)) {
|
||||
if (claim.getFile() == null) {
|
||||
loadFile();
|
||||
} else {
|
||||
// file already loaded, but it's unsupported
|
||||
if (Lbry.SDK_READY) {
|
||||
if (!claim.hasSource()) {
|
||||
showUnsupportedView();
|
||||
} else if (!claim.isPlayable() && !claim.isViewable() && Helper.isNullOrEmpty(commentHash)) {
|
||||
if (claim.getFile() == null) {
|
||||
loadFile();
|
||||
} else {
|
||||
// file already loaded, but it's unsupported
|
||||
showUnsupportedView();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1704,7 +1725,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
View commentsDisabledText = root.findViewById(R.id.file_view_disabled_comments);
|
||||
View commentForm = root.findViewById(R.id.container_comment_form);
|
||||
RecyclerView commentsList = root.findViewById(R.id.file_view_comments_list);
|
||||
if (claim.getTags().contains("disable-comments") || claim.getSigningChannel().getTags().contains("disable-comments")) {
|
||||
if ((claim.getTags() != null && (claim.getTags().contains("disable-comments")) || (claim.getSigningChannel() != null && claim.getSigningChannel().getTags().contains("disable-comments")))) {
|
||||
Helper.setViewVisibility(commentsDisabledText, View.VISIBLE);
|
||||
Helper.setViewVisibility(commentForm, View.GONE);
|
||||
Helper.setViewVisibility(commentsList, View.GONE);
|
||||
@@ -1724,13 +1745,19 @@ public class FileViewFragment extends BaseFragment implements
|
||||
if (root != null) {
|
||||
root.findViewById(R.id.file_view_exoplayer_container).setVisibility(View.GONE);
|
||||
root.findViewById(R.id.file_view_unsupported_container).setVisibility(View.VISIBLE);
|
||||
String fileNameString = "";
|
||||
if (claim.getFile() != null && !Helper.isNullOrEmpty(claim.getFile().getDownloadPath())) {
|
||||
LbryFile lbryFile = claim.getFile();
|
||||
File file = new File(lbryFile.getDownloadPath());
|
||||
fileNameString = String.format("\"%s\" ", file.getName());
|
||||
if (claim.hasSource()) {
|
||||
String fileNameString = "";
|
||||
if (claim.getFile() != null && !Helper.isNullOrEmpty(claim.getFile().getDownloadPath())) {
|
||||
LbryFile lbryFile = claim.getFile();
|
||||
File file = new File(lbryFile.getDownloadPath());
|
||||
fileNameString = String.format("\"%s\" ", file.getName());
|
||||
}
|
||||
((TextView) root.findViewById(R.id.file_view_unsupported_text)).setText(getString(R.string.unsupported_content_desc, fileNameString));
|
||||
((MaterialButton) root.findViewById(R.id.file_view_open_external_button)).setText(getString(R.string.open));
|
||||
} else {
|
||||
((TextView) root.findViewById(R.id.file_view_unsupported_text)).setText(getString(R.string.unsupported_content_to_odysee_desc));
|
||||
((MaterialButton) root.findViewById(R.id.file_view_open_external_button)).setText(getString(R.string.open_on_odysee_com));
|
||||
}
|
||||
((TextView) root.findViewById(R.id.file_view_unsupported_text)).setText(getString(R.string.unsupported_content_desc, fileNameString));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1749,7 +1776,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
if (MainActivity.appPlayer == null && context != null) {
|
||||
AudioAttributes audioAttributes = new AudioAttributes.Builder()
|
||||
.setUsage(C.USAGE_MEDIA)
|
||||
.setContentType(C.CONTENT_TYPE_MOVIE)
|
||||
.setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
|
||||
.build();
|
||||
|
||||
MainActivity.appPlayer = new SimpleExoPlayer.Builder(context).build();
|
||||
@@ -2182,7 +2209,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
handled = true;
|
||||
}
|
||||
} else {
|
||||
openClaimExternally(claim, mediaType);
|
||||
openClaimExternally(claim, mediaType, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2266,15 +2293,25 @@ public class FileViewFragment extends BaseFragment implements
|
||||
" </html>";
|
||||
}
|
||||
|
||||
private void openClaimExternally(Claim claim, String mediaType) {
|
||||
Uri fileUri = Uri.parse(claim.getFile().getDownloadPath());
|
||||
private void openClaimExternally(Claim claim, String mediaType, boolean odyseeLink) {
|
||||
if (odyseeLink) {
|
||||
try {
|
||||
LbryUri lbryUri = LbryUri.parse(claim.getCanonicalUrl());
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(lbryUri.toOdyseeString()));
|
||||
startActivity(intent);
|
||||
} catch (LbryUriException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else {
|
||||
Uri fileUri = Uri.parse(claim.getFile().getDownloadPath());
|
||||
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(Intent.ACTION_VIEW);
|
||||
intent.setDataAndType(fileUri, mediaType.toLowerCase());
|
||||
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
Intent chooser = Intent.createChooser(intent, getString(R.string.choose_app));
|
||||
startActivityForResult(chooser, 419);
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(Intent.ACTION_VIEW);
|
||||
intent.setDataAndType(fileUri, mediaType.toLowerCase());
|
||||
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
Intent chooser = Intent.createChooser(intent, getString(R.string.choose_app));
|
||||
startActivityForResult(chooser, 419);
|
||||
}
|
||||
}
|
||||
|
||||
public void showError(String message) {
|
||||
@@ -2844,6 +2881,41 @@ public class FileViewFragment extends BaseFragment implements
|
||||
downloadInProgress = false;
|
||||
downloadProgressView.setProgress(100);
|
||||
Helper.setViewVisibility(downloadProgressView, View.GONE);
|
||||
|
||||
// Copy file to shared Downloads folder
|
||||
// TODO Assign this folder when downloading instead of copying the file
|
||||
|
||||
File fileFolder;
|
||||
|
||||
if (claimFile.getMimeType().contains("video"))
|
||||
fileFolder = Environment.getExternalStoragePublicDirectory(DIRECTORY_MOVIES);
|
||||
else if (claimFile.getMimeType().contains("image") || claimFile.getMimeType().contains("picture"))
|
||||
fileFolder = Environment.getExternalStoragePublicDirectory(DIRECTORY_PICTURES);
|
||||
else
|
||||
fileFolder = Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS);
|
||||
|
||||
InputStream in = null;
|
||||
OutputStream out;
|
||||
try {
|
||||
in = new FileInputStream(claimFile.getDownloadPath());
|
||||
|
||||
out = new FileOutputStream(new File(fileFolder, claimFile.getFileName()));
|
||||
|
||||
byte[] buf = new byte[1024];
|
||||
int len;
|
||||
|
||||
while ((len = in.read(buf)) > 0) {
|
||||
out.write(buf, 0, len);
|
||||
}
|
||||
|
||||
in.close();
|
||||
out.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
|
||||
playOrViewMedia();
|
||||
}
|
||||
checkIsFileComplete();
|
||||
@@ -2972,14 +3044,6 @@ public class FileViewFragment extends BaseFragment implements
|
||||
}
|
||||
|
||||
public static class StreamLoadErrorPolicy extends DefaultLoadErrorHandlingPolicy {
|
||||
@Override
|
||||
public long getRetryDelayMsFor(int dataType, long loadDurationMs, IOException exception, int errorCount) {
|
||||
return exception instanceof ParserException
|
||||
|| exception instanceof FileNotFoundException
|
||||
|| exception instanceof Loader.UnexpectedLoaderException
|
||||
? C.TIME_UNSET
|
||||
: Math.min((errorCount - 1) * 1000, 5000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMinimumLoadableRetryCount(int dataType) {
|
||||
@@ -3179,7 +3243,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
if (hasThumbnail && context != null) {
|
||||
Glide.with(context.getApplicationContext()).
|
||||
asBitmap().
|
||||
load(channel.getThumbnailUrl()).
|
||||
load(channel.getThumbnailUrl(commentPostAsThumbnail.getLayoutParams().width, commentPostAsThumbnail.getLayoutParams().height, 85)).
|
||||
apply(RequestOptions.circleCropTransform()).
|
||||
into(commentPostAsThumbnail);
|
||||
}
|
||||
|
||||
@@ -415,7 +415,8 @@ public class FollowingFragment extends BaseFragment implements
|
||||
Arrays.asList(Claim.ORDER_BY_EFFECTIVE_AMOUNT),
|
||||
null,
|
||||
currentSuggestedPage == 0 ? 1 : currentSuggestedPage,
|
||||
SUGGESTED_PAGE_SIZE);
|
||||
SUGGESTED_PAGE_SIZE,
|
||||
true);
|
||||
}
|
||||
|
||||
private Map<String, Object> buildContentOptions() {
|
||||
@@ -437,7 +438,8 @@ public class FollowingFragment extends BaseFragment implements
|
||||
0,
|
||||
0,
|
||||
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
|
||||
Helper.CONTENT_PAGE_SIZE);
|
||||
Helper.CONTENT_PAGE_SIZE,
|
||||
true);
|
||||
}
|
||||
|
||||
private List<String> getChannelIds() {
|
||||
|
||||
@@ -21,6 +21,7 @@ import androidx.annotation.NonNull;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
||||
import com.google.android.exoplayer2.C;
|
||||
import com.google.android.exoplayer2.MediaItem;
|
||||
import com.google.android.exoplayer2.Player;
|
||||
import com.google.android.exoplayer2.SimpleExoPlayer;
|
||||
import com.google.android.exoplayer2.audio.AudioAttributes;
|
||||
@@ -29,8 +30,10 @@ import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
|
||||
import com.google.android.exoplayer2.source.MediaSource;
|
||||
import com.google.android.exoplayer2.source.ProgressiveMediaSource;
|
||||
import com.google.android.exoplayer2.ui.PlayerView;
|
||||
import com.google.android.exoplayer2.upstream.DefaultDataSource;
|
||||
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
|
||||
import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
|
||||
import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
|
||||
import com.google.android.exoplayer2.upstream.cache.CacheDataSource.Factory;
|
||||
import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
|
||||
import com.google.android.exoplayer2.upstream.cache.SimpleCache;
|
||||
import com.google.android.exoplayer2.util.Util;
|
||||
@@ -88,7 +91,7 @@ public class ShuffleFragment extends BaseFragment {
|
||||
private boolean isPlaying;
|
||||
private boolean newPlayerCreated;
|
||||
private String currentUrl;
|
||||
private Player.EventListener playerListener;
|
||||
private Player.Listener playerListener;
|
||||
|
||||
public View onCreateView(@NonNull LayoutInflater inflater,
|
||||
ViewGroup container, Bundle savedInstanceState) {
|
||||
@@ -97,7 +100,7 @@ public class ShuffleFragment extends BaseFragment {
|
||||
surfModeLoading = root.findViewById(R.id.shuffle_loading);
|
||||
textTitle = root.findViewById(R.id.shuffle_content_title);
|
||||
textPublisher = root.findViewById(R.id.shuffle_content_publisher);
|
||||
playerListener = new Player.EventListener() {
|
||||
playerListener = new Player.Listener() {
|
||||
@Override
|
||||
public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
|
||||
if (playbackState == Player.STATE_READY) {
|
||||
@@ -210,7 +213,8 @@ public class ShuffleFragment extends BaseFragment {
|
||||
121, // 2 minutes or less
|
||||
1,
|
||||
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
|
||||
PAGE_SIZE);
|
||||
PAGE_SIZE,
|
||||
true);
|
||||
}
|
||||
|
||||
public void onStart() {
|
||||
@@ -444,7 +448,7 @@ public class ShuffleFragment extends BaseFragment {
|
||||
if (MainActivity.appPlayer == null && context != null) {
|
||||
AudioAttributes audioAttributes = new AudioAttributes.Builder()
|
||||
.setUsage(C.USAGE_MEDIA)
|
||||
.setContentType(C.CONTENT_TYPE_MOVIE)
|
||||
.setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
|
||||
.build();
|
||||
|
||||
MainActivity.appPlayer = new SimpleExoPlayer.Builder(context).build();
|
||||
@@ -497,9 +501,9 @@ public class ShuffleFragment extends BaseFragment {
|
||||
String userAgent = Util.getUserAgent(context, getString(R.string.app_name));
|
||||
String mediaSourceUrl = getStreamingUrl();
|
||||
MediaSource mediaSource = new ProgressiveMediaSource.Factory(
|
||||
new CacheDataSourceFactory(MainActivity.playerCache, new DefaultDataSourceFactory(context, userAgent)),
|
||||
new CacheDataSource.Factory().setCache(MainActivity.playerCache).setUpstreamDataSourceFactory( new DefaultDataSource.Factory(context)),
|
||||
new DefaultExtractorsFactory()
|
||||
).setLoadErrorHandlingPolicy(new FileViewFragment.StreamLoadErrorPolicy()).createMediaSource(Uri.parse(mediaSourceUrl));
|
||||
).setLoadErrorHandlingPolicy(new FileViewFragment.StreamLoadErrorPolicy()).createMediaSource(MediaItem.fromUri(Uri.parse(mediaSourceUrl)));
|
||||
|
||||
MainActivity.appPlayer.prepare(mediaSource, true, true);
|
||||
}
|
||||
|
||||
@@ -583,7 +583,9 @@ public class PublishFormFragment extends BaseFragment implements
|
||||
Context context = getContext();
|
||||
try {
|
||||
Claim.StreamMetadata metadata = (Claim.StreamMetadata) currentClaim.getValue();
|
||||
uploadedThumbnailUrl = currentClaim.getThumbnailUrl();
|
||||
if (context != null) {
|
||||
uploadedThumbnailUrl = currentClaim.getThumbnailUrl(imageThumbnail.getLayoutParams().width, imageThumbnail.getLayoutParams().height, 85);
|
||||
}
|
||||
if (context != null && !Helper.isNullOrEmpty(uploadedThumbnailUrl)) {
|
||||
Glide.with(context.getApplicationContext()).load(uploadedThumbnailUrl).centerCrop().into(imageThumbnail);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package io.lbry.browser.ui.wallet;
|
||||
import android.content.ClipData;
|
||||
import android.content.ClipboardManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.graphics.Color;
|
||||
import android.net.Uri;
|
||||
@@ -33,6 +34,14 @@ import com.google.android.material.snackbar.Snackbar;
|
||||
import com.google.android.material.switchmaterial.SwitchMaterial;
|
||||
import com.google.android.material.textfield.TextInputEditText;
|
||||
|
||||
import org.json.JSONObject;
|
||||
|
||||
import okhttp3.OkHttpClient;
|
||||
import okhttp3.Request;
|
||||
import okhttp3.Response;
|
||||
import okhttp3.ResponseBody;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.math.BigDecimal;
|
||||
import java.net.URLEncoder;
|
||||
@@ -44,10 +53,17 @@ import java.text.DecimalFormatSymbols;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
import javax.crypto.Mac;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
|
||||
import com.google.zxing.integration.android.IntentIntegrator;
|
||||
import com.google.zxing.integration.android.IntentResult;
|
||||
|
||||
import io.lbry.browser.MainActivity;
|
||||
import io.lbry.browser.R;
|
||||
import io.lbry.browser.adapter.TransactionListAdapter;
|
||||
@@ -105,6 +121,7 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
|
||||
private ImageButton buttonCopyReceiveAddress;
|
||||
private MaterialButton buttonGetNewAddress;
|
||||
private TextInputEditText inputSendAddress;
|
||||
private ImageButton buttonQRScanAddress;
|
||||
private TextInputEditText inputSendAmount;
|
||||
private MaterialButton buttonSend;
|
||||
private TextView textConnectedEmail;
|
||||
@@ -150,6 +167,7 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
|
||||
buttonCopyReceiveAddress = root.findViewById(R.id.wallet_copy_receive_address);
|
||||
buttonGetNewAddress = root.findViewById(R.id.wallet_get_new_address);
|
||||
inputSendAddress = root.findViewById(R.id.wallet_input_send_address);
|
||||
buttonQRScanAddress = root.findViewById(R.id.wallet_qr_scan_address);
|
||||
inputSendAmount = root.findViewById(R.id.wallet_input_amount);
|
||||
buttonSend = root.findViewById(R.id.wallet_send);
|
||||
textConnectedEmail = root.findViewById(R.id.wallet_connected_email);
|
||||
@@ -291,6 +309,44 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
|
||||
}
|
||||
});
|
||||
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
|
||||
// This will return /true/ if user IP is **not** on the US or the request fails
|
||||
Future<Boolean> localeFuture = executor.submit(() -> {
|
||||
Request request = new Request.Builder().url("https://api.lbry.com/locale/get").build();
|
||||
OkHttpClient okHttpClient = new OkHttpClient();
|
||||
|
||||
try (Response response = okHttpClient.newCall(request).execute()){
|
||||
ResponseBody responseBody = response.body();
|
||||
JSONObject responseJson;
|
||||
|
||||
if (responseBody != null)
|
||||
responseJson = new JSONObject(responseBody.string());
|
||||
else
|
||||
return false;
|
||||
|
||||
if (responseJson.has("data") && responseJson.getBoolean("success")) {
|
||||
JSONObject dataJson = (JSONObject) responseJson.get("data");
|
||||
return !dataJson.getString("country").equals("US");
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
try {
|
||||
Boolean isNotUS = localeFuture.get();
|
||||
if (isNotUS)
|
||||
textConvertCreditsBittrex.setVisibility(View.VISIBLE);
|
||||
else
|
||||
textConvertCreditsBittrex.setVisibility(View.GONE);
|
||||
} catch (ExecutionException | InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
buttonSignUp.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
@@ -318,6 +374,13 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
|
||||
copyReceiveAddress();
|
||||
}
|
||||
});
|
||||
buttonQRScanAddress.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
IntentIntegrator intentIntegrator = IntentIntegrator.forSupportFragment(WalletFragment.this);
|
||||
intentIntegrator.setOrientationLocked(false).initiateScan();
|
||||
}
|
||||
});
|
||||
buttonSend.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
@@ -638,7 +701,7 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
|
||||
double totalBalance = walletBalance.getTotal().doubleValue();
|
||||
double spendableBalance = walletBalance.getAvailable().doubleValue();
|
||||
double supportingBalance = walletBalance.getClaims().doubleValue() + walletBalance.getTips().doubleValue() + walletBalance.getSupports().doubleValue();
|
||||
double usdBalance = spendableBalance * Lbryio.LBCUSDRate;
|
||||
double usdBalance = totalBalance * Lbryio.LBCUSDRate;
|
||||
double tipsBalance = walletBalance.getTips().doubleValue();
|
||||
|
||||
if (detailRows == null)
|
||||
@@ -750,4 +813,12 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
|
||||
checkRewardsDriverCard(rewardsDriverText, 0);
|
||||
}
|
||||
}
|
||||
|
||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
if (requestCode == IntentIntegrator.REQUEST_CODE) {
|
||||
IntentResult intentResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
|
||||
String code = intentResult.getContents();
|
||||
inputSendAddress.setText(code);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -373,7 +373,7 @@ public final class Lbry {
|
||||
|
||||
// build claim search for surf mode
|
||||
public static Map<String, Object> buildClaimSearchOptions(
|
||||
String claimType, List<String> notTags, List<String> channelIds, List<String> orderBy, long maxDuration, int limitClaimsPerChannel, int page, int pageSize) {
|
||||
String claimType, List<String> notTags, List<String> channelIds, List<String> orderBy, long maxDuration, int limitClaimsPerChannel, int page, int pageSize, boolean hasSource) {
|
||||
return buildClaimSearchOptions(
|
||||
Collections.singletonList(claimType),
|
||||
null,
|
||||
@@ -385,7 +385,8 @@ public final class Lbry {
|
||||
maxDuration,
|
||||
limitClaimsPerChannel,
|
||||
page,
|
||||
pageSize);
|
||||
pageSize,
|
||||
hasSource);
|
||||
}
|
||||
|
||||
public static Map<String, Object> buildClaimSearchOptions(
|
||||
@@ -397,7 +398,8 @@ public final class Lbry {
|
||||
List<String> orderBy,
|
||||
String releaseTime,
|
||||
int page,
|
||||
int pageSize) {
|
||||
int pageSize,
|
||||
boolean hasSource) {
|
||||
return buildClaimSearchOptions(
|
||||
Collections.singletonList(claimType),
|
||||
anyTags,
|
||||
@@ -409,7 +411,8 @@ public final class Lbry {
|
||||
0,
|
||||
0,
|
||||
page,
|
||||
pageSize);
|
||||
pageSize,
|
||||
hasSource);
|
||||
}
|
||||
|
||||
public static Map<String, Object> buildClaimSearchOptions(
|
||||
@@ -423,7 +426,8 @@ public final class Lbry {
|
||||
long maxDuration,
|
||||
int limitClaimsPerChannel,
|
||||
int page,
|
||||
int pageSize) {
|
||||
int pageSize,
|
||||
boolean hasSource) {
|
||||
Map<String, Object> options = new HashMap<>();
|
||||
if (claimType != null && claimType.size() > 0) {
|
||||
options.put("claim_type", claimType);
|
||||
@@ -441,6 +445,12 @@ public final class Lbry {
|
||||
options.put("limit_claims_per_channel", limitClaimsPerChannel);
|
||||
}
|
||||
|
||||
if (hasSource) {
|
||||
options.put("has_source", true);
|
||||
} else {
|
||||
options.put("has_no_source", true);
|
||||
}
|
||||
|
||||
addClaimSearchListOption("any_tags", anyTags, options);
|
||||
addClaimSearchListOption("not_tags", notTags, options);
|
||||
addClaimSearchListOption("channel_ids", channelIds, options);
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
package io.lbry.browser.utils;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLDecoder;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
@@ -8,9 +11,12 @@ import java.util.regex.Pattern;
|
||||
import io.lbry.browser.exceptions.LbryUriException;
|
||||
import lombok.Data;
|
||||
|
||||
import static org.apache.commons.codec.CharEncoding.UTF_8;
|
||||
|
||||
@Data
|
||||
public class LbryUri {
|
||||
public static final String LBRY_TV_BASE_URL = "https://lbry.tv/";
|
||||
public static final String ODYSEE_COM_BASE_URL = "https://odysee.com/";
|
||||
public static final String PROTO_DEFAULT = "lbry://";
|
||||
public static final String REGEX_INVALID_URI = "[ =&#:$@%?;/\\\\\"<>%\\{\\}|^~\\[\\]`\u0000-\u0008\u000b-\u000c\u000e-\u001F\uD800-\uDFFF\uFFFE-\uFFFF]";
|
||||
public static final String REGEX_ADDRESS = "^(b)(?=[^0OIl]{32,33})[0-9A-Za-z]{32,33}$";
|
||||
@@ -117,10 +123,17 @@ public class LbryUri {
|
||||
}
|
||||
}
|
||||
|
||||
String streamOrChannelName = components.get(2);
|
||||
String streamOrChannelName = null;
|
||||
String possibleStreamName = null;
|
||||
try {
|
||||
// Using java.net.URLDecoder to be able to quickly unit test
|
||||
streamOrChannelName = URLDecoder.decode(components.get(2), UTF_8);
|
||||
possibleStreamName = URLDecoder.decode(components.get(6), UTF_8);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
String primaryModSeparator = components.get(3);
|
||||
String primaryModValue = components.get(4);
|
||||
String possibleStreamName = components.get(6);
|
||||
String secondaryModSeparator = components.get(7);
|
||||
String secondaryModValue = components.get(8);
|
||||
|
||||
@@ -128,20 +141,6 @@ public class LbryUri {
|
||||
boolean isChannel = includesChannel && Helper.isNullOrEmpty(possibleStreamName);
|
||||
String channelName = includesChannel && streamOrChannelName.length() > 1 ? streamOrChannelName.substring(1) : null;
|
||||
|
||||
/*
|
||||
* It would have thrown already on the RegEx parser if protocol value was incorrect
|
||||
* or HTTPS host was unknown to us.
|
||||
*
|
||||
* [https://] hosts use ':' as ModSeparators while [lbry://] protocol expects '#'
|
||||
*/
|
||||
|
||||
if (!components.get(1).isEmpty()) {
|
||||
if (primaryModSeparator.equals(":"))
|
||||
primaryModSeparator = "#";
|
||||
if (secondaryModSeparator.equals(":"))
|
||||
secondaryModSeparator = "#";
|
||||
}
|
||||
|
||||
if (includesChannel) {
|
||||
if (Helper.isNullOrEmpty(channelName)) {
|
||||
throw new LbryUriException("No channel name after @.");
|
||||
@@ -188,7 +187,18 @@ public class LbryUri {
|
||||
if (channelName != null) {
|
||||
formattedChannelName = channelName.startsWith("@") ? channelName : String.format("@%s", channelName);
|
||||
}
|
||||
String primaryClaimName = claimName;
|
||||
String primaryClaimName = null;
|
||||
|
||||
if ((protocol.equals(LBRY_TV_BASE_URL) || protocol.equals(ODYSEE_COM_BASE_URL)) && Helper.isNullOrEmpty(formattedChannelName)) {
|
||||
try {
|
||||
primaryClaimName = URLEncoder.encode(claimName, UTF_8);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else {
|
||||
primaryClaimName = claimName;
|
||||
}
|
||||
|
||||
if (Helper.isNullOrEmpty(primaryClaimName)) {
|
||||
primaryClaimName = contentName;
|
||||
}
|
||||
@@ -218,12 +228,20 @@ public class LbryUri {
|
||||
secondaryClaimName = contentName;
|
||||
}
|
||||
if (Helper.isNullOrEmpty(secondaryClaimName)) {
|
||||
secondaryClaimName = !Helper.isNullOrEmpty(formattedChannelName) ? streamName : null;
|
||||
if (protocol.equals(LBRY_TV_BASE_URL) || protocol.equals(ODYSEE_COM_BASE_URL)) {
|
||||
try {
|
||||
secondaryClaimName = !Helper.isNullOrEmpty(formattedChannelName) ? URLEncoder.encode(streamName, UTF_8) : null;
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else {
|
||||
secondaryClaimName = !Helper.isNullOrEmpty(formattedChannelName) ? streamName : null;
|
||||
}
|
||||
}
|
||||
String secondaryClaimId = !Helper.isNullOrEmpty(secondaryClaimName) ? streamClaimId : null;
|
||||
|
||||
if (!Helper.isNullOrEmpty(primaryClaimId)) {
|
||||
if (protocol.equals(LBRY_TV_BASE_URL))
|
||||
if (protocol.equals(LBRY_TV_BASE_URL) || protocol.equals(ODYSEE_COM_BASE_URL))
|
||||
sb.append(':').append(primaryClaimId);
|
||||
else
|
||||
sb.append('#').append(primaryClaimId);
|
||||
@@ -238,7 +256,7 @@ public class LbryUri {
|
||||
}
|
||||
|
||||
if (!Helper.isNullOrEmpty(secondaryClaimId)) {
|
||||
if (protocol.equals(LBRY_TV_BASE_URL))
|
||||
if (protocol.equals(LBRY_TV_BASE_URL) || protocol.equals(ODYSEE_COM_BASE_URL))
|
||||
sb.append(':').append(secondaryClaimId);
|
||||
else
|
||||
sb.append('#').append(secondaryClaimId);
|
||||
@@ -258,6 +276,9 @@ public class LbryUri {
|
||||
public String toTvString() {
|
||||
return build(true, LBRY_TV_BASE_URL, false);
|
||||
}
|
||||
public String toOdyseeString() {
|
||||
return build(true, ODYSEE_COM_BASE_URL, false);
|
||||
}
|
||||
public String toVanityString() {
|
||||
return build(true, PROTO_DEFAULT, true);
|
||||
}
|
||||
@@ -294,9 +315,9 @@ public class LbryUri {
|
||||
throw new LbryUriException(String.format("No modifier provided after separator %s", modSeparator));
|
||||
}
|
||||
|
||||
if ("#".equals(modSeparator)) {
|
||||
if ("#".equals(modSeparator) || ":".equals(modSeparator)) {
|
||||
claimId = modValue;
|
||||
} else if (":".equals(modSeparator)) {
|
||||
} else if ("*".equals(modSeparator)) {
|
||||
claimSequence = Helper.parseInt(modValue, -1);
|
||||
} else if ("$".equals(modSeparator)) {
|
||||
bidPosition = Helper.parseInt(modValue, -1);
|
||||
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M9.5,6.5v3h-3v-3H9.5M11,5H5v6h6V5L11,5zM9.5,14.5v3h-3v-3H9.5M11,13H5v6h6V13L11,13zM17.5,6.5v3h-3v-3H17.5M19,5h-6v6h6V5L19,5zM13,13h1.5v1.5H13V13zM14.5,14.5H16V16h-1.5V14.5zM16,13h1.5v1.5H16V13zM13,16h1.5v1.5H13V16zM14.5,17.5H16V19h-1.5V17.5zM16,16h1.5v1.5H16V16zM17.5,14.5H19V16h-1.5V14.5zM17.5,17.5H19V19h-1.5V17.5zM22,7h-2V4h-3V2h5V7zM22,22v-5h-2v3h-3v2H22zM2,22h5v-2H4v-3H2V22zM2,2v5h2V4h3V2H2z"/>
|
||||
</vector>
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 217 B |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 145 B |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 159 B |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 176 B |
@@ -155,6 +155,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:visibility="gone"
|
||||
android:fontFamily="@font/inter"
|
||||
android:text="@string/convert_credits_bittrex"
|
||||
android:textColorLink="@color/lbryGreen"
|
||||
|
||||
@@ -19,18 +19,41 @@
|
||||
android:text="@string/send_credits"
|
||||
android:textSize="20sp"/>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/recipient_address">
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/wallet_input_send_address"
|
||||
android:fontFamily="@font/inter"
|
||||
android:textSize="14sp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="8dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:imeOptions="actionNext" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
android:layout_weight="1"
|
||||
android:hint="@string/recipient_address"
|
||||
android:layout_toStartOf="@id/wallet_qr_scan_address">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/wallet_input_send_address"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/inter"
|
||||
android:imeOptions="actionNext"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/wallet_qr_scan_address"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginStart="8dp"
|
||||
android:background="@null"
|
||||
android:src="@drawable/ic_qr_scanner"
|
||||
android:tint="@color/lbryGreen" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_marginTop="16dp"
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
<string name="delete">Delete</string>
|
||||
<string name="download">Download</string>
|
||||
<string name="open">Open</string>
|
||||
<string name="open_on_odysee_com">Open on ODYSEE.COM</string>
|
||||
<string name="report">Report</string>
|
||||
<string name="loading_decentralized_data">Loading decentralized data…</string>
|
||||
<string name="related_content">Related Content</string>
|
||||
@@ -71,6 +72,7 @@
|
||||
<string name="play">Play</string>
|
||||
<string name="unsupported_content">Unsupported Content</string>
|
||||
<string name="unsupported_content_desc">Sorry, we are unable to display this content in the app. You can find the file %1$sin your downloads folder.</string>
|
||||
<string name="unsupported_content_to_odysee_desc">Sorry, we are unable to display this content in the app. Click the button to open it on the Odysee website.</string>
|
||||
<string name="nothing_at_this_location">There\'s nothing at this location.</string>
|
||||
<string name="dmca_complaint_blocked">In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this content from our applications. <a href="https://lbry.com/faq/dmca">Read more</a></string>
|
||||
<string name="dmca_complaint_channel_blocked">In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this channel from our applications. <a href="https://lbry.com/faq/dmca">Read more</a></string>
|
||||
|
||||
@@ -10,6 +10,7 @@ import static org.junit.Assert.assertEquals;
|
||||
|
||||
public class LbryUriTest {
|
||||
private LbryUri expected;
|
||||
private LbryUri expectedOctoshape;
|
||||
|
||||
/*
|
||||
* Create an LbryUri object and assign fields manually using class methods. This object will be
|
||||
@@ -18,14 +19,21 @@ public class LbryUriTest {
|
||||
@Before
|
||||
public void createExpected() {
|
||||
expected = new LbryUri();
|
||||
expectedOctoshape = new LbryUri();
|
||||
expected.setChannelName("@lbry");
|
||||
expected.setStreamName("lbryturns4");
|
||||
expectedOctoshape.setChannelName("@lbry");
|
||||
expectedOctoshape.setStreamName("lbryturns4");
|
||||
|
||||
try {
|
||||
LbryUri.UriModifier primaryMod = LbryUri.UriModifier.parse("#", "3f");
|
||||
LbryUri.UriModifier secondaryMod = LbryUri.UriModifier.parse("#", "6");
|
||||
LbryUri.UriModifier primaryMod = LbryUri.UriModifier.parse(":", "3f");
|
||||
LbryUri.UriModifier secondaryMod = LbryUri.UriModifier.parse(":", "6");
|
||||
LbryUri.UriModifier primaryModOctoshape = LbryUri.UriModifier.parse("#", "3f");
|
||||
LbryUri.UriModifier secondaryModOctoshape = LbryUri.UriModifier.parse("#", "6");
|
||||
expected.setChannelClaimId(primaryMod.getClaimId());
|
||||
expected.setStreamClaimId(secondaryMod.getClaimId());
|
||||
expectedOctoshape.setChannelClaimId(primaryModOctoshape.getClaimId());
|
||||
expectedOctoshape.setStreamClaimId(secondaryModOctoshape.getClaimId());
|
||||
} catch (LbryUriException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -71,7 +79,7 @@ public class LbryUriTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseLbryProtocolWithChannel() {
|
||||
public void parseLbryProtocolWithChannelOctoshape() {
|
||||
LbryUri obtained = new LbryUri();
|
||||
|
||||
try {
|
||||
@@ -80,12 +88,12 @@ public class LbryUriTest {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
assertEquals(expected, obtained);
|
||||
assertEquals(expectedOctoshape, obtained);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseLbryProtocolOnlyChannel() {
|
||||
LbryUri expectedForChannel = sinthesizeExpected();
|
||||
LbryUri expectedForChannel = sinthesizeExpectedChannelOctoshape();
|
||||
|
||||
LbryUri obtained = new LbryUri();
|
||||
|
||||
@@ -100,7 +108,7 @@ public class LbryUriTest {
|
||||
|
||||
@Test
|
||||
public void parseLbryTvProtocolOnlyChannel() {
|
||||
LbryUri expectedForChannel = sinthesizeExpected();
|
||||
LbryUri expectedForChannel = sinthesizeExpectedChannelOctoshape();
|
||||
|
||||
LbryUri obtained = new LbryUri();
|
||||
|
||||
@@ -113,6 +121,32 @@ public class LbryUriTest {
|
||||
assertEquals(expectedForChannel, obtained);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseLbryTvWithEncodedChars() {
|
||||
LbryUri obtained = new LbryUri();
|
||||
|
||||
try {
|
||||
obtained = LbryUri.parse("https://lbry.tv/@Content_I_Like:1/DR.-ASTRID-ST%C3%9CCKELBERGER:2",false);
|
||||
} catch (LbryUriException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
expected = new LbryUri();
|
||||
expected.setChannelName("@Content_I_Like");
|
||||
expected.setStreamName("DR.-ASTRID-STÜCKELBERGER");
|
||||
|
||||
try {
|
||||
LbryUri.UriModifier primaryMod = LbryUri.UriModifier.parse("#", "1");
|
||||
LbryUri.UriModifier secondaryMod = LbryUri.UriModifier.parse("#", "2");
|
||||
expected.setChannelClaimId(primaryMod.getClaimId());
|
||||
expected.setStreamClaimId(secondaryMod.getClaimId());
|
||||
} catch (LbryUriException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
assertEquals(expected, obtained);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void lbryToTvString() {
|
||||
LbryUri obtained = new LbryUri();
|
||||
@@ -126,8 +160,47 @@ public class LbryUriTest {
|
||||
assertEquals("https://lbry.tv/@lbry:3f/lbryturns4:6", obtained.toTvString());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void lbryToTvStringWithEncodedChars() {
|
||||
LbryUri obtained = new LbryUri();
|
||||
|
||||
try {
|
||||
obtained = LbryUri.parse("lbry://La-Peur,-Nos-Attentats,-c'est-VOTRE-Sécurité!-Les-Guignols#6",false);
|
||||
} catch (LbryUriException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
assertEquals("https://lbry.tv/La-Peur%2C-Nos-Attentats%2C-c%27est-VOTRE-Se%CC%81curite%CC%81%21-Les-Guignols:6", obtained.toTvString());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void lbryToTvStringWithChannelAndEncodedChars() {
|
||||
LbryUri obtained = new LbryUri();
|
||||
|
||||
try {
|
||||
obtained = LbryUri.parse("lbry://@test#1/La-Peur,-Nos-Attentats,-c'est-VOTRE-Sécurité!-Les-Guignols#6",false);
|
||||
} catch (LbryUriException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
assertEquals("https://lbry.tv/@test:1/La-Peur%2C-Nos-Attentats%2C-c%27est-VOTRE-Se%CC%81curite%CC%81%21-Les-Guignols:6", obtained.toTvString());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void lbryToOdyseeString() {
|
||||
LbryUri obtained = new LbryUri();
|
||||
|
||||
try {
|
||||
obtained = LbryUri.parse("lbry://@lbry#3f/lbryturns4#6",false);
|
||||
} catch (LbryUriException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
assertEquals("https://odysee.com/@lbry:3f/lbryturns4:6", obtained.toOdyseeString());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private LbryUri sinthesizeExpected() {
|
||||
private LbryUri sinthesizeExpectedChannelOctoshape() {
|
||||
LbryUri expectedForChannel = new LbryUri();
|
||||
expectedForChannel.setChannelName("@UCBerkeley");
|
||||
expectedForChannel.setChannel(true);
|
||||
|
||||
+7
-5
@@ -4,12 +4,11 @@ buildscript {
|
||||
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.6.4'
|
||||
classpath 'com.google.gms:google-services:4.2.0'
|
||||
classpath 'com.android.tools.build:gradle:7.3.1'
|
||||
classpath 'com.google.gms:google-services:4.3.14'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
@@ -19,8 +18,11 @@ buildscript {
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
maven { url "https://jitpack.io" }
|
||||
/*flatDir {
|
||||
dirs 'debuglib'
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
|
||||
Reference in new issue
Block a user