Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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
|
||||
|
||||
+5
-4
@@ -16,8 +16,8 @@ android {
|
||||
applicationId "io.lbry.browser"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
versionCode 1700
|
||||
versionName "0.17.0"
|
||||
versionCode 1701
|
||||
versionName "0.17.1"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -132,8 +132,9 @@ dependencies {
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||
|
||||
__32bitImplementation 'io.lbry:lbrysdk32:0.91.0'
|
||||
__64bitImplementation 'io.lbry:lbrysdk64:0.91.0'
|
||||
__32bitImplementation 'io.lbry:lbrysdk32:0.100.0'
|
||||
__64bitImplementation 'io.lbry:lbrysdk64:0.100.0'
|
||||
//__64bitImplementation(name: 'lbrysdk', ext: 'aar')
|
||||
}
|
||||
|
||||
apply plugin: 'com.google.gms.google-services'
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -137,6 +137,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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
@@ -87,8 +88,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 +167,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,
|
||||
@@ -1514,7 +1523,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);
|
||||
@@ -1617,7 +1626,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 +1684,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 +1717,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 +1737,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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2182,7 +2201,7 @@ public class FileViewFragment extends BaseFragment implements
|
||||
handled = true;
|
||||
}
|
||||
} else {
|
||||
openClaimExternally(claim, mediaType);
|
||||
openClaimExternally(claim, mediaType, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2266,15 +2285,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 +2873,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();
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -210,7 +210,8 @@ public class ShuffleFragment extends BaseFragment {
|
||||
121, // 2 minutes or less
|
||||
1,
|
||||
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
|
||||
PAGE_SIZE);
|
||||
PAGE_SIZE,
|
||||
true);
|
||||
}
|
||||
|
||||
public void onStart() {
|
||||
|
||||
@@ -33,6 +33,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,6 +52,10 @@ 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;
|
||||
@@ -291,6 +303,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) {
|
||||
@@ -638,7 +688,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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -188,7 +201,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 +242,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 +270,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 +290,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);
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -113,6 +113,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,6 +152,45 @@ 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() {
|
||||
LbryUri expectedForChannel = new LbryUri();
|
||||
|
||||
+5
-1
@@ -5,7 +5,7 @@ buildscript {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.6.4'
|
||||
@@ -20,7 +20,11 @@ allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
maven { url "https://jitpack.io" }
|
||||
/*flatDir {
|
||||
dirs 'debuglib'
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user