Merge pull request #28 from coderfox/master

fython · web-flow · commit 63c9c03a8c97 · 2017-02-14T04:22:42.000-06:00
App: Fix #27
diff --git a/mobile/src/main/java/info/papdt/express/helper/ui/fragment/add/StepNoFound.java b/mobile/src/main/java/info/papdt/express/helper/ui/fragment/add/StepNoFound.java
@@ -50,8 +50,7 @@ public void onClick(View view) {
 	}
 
 	private void updateForceButton() {
-		Package p = getAddActivity().getPackage();
-		if(p != null && p.companyChineseName != null) {
+				if(getAddActivity().getPackage().companyChineseName != null) {
 			mForceBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.pink_900));
 			mForceBtn.setText(String.format(getString(R.string.operation_force_add_when_cannot_find),
 					getAddActivity().getPackage().companyChineseName));

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ public void onClick(View view) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`private void updateForceButton() {`
`53`		`- Package p = getAddActivity().getPackage();`
`54`		`- if(p != null && p.companyChineseName != null) {`
	`53`	`+ if(getAddActivity().getPackage().companyChineseName != null) {`
`55`	`54`	`mForceBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.pink_900));`
`56`	`55`	`mForceBtn.setText(String.format(getString(R.string.operation_force_add_when_cannot_find),`
`57`	`56`	`getAddActivity().getPackage().companyChineseName));`