Commit f2ad02bb authored by Thomas's avatar Thomas
Browse files

Fix issue #1154 - Back screen when going back from the Peertube section

parent cb947a7d

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

+0 −1
Original line number Diff line number Diff line
@@ -1462,7 +1462,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                bundle.putBoolean(Helper.ARG_PEERTUBE_NAV_REMOTE, true);

                intent.putExtras(bundle);

                startActivity(intent);

                finish();

            } else if (id == R.id.nav_about_instance) {

                (new InstanceActivity()).show(getSupportFragmentManager(), null);

            }

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

+40 −30
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE; 
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE_PEERTUBE_BROWSING;

import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;

import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;

import static app.fedilab.android.mastodon.helper.Helper.TAG;

import static app.fedilab.android.mastodon.helper.Helper.addFragment;

import static app.fedilab.android.peertube.helper.Helper.peertubeInformation;

import static app.fedilab.android.peertube.helper.SwitchAccountHelper.switchDialog;
@@ -43,6 +44,7 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.util.Log;

import android.util.TypedValue;

import android.view.Menu;

import android.view.MenuItem;
@@ -71,6 +73,7 @@ import org.jetbrains.annotations.NotNull; 


import java.util.LinkedHashMap;

import java.util.List;

import java.util.Objects;

import java.util.Set;

import java.util.TreeSet;

import java.util.regex.Matcher;
@@ -590,7 +593,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
                            app.fedilab.android.mastodon.helper.Helper.loadPP(this, binding.profilePicture, finalAccount1);

                            MenuItem accountItem = binding.drawerNavView.getMenu().findItem(R.id.action_account);

                            FrameLayout rootView = (FrameLayout) accountItem.getActionView();

                            FrameLayout redCircle = rootView.findViewById(R.id.view_alert_red_circle);

                            FrameLayout redCircle = Objects.requireNonNull(rootView).findViewById(R.id.view_alert_red_circle);

                            TextView countTextView = rootView.findViewById(R.id.view_alert_count_textview);

                            //change counter for notifications

                            if (badgeCount > 0) {
@@ -623,7 +626,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
                            Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer);

                            videoLanguageServerSet.addAll(videoLanguageServer);

                            Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null);

                            if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {

                            if (!videoLanguageServerSet.isEmpty() && videoLanguageLocal != null) {

                                videoLanguageServer.addAll(videoLanguageLocal);

                            }

                            editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
@@ -689,6 +692,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
        MenuItem myActionMenuItem = menu.findItem(R.id.action_search);



        SearchView searchView = (SearchView) myActionMenuItem.getActionView();

        if (searchView != null) {

            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {

                @Override

                public boolean onQueryTextSubmit(String query) {
@@ -719,6 +723,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
                    return false;

                }

            });

        }

        return true;

    }
@@ -755,8 +760,6 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
            }).start();

            return false;

        } else if (item.getItemId() == R.id.action_exit) {

            Intent intent = new Intent(PeertubeMainActivity.this, MainActivity.class);

            startActivity(intent);

            finish();

        } else if (item.getItemId() == R.id.action_sepia_search) {

            Intent intent = new Intent(PeertubeMainActivity.this, SepiaSearchActivity.class);
@@ -830,12 +833,19 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 


    @Override

    public void onBackPressed() {

        Log.v(TAG, "onBackPressed");

        if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {

            binding.drawerLayout.closeDrawer(GravityCompat.START);

        } else {

            SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(PeertubeMainActivity.this);

            String defaultInstance = sharedpreferences.getString(PREF_USER_INSTANCE_PEERTUBE_BROWSING, null);

            if (typeOfConnection == TypeOfConnection.REMOTE_ACCOUNT && defaultInstance == null) {

                finish();

            } else {

                super.onBackPressed();

            }

        }

    }



    public enum TypeOfConnection {

        NORMAL,