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

Replaced repoId constructer argument with setArguments()

Browse Source 
As suggested by android lint.
Also removed unused imports.
This commit is contained in:
Peter Serwylo 2014-01-23 14:02:23 +11:00
parent f8893431fb
commit 1f38a84fa9
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/fdroid/fdroid/views/RepoDetailsActivity.java
View File

@ -17,7 +17,7 @@ public class RepoDetailsActivity extends FragmentActivity {
long repoId = getIntent().getLongExtra(RepoDetailsFragment.ARG_REPO_ID, 0); long repoId = getIntent().getLongExtra(RepoDetailsFragment.ARG_REPO_ID, 0);
if (savedInstanceState == null) { if (savedInstanceState == null) {
RepoDetailsFragment fragment = new RepoDetailsFragment(repoId); RepoDetailsFragment fragment = new RepoDetailsFragment();
fragment.setArguments(getIntent().getExtras()); fragment.setArguments(getIntent().getExtras());
getSupportFragmentManager() getSupportFragmentManager()
.beginTransaction() .beginTransaction()

19
src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
View File

@ -4,10 +4,7 @@ import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import android.text.Editable; import android.text.Editable;
@ -53,12 +50,6 @@ public class RepoDetailsFragment extends Fragment {
private static final int DELETE = 0; private static final int DELETE = 0;
private static final int UPDATE = 1; private static final int UPDATE = 1;
private final long repoId;
public RepoDetailsFragment(long repoId) {
this.repoId = repoId;
}
// TODO: Currently initialised in onCreateView. Not sure if that is the // TODO: Currently initialised in onCreateView. Not sure if that is the
// best way to go about this... // best way to go about this...
private Repo repo; private Repo repo;
@ -67,14 +58,18 @@ public class RepoDetailsFragment extends Fragment {
super.onAttach(activity); super.onAttach(activity);
} }
private long getRepoId() {
return getArguments().getLong(RepoDetailsFragment.ARG_REPO_ID, 0);
}
/** /**
* After, for example, a repo update, the details will have changed in the * After, for example, a repo update, the details will have changed in the
* database. However, or local reference to the DB.Repo object will not * database. However, or local reference to the Repo object will not
* have been updated. The safest way to deal with this is to reload the * have been updated. The safest way to deal with this is to reload the
* repo object directly from the database. * repo object directly from the database.
*/ */
private Repo loadRepoDetails() { private Repo loadRepoDetails() {
return RepoProvider.Helper.findById(getActivity().getContentResolver(), repoId); return RepoProvider.Helper.findById(getActivity().getContentResolver(), getRepoId());
} }
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -82,7 +77,7 @@ public class RepoDetailsFragment extends Fragment {
repo = loadRepoDetails(); repo = loadRepoDetails();
if (repo == null) { if (repo == null) {
Log.e("FDroid", "Error showing details for repo '" + repoId + "'"); Log.e("FDroid", "Error showing details for repo '" + getRepoId() + "'");
return new LinearLayout(container.getContext()); return new LinearLayout(container.getContext());
} }