Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't finish() activity after showing app details.

Browse Source 
When calling `finish()` after handling an intent to show app details,
the ability to navigate "up" disappears.
This commit is contained in:
Peter Serwylo 2015-12-08 00:30:38 +11:00
parent 829e8f1058
commit cb0f252d74
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
F-Droid/src/org/fdroid/fdroid/FDroid.java
View File

@ -44,7 +44,6 @@ import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import org.fdroid.fdroid.compat.Compatibility;
import org.fdroid.fdroid.compat.TabManager; import org.fdroid.fdroid.compat.TabManager;
import org.fdroid.fdroid.compat.UriCompat; import org.fdroid.fdroid.compat.UriCompat;
import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.AppProvider;
@ -52,7 +51,6 @@ import org.fdroid.fdroid.data.NewRepoConfig;
import org.fdroid.fdroid.privileged.install.InstallExtensionDialogActivity; import org.fdroid.fdroid.privileged.install.InstallExtensionDialogActivity;
import org.fdroid.fdroid.views.AppListFragmentPagerAdapter; import org.fdroid.fdroid.views.AppListFragmentPagerAdapter;
import org.fdroid.fdroid.views.ManageReposActivity; import org.fdroid.fdroid.views.ManageReposActivity;
import org.fdroid.fdroid.views.fragments.AppListFragment;
import org.fdroid.fdroid.views.swap.SwapWorkflowActivity; import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextListener { public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextListener {
@ -98,11 +96,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
Intent intent = getIntent(); Intent intent = getIntent();
handleSearchOrAppViewIntent(intent);
// If the intent can be handled via AppDetails it will call finish()
// and the rest of the code won't execute. If it looks like a search term,
// this will prompt the SearchView to update itself.
handleIntent(intent);
if (intent.hasExtra(EXTRA_TAB_UPDATE)) { if (intent.hasExtra(EXTRA_TAB_UPDATE)) {
boolean showUpdateTab = intent.getBooleanExtra(EXTRA_TAB_UPDATE, false); boolean showUpdateTab = intent.getBooleanExtra(EXTRA_TAB_UPDATE, false);
@ -147,10 +141,10 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); super.onNewIntent(intent);
handleIntent(intent); handleSearchOrAppViewIntent(intent);
} }
private void handleIntent(Intent intent) { private void handleSearchOrAppViewIntent(Intent intent) {
final Uri data = intent.getData(); final Uri data = intent.getData();
if (data == null) { if (data == null) {
return; return;
@ -243,7 +237,6 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
if (call != null) { if (call != null) {
startActivity(call); startActivity(call);
finish();
} }
} }