Skip to content

Merging collapsible if statements increases the code's readability #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AymanDF wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merging collapsible if statements increases the code's readability #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/src/main/java/org/evilsoft/pathfinder/reference/AbstractViewListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ public void onCreate(Bundle savedInstanceState) {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
Bundle bundle = getArguments();
if (bundle != null) {
if (bundle.containsKey("url")) {
startUrl = bundle.getString("url");
}
if (bundle != null && bundle.containsKey("url")) {
startUrl = bundle.getString("url");
}
if (startUrl != null) {
updateUrl(startUrl);
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/java/org/evilsoft/pathfinder/reference/DetailsWebViewClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,9 @@ private String up(String uri) {

public void back(WebView view) {
try {
if (path.size() > 1) {
if (!path.get(1).get("type").equals("list")) {
String newUrl = up(url);
shouldOverrideUrlLoading(view, newUrl);
}
if (path.size() > 1 && !path.get(1).get("type").equals("list")) {
String newUrl = up(url);
shouldOverrideUrlLoading(view, newUrl);
}
} catch (Exception e) {
Log.e(TAG, "Back button failed");
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/org/evilsoft/pathfinder/reference/api/AbstractContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,12 @@ public String getMimeFromExtension(Uri uri) {
}

public Uri stripExtension(Uri uri) {
if (uri.getLastPathSegment() != null) {
if (uri.getLastPathSegment().endsWith(".html")
|| uri.getLastPathSegment().endsWith(".json")) {
if (uri.getLastPathSegment() != null
&& (uri.getLastPathSegment().endsWith(".html")
|| uri.getLastPathSegment().endsWith(".json"))) {
String url = uri.toString();
Uri newUri = Uri.parse(url.substring(0, url.lastIndexOf(".")));
return newUri;
}
}
return uri;
}
Expand Down
12 changes: 5 additions & 7 deletions app/src/main/java/org/evilsoft/pathfinder/reference/db/BaseDbHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,11 @@ private File manageDatabase() {
try {
tmpFile = new File(context.getFilesDir().getAbsolutePath(), dbName);
// see if the db exists on internal storage
if (tmpFile.exists()) {
if (null != retFile) {
// if the db is on internal *and* external storage, delete
// the
// internal storage copy
tmpFile.delete();
}
if (tmpFile.exists() && null != retFile) {
// if the db is on internal *and* external storage, delete
// the
// internal storage copy
tmpFile.delete();
}

// if we got this far with retFile undefined, there either isn't
Expand Down