mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-07-17 00:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Thomas 2025-03-27 12:22:10 +01:00
parent cb947a7d3c
commit f2ad02bbda
2 changed files with 40 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/app/fedilab/android/BaseMainActivity.java
View file

@ -1462,7 +1462,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
bundle.putBoolean(Helper.ARG_PEERTUBE_NAV_REMOTE, true); bundle.putBoolean(Helper.ARG_PEERTUBE_NAV_REMOTE, true);
intent.putExtras(bundle); intent.putExtras(bundle);
startActivity(intent); startActivity(intent);
finish();
} else if (id == R.id.nav_about_instance) { } else if (id == R.id.nav_about_instance) {
(new InstanceActivity()).show(getSupportFragmentManager(), null); (new InstanceActivity()).show(getSupportFragmentManager(), null);
} }

70
app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java
View file

@ -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_INSTANCE_PEERTUBE_BROWSING;
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE; 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.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.mastodon.helper.Helper.addFragment;
import static app.fedilab.android.peertube.helper.Helper.peertubeInformation; import static app.fedilab.android.peertube.helper.Helper.peertubeInformation;
import static app.fedilab.android.peertube.helper.SwitchAccountHelper.switchDialog; import static app.fedilab.android.peertube.helper.SwitchAccountHelper.switchDialog;
@ -43,6 +44,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@ -71,6 +73,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.regex.Matcher; 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); app.fedilab.android.mastodon.helper.Helper.loadPP(this, binding.profilePicture, finalAccount1);
MenuItem accountItem = binding.drawerNavView.getMenu().findItem(R.id.action_account); MenuItem accountItem = binding.drawerNavView.getMenu().findItem(R.id.action_account);
FrameLayout rootView = (FrameLayout) accountItem.getActionView(); 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); TextView countTextView = rootView.findViewById(R.id.view_alert_count_textview);
//change counter for notifications //change counter for notifications
if (badgeCount > 0) { if (badgeCount > 0) {
@ -623,7 +626,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer); Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer);
videoLanguageServerSet.addAll(videoLanguageServer); videoLanguageServerSet.addAll(videoLanguageServer);
Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null); 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); videoLanguageServer.addAll(videoLanguageLocal);
} }
editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet); editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
@ -689,36 +692,38 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
MenuItem myActionMenuItem = menu.findItem(R.id.action_search); MenuItem myActionMenuItem = menu.findItem(R.id.action_search);
SearchView searchView = (SearchView) myActionMenuItem.getActionView(); SearchView searchView = (SearchView) myActionMenuItem.getActionView();
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { if (searchView != null) {
@Override searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
public boolean onQueryTextSubmit(String query) { @Override
Pattern link = Pattern.compile("(https?://[\\da-z.-]+\\.[a-z.]{2,10})/videos/watch/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})(\\?start=(\\d+[hH])?(\\d+[mM])?(\\d+[sS])?)?$"); public boolean onQueryTextSubmit(String query) {
Matcher matcherLink = link.matcher(query.trim()); Pattern link = Pattern.compile("(https?://[\\da-z.-]+\\.[a-z.]{2,10})/videos/watch/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})(\\?start=(\\d+[hH])?(\\d+[mM])?(\\d+[sS])?)?$");
if (matcherLink.find()) { Matcher matcherLink = link.matcher(query.trim());
Intent intent = new Intent(PeertubeMainActivity.this, PeertubeActivity.class); if (matcherLink.find()) {
intent.setData(Uri.parse(query.trim())); Intent intent = new Intent(PeertubeMainActivity.this, PeertubeActivity.class);
intent.setData(Uri.parse(query.trim()));
startActivity(intent);
myActionMenuItem.collapseActionView();
return false;
}
Intent intent = new Intent(PeertubeMainActivity.this, SearchActivity.class);
Bundle b = new Bundle();
String search = query.trim();
b.putString("search", search);
intent.putExtras(b);
startActivity(intent); startActivity(intent);
if (!searchView.isIconified()) {
searchView.setIconified(true);
}
myActionMenuItem.collapseActionView(); myActionMenuItem.collapseActionView();
return false; return false;
} }
Intent intent = new Intent(PeertubeMainActivity.this, SearchActivity.class);
Bundle b = new Bundle();
String search = query.trim();
b.putString("search", search);
intent.putExtras(b);
startActivity(intent);
if (!searchView.isIconified()) {
searchView.setIconified(true);
}
myActionMenuItem.collapseActionView();
return false;
}
@Override @Override
public boolean onQueryTextChange(String s) { public boolean onQueryTextChange(String s) {
return false; return false;
} }
}); });
}
return true; return true;
} }
@ -755,8 +760,6 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
}).start(); }).start();
return false; return false;
} else if (item.getItemId() == R.id.action_exit) { } else if (item.getItemId() == R.id.action_exit) {
Intent intent = new Intent(PeertubeMainActivity.this, MainActivity.class);
startActivity(intent);
finish(); finish();
} else if (item.getItemId() == R.id.action_sepia_search) { } else if (item.getItemId() == R.id.action_sepia_search) {
Intent intent = new Intent(PeertubeMainActivity.this, SepiaSearchActivity.class); Intent intent = new Intent(PeertubeMainActivity.this, SepiaSearchActivity.class);
@ -830,10 +833,17 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
@Override @Override
public void onBackPressed() { public void onBackPressed() {
Log.v(TAG, "onBackPressed");
if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) { if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
binding.drawerLayout.closeDrawer(GravityCompat.START); binding.drawerLayout.closeDrawer(GravityCompat.START);
} else { } else {
super.onBackPressed(); 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();
}
} }
} }