Fix errors with deep link handling #1019

Merged
akinwale merged 5 commits from pr-1008 into master 2020-10-02 13:39:37 +02:00

View file

@ -1041,7 +1041,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
fragment instanceof LibraryFragment || fragment instanceof LibraryFragment ||
fragment instanceof SearchFragment; fragment instanceof SearchFragment;
findViewById(R.id.floating_balance_main_container).setVisibility(!canShowFloatingBalance || inFullscreenMode ? View.INVISIBLE : View.VISIBLE); findViewById(R.id.floating_balance_main_container).setVisibility(!canShowFloatingBalance || inFullscreenMode ? View.INVISIBLE : View.VISIBLE);
if (!(fragment instanceof FileViewFragment) && !(fragment instanceof ShuffleFragment) && !inFullscreenMode) { if (!(fragment instanceof FileViewFragment) && !(fragment instanceof ShuffleFragment) && !inFullscreenMode && nowPlayingClaim != null) {
findViewById(R.id.global_now_playing_card).setVisibility(View.VISIBLE); findViewById(R.id.global_now_playing_card).setVisibility(View.VISIBLE);
} }
/*if (!Lbry.SDK_READY && !inFullscreenMode) { /*if (!Lbry.SDK_READY && !inFullscreenMode) {
@ -2854,9 +2854,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
try { try {
LbryUri uri = LbryUri.parse(url); LbryUri uri = LbryUri.parse(url);
if (uri.isChannel()) { if (uri.isChannel()) {
openChannelUrl(url); openChannelUrl(url.startsWith(LbryUri.PROTO_DEFAULT) ? url : uri.toString());
} else { } else {
openFileUrl(url); openFileUrl(url.startsWith(LbryUri.PROTO_DEFAULT) ? url : uri.toString());
} }
} catch (LbryUriException ex) { } catch (LbryUriException ex) {
// pass // pass