|
@@ -134,11 +134,11 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
}
|
|
|
|
|
|
public void onNotifyContinueable(int i) throws RemoteException {
|
|
|
- if (SearchPrinterScr.this.progress != null && SearchPrinterScr.this.progress.isShowing()) {
|
|
|
+ if (progress != null && SearchPrinterScr.this.progress.isShowing()) {
|
|
|
SearchPrinterScr.this.progress.dismiss();
|
|
|
}
|
|
|
- if (SearchPrinterScr.this.selectedPrinter != null && SearchPrinterScr.this.probedPrinter != null && SearchPrinterScr.this.printer_location == 3) {
|
|
|
- if (SearchPrinterScr.this.probedPrinter.getPrinterId().equals(SearchPrinterScr.this.selectedPrinter.getPrinterId())) {
|
|
|
+ if (selectedPrinter != null && SearchPrinterScr.this.probedPrinter != null && SearchPrinterScr.this.printer_location == 3) {
|
|
|
+ if (selectedPrinter.getPrinterId())) {
|
|
|
Message obtainMessage = SearchPrinterScr.this.mHandler.obtainMessage();
|
|
|
obtainMessage.what = 4;
|
|
|
obtainMessage.obj = SearchPrinterScr.this.selectedPrinter;
|
|
@@ -154,7 +154,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
public void onNotifyError(int i, int i2, boolean z) throws RemoteException {
|
|
|
if (!isSearchSimpleAp) {
|
|
|
synchronized (SearchPrinterScr.mLock) {
|
|
|
- boolean unused = SearchPrinterScr.foundPrinter = Utils.getPrefBoolean(SearchPrinterScr.this.getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH);
|
|
|
+ boolean unused = SearchPrinterScr.foundPrinter = Utils.getPrefBoolean (getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH);
|
|
|
if ((i2 == -1300 || i2 == -1351) && !SearchPrinterScr.foundPrinter) {
|
|
|
i2 = -1100;
|
|
|
} else if ((i2 == -1300 || i2 == -1351 || i2 == -1100) && SearchPrinterScr.foundPrinter) {
|
|
@@ -164,7 +164,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
SearchPrinterScr searchPrinterScr = SearchPrinterScr.this;
|
|
|
searchPrinterScr.curError = i2;
|
|
|
searchPrinterScr.mHandler.sendEmptyMessage(13);
|
|
|
- if (SearchPrinterScr.this.progress != null && SearchPrinterScr.this.progress.isShowing()) {
|
|
|
+ if (progress != null && SearchPrinterScr.this.progress.isShowing()) {
|
|
|
SearchPrinterScr.this.progress.dismiss();
|
|
|
}
|
|
|
Boolean unused2 = SearchPrinterScr.this.isFocused = true;
|
|
@@ -176,7 +176,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
private ServiceConnection mEpsonConnection = new ServiceConnection() {
|
|
|
public void onServiceDisconnected(ComponentName componentName) {
|
|
|
try {
|
|
|
- SearchPrinterScr.this.mEpsonService.unregisterCallback(SearchPrinterScr.this.mCallback);
|
|
|
+ SearchPrinterScr.this.mEpsonService.unregisterCallback (mCallback);
|
|
|
} catch (RemoteException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -185,9 +185,9 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
|
|
|
public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
|
|
|
IEpsonService unused = SearchPrinterScr.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
|
|
|
- if (SearchPrinterScr.this.mEpsonService != null) {
|
|
|
+ if (mEpsonService != null) {
|
|
|
try {
|
|
|
- SearchPrinterScr.this.mEpsonService.registerCallback(SearchPrinterScr.this.mCallback);
|
|
|
+ SearchPrinterScr.this.mEpsonService.registerCallback (mCallback);
|
|
|
} catch (RemoteException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -799,7 +799,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
}
|
|
|
mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
|
|
public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
|
|
|
- if (SearchPrinterScr.this.isFocused.booleanValue()) {
|
|
|
+ if (isFocused.booleanValue()) {
|
|
|
Boolean unused = SearchPrinterScr.this.isFocused = false;
|
|
|
SearchPrinterScr searchPrinterScr = SearchPrinterScr.this;
|
|
|
searchPrinterScr.mIsClickSelect = true;
|
|
@@ -825,7 +825,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
});
|
|
|
mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
|
|
|
public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long j) {
|
|
|
- if (SearchPrinterScr.this.printer_location == 1) {
|
|
|
+ if (printer_location == 1) {
|
|
|
return true;
|
|
|
}
|
|
|
int unused = SearchPrinterScr.this.mDeletePos = i;
|
|
@@ -836,24 +836,24 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
});
|
|
|
mAddButton.setOnClickListener(new View.OnClickListener() {
|
|
|
public void onClick(View view) {
|
|
|
- switch (SearchPrinterScr.this.printer_location) {
|
|
|
+ switch (printer_location) {
|
|
|
case 2:
|
|
|
- if (SearchPrinterScr.this.mBuilder.getData().size() >= 32) {
|
|
|
- new AlertDialog.Builder(SearchPrinterScr.this.mContext).setCancelable(false).setTitle(SearchPrinterScr.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(SearchPrinterScr.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(SearchPrinterScr.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
|
|
|
+ if (mBuilder.getData().size() >= 32) {
|
|
|
+ new AlertDialog.Builder (getString(R.string.str_yes), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
}
|
|
|
}).show();
|
|
|
return;
|
|
|
- } else if (SearchPrinterScr.this.getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true)) {
|
|
|
- AlertDialog.Builder cancelable = new AlertDialog.Builder(SearchPrinterScr.this.mContext).setCancelable(false);
|
|
|
- cancelable.setMessage(SearchPrinterScr.this.getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + SearchPrinterScr.this.getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(SearchPrinterScr.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
|
|
|
+ } else if (getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true)) {
|
|
|
+ AlertDialog.Builder cancelable = new AlertDialog.Builder (mContext).setCancelable(false);
|
|
|
+ cancelable.setMessage (getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + SearchPrinterScr.this.getString (getString(R.string.str_yes), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
Message message = new Message();
|
|
|
message.what = 8;
|
|
|
message.obj = null;
|
|
|
SearchPrinterScr.this.mHandler.sendMessage(message);
|
|
|
}
|
|
|
- }).setNegativeButton(SearchPrinterScr.this.getString(R.string.str_no), new DialogInterface.OnClickListener() {
|
|
|
+ }).setNegativeButton (getString(R.string.str_no), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
}
|
|
|
}).show();
|
|
@@ -866,8 +866,8 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
return;
|
|
|
}
|
|
|
case 3:
|
|
|
- if (SearchPrinterScr.this.mBuilder.getData().size() >= 32) {
|
|
|
- new AlertDialog.Builder(SearchPrinterScr.this.mContext).setCancelable(false).setTitle(SearchPrinterScr.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(SearchPrinterScr.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(SearchPrinterScr.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
|
|
|
+ if (mBuilder.getData().size() >= 32) {
|
|
|
+ new AlertDialog.Builder (getString(R.string.str_yes), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
}
|
|
|
}).show();
|
|
@@ -885,14 +885,14 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
});
|
|
|
mSearchButton.setOnClickListener(new View.OnClickListener() {
|
|
|
public void onClick(View view) {
|
|
|
- if (SearchPrinterScr.this.printer_location == 1) {
|
|
|
+ if (printer_location == 1) {
|
|
|
SearchPrinterScr.this.mHandler.sendEmptyMessageDelayed(1, 100);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
mLocalButton.setOnClickListener(new View.OnClickListener() {
|
|
|
public void onClick(View view) {
|
|
|
- if (SearchPrinterScr.this.printer_location != 1) {
|
|
|
+ if (printer_location != 1) {
|
|
|
SearchPrinterScr.this.mAddButton.setVisibility(8);
|
|
|
((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(0);
|
|
|
SearchPrinterScr.this.interruptSearch();
|
|
@@ -904,7 +904,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
});
|
|
|
mRemoteButton.setOnClickListener(new View.OnClickListener() {
|
|
|
public void onClick(View view) {
|
|
|
- if (SearchPrinterScr.this.printer_location != 2) {
|
|
|
+ if (printer_location != 2) {
|
|
|
int unused = SearchPrinterScr.this.printer_location = 2;
|
|
|
SearchPrinterScr.this.interruptSearch();
|
|
|
((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(8);
|
|
@@ -917,7 +917,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
|
|
|
});
|
|
|
mIpButton.setOnClickListener(new View.OnClickListener() {
|
|
|
public void onClick(View view) {
|
|
|
- if (SearchPrinterScr.this.printer_location != 3) {
|
|
|
+ if (printer_location != 3) {
|
|
|
int unused = SearchPrinterScr.this.printer_location = 3;
|
|
|
SearchPrinterScr.this.interruptSearch();
|
|
|
((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(8);
|