Revert "App: Fix #27"

xfoxfu · fython · commit 2db0f539b22f · 2017-02-15T18:44:16.000+08:00
This reverts commit 9893abe. # Conflicts: # mobile/src/main/java/info/papdt/express/helper/ui/fragment/add/StepNoFound.java
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,7 +50,8 @@ public void onClick(View view) {
 	}
 
 	private void updateForceButton() {
-		if (getAddActivity().getPackage().companyChineseName != null) {
+		Package p = getAddActivity().getPackage();
+		if (p != null && p.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,7 +50,8 @@ public void onClick(View view) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`private void updateForceButton() {`
`53`		`- if (getAddActivity().getPackage().companyChineseName != null) {`
	`53`	`+ Package p = getAddActivity().getPackage();`
	`54`	`+ if (p != null && p.companyChineseName != null) {`
`54`	`55`	`mForceBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.pink_900));`
`55`	`56`	`mForceBtn.setText(String.format(getString(R.string.operation_force_add_when_cannot_find),`
`56`	`57`	`getAddActivity().getPackage().companyChineseName));`