Commit 4feb4659 authored by Thomas's avatar Thomas
Browse files

Fix some crashes

parent 0a1c4f76

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                                    if (!activity.isDestroyed() && !activity.isFinishing() && url != null) {

                                        if (url.trim().isEmpty()) {

                                            BitmapDrawable avatar = new AvatarGenerator.AvatarBuilder(activity)

                                                    .setLabel(account.peertube_account.getAcct())

                                                    .setLabel(acct)

                                                    .setAvatarSize(120)

                                                    .setTextSize(30)

                                                    .toSquare()

app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -126,8 +126,10 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload 
            getSupportActionBar().setDisplayShowHomeEnabled(true);

        }



        if (attachments == null || attachments.size() == 0)

        if (attachments == null || attachments.size() == 0) {

            finish();

            return;

        }



        setTitle("");

app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java

+9 −6
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
        badgeCount = 0;

        headerMenuOpen = false;

        binding.navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);



        startInForeground();

        if (getSupportActionBar() != null) {

            getSupportActionBar().setDisplayShowTitleEnabled(false);

        }
@@ -377,7 +377,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
        peertubeInformation.setPrivacies(new LinkedHashMap<>());

        peertubeInformation.setPlaylistPrivacies(new LinkedHashMap<>());

        peertubeInformation.setTranslations(new LinkedHashMap<>());

        startInForeground();





        //noinspection ConstantConditions

        if (BuildConfig.FLAVOR.compareTo("playstore") == 0) {
@@ -417,11 +417,14 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 


    private void startInForeground() {

        Intent notificationIntent = new Intent(this, RetrieveInfoService.class);

        try {

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

                startForegroundService(notificationIntent);

            } else {

                startService(notificationIntent);

            }

        } catch (Exception ignored) {

        }

    }



    @Override