Native rewrite #878

Merged
akinwale merged 65 commits from native-rewrite into master 2020-05-23 08:49:00 +02:00
2 changed files with 6 additions and 3 deletions
Showing only changes of commit 616e3597db - Show all commits

View file

@ -349,13 +349,15 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
});
super.onCreate(savedInstanceState);
castContext = CastContext.getSharedInstance(this);
dbHelper = new DatabaseHelper(this);
checkNotificationOpenIntent(getIntent());
setContentView(R.layout.activity_main);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
// TODO: Check Google Play Services availability
// castContext = CastContext.getSharedInstance(this);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.content_main), new OnApplyWindowInsetsListener() {
@Override
public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets) {

View file

@ -289,11 +289,12 @@ public class ChannelFormFragment extends BaseFragment implements
}
private void validateAndSaveClaim(Claim claim) {
String channelName = claim.getName().startsWith("@") ? claim.getName().substring(1) : claim.getName();
if (Helper.isNullOrEmpty(channelName)) {
if (Helper.isNullOrEmpty(claim.getName())) {
showError(getString(R.string.please_enter_channel_name));
return;
}
String channelName = claim.getName().startsWith("@") ? claim.getName().substring(1) : claim.getName();
if (!LbryUri.isNameValid(channelName)) {
showError(getString(R.string.channel_name_invalid_characters));
return;