Skip to content

Simplify code #900

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
loxal wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Simplify code #900

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
4 changes: 1 addition & 3 deletions mbhd-core/src/main/java/org/multibit/hd/core/extensions/WalletTypeExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ public boolean equals(Object o) {

WalletTypeExtension that = (WalletTypeExtension) o;

if (walletType != that.walletType) return false;

return true;
return walletType == that.walletType;
}

@Override
Expand Down
6 changes: 1 addition & 5 deletions mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDContactsProtos.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDPaymentsProtos.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions mbhd-core/src/main/java/org/multibit/hd/core/utils/OSUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,8 @@ public static boolean isUnix() {
final String os = getOsName().toLowerCase();

// XXX: this obviously needs some more work to be "true" in general (see bottom of file)
if ((os.contains("sunos")) || (os.contains("linux"))) {
return true;
}

if (isMac() && (System.getProperty("os.version", "").startsWith("10."))) {
return true;
}
return (os.contains("sunos")) || (os.contains("linux")) || isMac() && (System.getProperty("os.version", "").startsWith("10."));

return false;
}

/**
Expand Down