a

app/src/main/java/com/epson/cameracopy/ui/CameraPreviewFragment.java

@@ -127,7 +127,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         mPhotoSelectButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if (!CameraPreviewFragment.mPictureTaking) {
-                    CameraPreviewFragment.this.startPhotoSelectActivity();
+                    startPhotoSelectActivity();
                 }
             }
         });
@@ -135,7 +135,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         mPhtographButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if (!CameraPreviewFragment.mPictureTaking) {
-                    CameraPreviewFragment.this.takePicture();
+                    takePicture();
                 }
             }
         });
@@ -446,7 +446,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             mPictureTaking = true;
             getActivity().runOnUiThread(new Runnable() {
                 public void run() {
-                    CameraPreviewFragment.this.disableAllButton();
+                    disableAllButton();
                 }
             });
             mSensorEventListener.stop();
@@ -459,13 +459,13 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         mOpenCvCameraView.takePicture(FileUtils.getNewTemporaryJpegFile(getActivity()).getPath(), new OpenCvCameraView.MyPictureTakeCallback() {
             public void onMyPictureTaken(boolean z, String str) {
                 if (!z || str == null) {
-                    CameraPreviewFragment.this.enableAllButton();
+                    enableAllButton();
                     CameraPreviewFragment.mSensorEventListener.start();
                     boolean unused = CameraPreviewFragment.mPictureTaking = false;
-                    CameraPreviewFragment.this.showErrorDialog();
+                    showErrorDialog();
                     return;
                 }
-                CameraPreviewFragment.this.startPictureViewActivity(str);
+                startPictureViewActivity(str);
             }
         });
     }
@@ -543,7 +543,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         }
 
         protected void onPostExecute(Void voidR) {
-            CameraPreviewFragment.this.takePictureStep2();
+            takePictureStep2();
         }
     }
 }

app/src/main/java/com/epson/cameracopy/ui/CameraPreviewOptionActivity.java

@@ -61,7 +61,7 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
             mGuideToggleButton.setChecked(mCameraPreviewControl.getGuideMode());
             mGuideToggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 public void onCheckedChanged(CompoundButton compoundButton, boolean z) {
-                    PlaceholderFragment.this.changeAutoPhotoToggleButtonStatus(z);
+                    changeAutoPhotoToggleButtonStatus(z);
                 }
             });
             mAutoPhotoToggleButton = (Switch) inflate.findViewById(R.id.autoPictureToggleButton);
@@ -69,14 +69,14 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
             changeAutoPhotoToggleButtonStatus(mGuideToggleButton.isChecked());
             ((LinearLayout) inflate.findViewById(R.id.save_directory_layout)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    PlaceholderFragment.this.startSaveDirectoryActivity();
+                    startSaveDirectoryActivity();
                 }
             });
             mSaveDirectoryText = (TextView) inflate.findViewById(R.id.saveDirectoryText);
             setSaveDirectoryText(mCameraPreviewControl.getSaveDirecotry());
             inflate.findViewById(R.id.picture_resolution_layout).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    PlaceholderFragment.this.openPictureResolutionDialog();
+                    openPictureResolutionDialog();
                 }
             });
             mPictureResolutionText = (TextView) inflate.findViewById(R.id.pictureResolutionText);

app/src/main/java/com/epson/cameracopy/ui/CameraPrintProgress.java

@@ -849,7 +849,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         mCancelButton = (Button) findViewById(R.id.cancel_button);
         mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                CameraPrintProgress.this.CancelPrint();
+                CancelPrint();
             }
         });
         bSearching = false;
@@ -925,8 +925,8 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                             }
                             EPLog.e("Epson", "user click str_cancel button");
                             CameraPrintProgress.curError = 0;
-                            boolean unused = CameraPrintProgress.this.isDialogOpen = false;
-                            CameraPrintProgress.this.removeDialog(0);
+                            boolean unused = isDialogOpen = false;
+                            removeDialog(0);
                             CameraPrintProgress.mHandler.sendEmptyMessage(5);
                         }
                     });
@@ -942,7 +942,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                         try {
                             if (CameraPrintProgress.curError == 109) {
                                 CameraPrintProgress.isBkRetry = true;
-                                CameraPrintProgress.this.triggerPrint();
+                                triggerPrint();
                             }
                             CameraPrintProgress.mEpsonService.confirmContinueable(true);
                             CameraPrintProgress.curError = 0;
@@ -950,13 +950,13 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                         } catch (RemoteException e) {
                             e.printStackTrace();
                         }
-                        boolean unused2 = CameraPrintProgress.this.isDialogOpen = false;
-                        CameraPrintProgress.this.removeDialog(0);
+                        boolean unused2 = isDialogOpen = false;
+                        removeDialog(0);
                     }
                 }).setNegativeButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        boolean unused = CameraPrintProgress.this.isDialogOpen = false;
-                        CameraPrintProgress.this.removeDialog(0);
+                        boolean unused = isDialogOpen = false;
+                        removeDialog(0);
                         try {
                             CameraPrintProgress.mEpsonService.confirmContinueable(false);
                             CameraPrintProgress.curError = 0;
@@ -992,19 +992,19 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                         } catch (RemoteException e) {
                             e.printStackTrace();
                         }
-                        CameraPrintProgress.this.removeDialog(1);
+                        removeDialog(1);
                         CameraPrintProgress cameraPrintProgress = CameraPrintProgress.this;
                         cameraPrintProgress.mCanceled = true;
                         cameraPrintProgress.mCancelButton.setVisibility(4);
                         CameraPrintProgress.mCancelButton.setEnabled(false);
-                        if (CameraPrintProgress.this.bSearching) {
+                        if (bSearching) {
                             CameraPrintProgress.mHandler.sendEmptyMessage(5);
-                            boolean unused = CameraPrintProgress.this.bSearching = false;
+                            boolean unused = bSearching = false;
                         }
                     }
                 }).setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        CameraPrintProgress.this.removeDialog(1);
+                        removeDialog(1);
                     }
                 });
                 negativeButton3.setOnKeyListener(new DialogInterface.OnKeyListener() {

app/src/main/java/com/epson/cameracopy/ui/ImagePreviewActivity.java

@@ -202,33 +202,33 @@ public class ImagePreviewActivity extends ActivityIACommon {
             mSaveButton = (Button) inflate.findViewById(R.id.save_button);
             mSaveButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    if (!PlaceholderFragment.this.checkProgress()) {
+                    if (!checkProgress()) {
                         if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
                             String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
-                            String[] strArr2 = {PlaceholderFragment.this.getString(R.string.permission_dialog_title), PlaceholderFragment.this.getString(R.string.permission_dialog_title)};
+                            String[] strArr2 = {getString(R.string.permission_dialog_title), getString(R.string.permission_dialog_title)};
                             PlaceholderFragment placeholderFragment = PlaceholderFragment.this;
                             PlaceholderFragment placeholderFragment2 = PlaceholderFragment.this;
-                            ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], strArr2, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Fragment) placeholderFragment, placeholderFragment.getString(R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Fragment) placeholderFragment2, placeholderFragment2.getString(R.string.permission_dialog_message_storage), PlaceholderFragment.this.getString(R.string.permission_function_storage))});
-                            if (!ActivityRequestPermissions.checkPermission(PlaceholderFragment.this.getActivity(), strArr)) {
+                            ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], strArr2, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Fragment) placeholderFragment, placeholderFragment.getString(R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Fragment) placeholderFragment2, placeholderFragment2.getString(R.string.permission_dialog_message_storage), getString(R.string.permission_function_storage))});
+                            if (!ActivityRequestPermissions.checkPermission(getActivity(), strArr)) {
                                 ActivityRequestPermissions.requestPermission((Fragment) PlaceholderFragment.this, permission, 2);
                                 return;
                             }
                         }
-                        PlaceholderFragment.this.saveImage();
+                        saveImage();
                     }
                 }
             });
             ((Button) inflate.findViewById(R.id.print_button)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    if (!PlaceholderFragment.this.checkProgress()) {
-                        PlaceholderFragment.this.startPrintPreviewActivity();
+                    if (!checkProgress()) {
+                        startPrintPreviewActivity();
                     }
                 }
             });
             ((Button) inflate.findViewById(R.id.retouch_button)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    if (!PlaceholderFragment.this.checkProgress()) {
-                        PlaceholderFragment.this.startImageCollectActivity();
+                    if (!checkProgress()) {
+                        startImageCollectActivity();
                     }
                 }
             });
@@ -259,7 +259,7 @@ public class ImagePreviewActivity extends ActivityIACommon {
                     imageFolderFileViewModel.setOriginalData(imageFolderFile);
                     imageFolderFileViewModel.getData().observe(this, new Observer<ImageFolderFile>() {
                         public void onChanged(@Nullable ImageFolderFile imageFolderFile) {
-                            PlaceholderFragment.this.localFolderFileViewModelPrepared(imageFolderFile);
+                            localFolderFileViewModelPrepared(imageFolderFile);
                         }
                     });
                 }

app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java

@@ -140,34 +140,34 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         public boolean handleMessage(Message message) {
             int i = message.what;
             if (i == 3) {
-                PrintPreviewActivity.this.startLoadtask();
+                startLoadtask();
             } else if (i == 5) {
-                PrintPreviewActivity.this.disablePrintButton();
-                PrintPreviewActivity.this.startPrint();
+                disablePrintButton();
+                startPrint();
             } else if (i != 100) {
                 switch (i) {
                     case 0:
-                        PrintPreviewActivity.this.showProgressDialog();
+                        showProgressDialog();
                         break;
                     case 1:
-                        PrintPreviewActivity.this.dismissProgressDialog();
+                        dismissProgressDialog();
                         break;
                     default:
                         switch (i) {
                             case 7:
                                 if (PrintPreviewActivity.mImageList.size() <= 0) {
-                                    PrintPreviewActivity.this.disablePrintButton();
+                                    disablePrintButton();
                                 }
                                 PrintPreviewActivity printPreviewActivity = PrintPreviewActivity.this;
                                 Toast.makeText(printPreviewActivity, printPreviewActivity.getString(R.string.file_size_notsupport), 1).show();
                                 break;
                             case 8:
-                                PrintPreviewActivity.this.updateManuscriptScaleText((message.obj).doubleValue());
+                                updateManuscriptScaleText((message.obj).doubleValue());
                                 return true;
                         }
                 }
             } else {
-                PrintPreviewActivity.this.updatePaperDisplay(message);
+                updatePaperDisplay(message);
             }
             return true;
         }
@@ -204,7 +204,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         mReviewInvitationViewModel.getShowInvitationLiveData().observe(this, new Observer<Boolean>() {
             public void onChanged(@Nullable Boolean bool) {
                 if (bool.booleanValue()) {
-                    PrintPreviewActivity.this.showStoreDialog();
+                    showStoreDialog();
                 }
             }
         });
@@ -228,7 +228,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         mOriginalImageSizeButton = (Button) findViewById(R.id.paper_size_button);
         mOriginalImageSizeButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                PrintPreviewActivity.this.startOrgImageSizeActivity();
+                startOrgImageSizeActivity();
             }
         });
         rotateButton = (Button) findViewById(R.id.rotate_button);
@@ -625,7 +625,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                     AlertDialog.Builder cancelable = new AlertDialog.Builder(this).setCancelable(false);
                     cancelable.setMessage(getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            PrintPreviewActivity.this.check3GAndStartPrint();
+                            check3GAndStartPrint();
                         }
                     }).setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
@@ -717,7 +717,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         }
 
         protected void onPreExecute() {
-            PrintPreviewActivity.this.showProgressDialog();
+            showProgressDialog();
         }
 
         protected Boolean doInBackground(Void... voidArr) {
@@ -743,7 +743,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 return false;
             }
             if (PrintPreviewActivity.mEpsonService != null) {
-                if (PrintPreviewActivity.this.isRemotePrinter()) {
+                if (isRemotePrinter()) {
                     PrintPreviewActivity.mEpsonService.EpsonConnectUpdatePrinterSettings(PrintSetting.Kind.cameracopy.name());
                 } else {
                     PrintPreviewActivity.mEpsonService.updatePrinterSettings(PrintSetting.Kind.cameracopy.name());
@@ -753,12 +753,12 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         }
 
         protected void onPostExecute(Boolean bool) {
-            PrintPreviewActivity.this.loadPrinterSettingAndChangeView(false);
-            PrintPreviewActivity.this.dismissProgressDialog();
-            if (PrintPreviewActivity.this.bAutoStartPrint) {
+            loadPrinterSettingAndChangeView(false);
+            dismissProgressDialog();
+            if (bAutoStartPrint) {
                 PrintPreviewActivity printPreviewActivity = PrintPreviewActivity.this;
                 printPreviewActivity.onClick(printPreviewActivity.printButton);
-                PrintPreviewActivity.this.bAutoStartPrint = false;
+                bAutoStartPrint = false;
             }
         }
     }

app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java

@@ -68,11 +68,11 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         public void handleMessage(Message message) {
             if (message.what != 0) {
                 EPLog.w(EpsoniPrintSharedActivity.LOG_TAG, "handleMessage::default");
-                EpsoniPrintSharedActivity.this.CleanUp();
+                CleanUp();
                 return;
             }
             EPLog.i(EpsoniPrintSharedActivity.LOG_TAG, "handleMessage::0");
-            EpsoniPrintSharedActivity.this.setWait();
+            setWait();
         }
     };
     private DialogProgressViewModel mModelDialog;
@@ -174,7 +174,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         mModelDialog.doShow(DIALOG_WAIT);
         thread = new Thread(new Runnable() {
             public void run() {
-                EpsoniPrintSharedActivity.this.backgroundJob();
+                backgroundJob();
             }
         });
         try {

app/src/main/java/com/epson/iprint/storage/StorageProcessDownloadActivity.java

@@ -143,24 +143,24 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         StorageActivity.OverlayProgress progress = null;
 
         protected void onPreExecute() {
-            StorageProcessDownloadActivity.this.taskInvoked(true);
+            taskInvoked(true);
         }
 
         protected Void doInBackground(Void... voidArr) {
-            final StorageServiceClient.Downloader downloader = StorageProcessDownloadActivity.this.getStorageClient().getDownloader(StorageProcessDownloadActivity.this, item, localPath);
+            final StorageServiceClient.Downloader downloader = getStorageClient().getDownloader(StorageProcessDownloadActivity.this, item, localPath);
             C09241 r0 = downloader.isCancelable() ? new StorageActivity.CancelRequestCallback() {
                 public void onCancelRequest(Intent intent) {
                     downloader.cancel();
                 }
             } : null;
             progress = new StorageActivity.OverlayProgress();
-            progress.show(StorageProcessDownloadActivity.this.getString(R.string.downloading_notification), r0);
+            progress.show(getString(R.string.downloading_notification), r0);
             downloader.start(new StorageServiceClient.DownloadCompletion() {
                 public void onDownloadComplete(StorageItem storageItem, String str, StorageServiceClient.ProcessError processError) {
                     if (str != null) {
-                        DownloadTask.this.localPath = str;
+                        localPath = str;
                     }
-                    StorageProcessDownloadActivity.this.runOnUiThread(new DownloadedRun(processError));
+                    runOnUiThread(new DownloadedRun(processError));
                 }
             });
             return null;
@@ -174,26 +174,26 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
             }
 
             public void run() {
-                boolean unused = StorageProcessDownloadActivity.this.mIsDownloading = false;
+                boolean unused = mIsDownloading = false;
                 if (error == StorageServiceClient.ProcessError.NONE) {
                     StorageProcessDownloadActivity storageProcessDownloadActivity = StorageProcessDownloadActivity.this;
-                    Intent previewIntent = StorageProcessDownloadActivity.getPreviewIntent(DownloadTask.this.localPath, storageProcessDownloadActivity, StorageProcessDownloadActivity.this.mPrintLog);
+                    Intent previewIntent = StorageProcessDownloadActivity.getPreviewIntent(localPath, storageProcessDownloadActivity, mPrintLog);
                     previewIntent.setFlags(Videoio.CAP_INTELPERC_IMAGE_GENERATOR);
-                    StorageProcessDownloadActivity.this.saveDownloadedFilePath(DownloadTask.this.localPath);
-                    if (!StorageProcessDownloadActivity.this.mIsDownloadInterruption) {
+                    saveDownloadedFilePath(localPath);
+                    if (!mIsDownloadInterruption) {
                         storageProcessDownloadActivity.startActivityForResult(previewIntent, 0);
                     }
                 } else if (error != StorageServiceClient.ProcessError.CANCELED) {
-                    StorageProcessDownloadActivity.this.showErrorDialog((int) R.string.download_error_mes);
+                    showErrorDialog((int) R.string.download_error_mes);
                 }
-                StorageProcessDownloadActivity.this.taskInvoked(false);
-                DownloadTask.this.progress.dismiss();
+                taskInvoked(false);
+                progress.dismiss();
             }
         }
 
         DownloadTask(StorageItem storageItem) {
             item = storageItem;
-            localPath = StorageProcessDownloadActivity.this.getStorageClient().getDownloadLocalPath(StorageProcessDownloadActivity.this, storageItem);
+            localPath = getStorageClient().getDownloadLocalPath(StorageProcessDownloadActivity.this, storageItem);
         }
     }
 
@@ -233,46 +233,46 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
             public void onEnumerateComplete(List<StorageItem> list, final StorageServiceClient.ProcessError processError) {
                 EnumerateTask enumerateTask = EnumerateTask.this;
                 enumerateTask.enumeratedItems = list;
-                int size = StorageProcessDownloadActivity.this.mFolderStack.size();
+                int size = mFolderStack.size();
                 if (size > 1) {
-                    StorageItem storageItem = (StorageItem) StorageProcessDownloadActivity.this.mFolderStack.get(size - 2);
+                    StorageItem storageItem = (StorageItem) mFolderStack.get(size - 2);
                     StorageItem storageItem2 = new StorageItem("..");
                     storageItem2.path = storageItem.path;
                     storageItem2.type = StorageItem.ItemType.DIRECTORY;
                     storageItem2.userInfo = storageItem.userInfo;
-                    if (EnumerateTask.this.enumeratedItems == null) {
-                        EnumerateTask.this.enumeratedItems = new ArrayList();
+                    if (enumeratedItems == null) {
+                        enumeratedItems = new ArrayList();
                     }
-                    EnumerateTask.this.enumeratedItems.add(0, storageItem2);
+                    enumeratedItems.add(0, storageItem2);
                 }
-                StorageProcessDownloadActivity.this.runOnUiThread(new Runnable() {
+                runOnUiThread(new Runnable() {
                     public void run() {
-                        if (processError == StorageServiceClient.ProcessError.NONE && EnumerateTask.this.enumeratedItems != null) {
-                            StorageProcessDownloadActivity.this.mListView.setAdapter(new StorageItemAdapter(EnumerateTask.this.enumeratedItems));
+                        if (processError == StorageServiceClient.ProcessError.NONE && enumeratedItems != null) {
+                            mListView.setAdapter(new StorageItemAdapter(enumeratedItems));
                         } else if (processError != StorageServiceClient.ProcessError.CANCELED) {
-                            StorageProcessDownloadActivity.this.showErrorDialog((int) R.string.unknow_error_mes);
+                            showErrorDialog((int) R.string.unknow_error_mes);
                         }
-                        StorageProcessDownloadActivity.this.taskInvoked(false);
-                        EnumerateTask.this.progress.dismiss();
+                        taskInvoked(false);
+                        progress.dismiss();
                     }
                 });
             }
         };
         StorageServiceClient.EnumerateCompletion onLoadedMore = new StorageServiceClient.EnumerateCompletion() {
             public void onEnumerateComplete(final List<StorageItem> list, final StorageServiceClient.ProcessError processError) {
-                StorageProcessDownloadActivity.this.runOnUiThread(new Runnable() {
+                runOnUiThread(new Runnable() {
                     public void run() {
                         if (processError == StorageServiceClient.ProcessError.NONE) {
-                            StorageItemAdapter storageItemAdapter = (StorageItemAdapter) StorageProcessDownloadActivity.this.mListView.getAdapter();
+                            StorageItemAdapter storageItemAdapter = (StorageItemAdapter) mListView.getAdapter();
                             if (storageItemAdapter != null) {
                                 storageItemAdapter.addLoaedMoreItems(list);
                                 storageItemAdapter.notifyDataSetChanged();
                             }
                         } else if (processError != StorageServiceClient.ProcessError.CANCELED) {
-                            StorageProcessDownloadActivity.this.showErrorDialog((int) R.string.unknow_error_mes);
+                            showErrorDialog((int) R.string.unknow_error_mes);
                         }
-                        StorageProcessDownloadActivity.this.taskInvoked(false);
-                        EnumerateTask.this.progress.dismiss();
+                        taskInvoked(false);
+                        progress.dismiss();
                     }
                 });
             }
@@ -280,24 +280,24 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         StorageActivity.OverlayProgress progress = new StorageActivity.OverlayProgress();
 
         protected void onPreExecute() {
-            StorageProcessDownloadActivity.this.taskInvoked(true);
+            taskInvoked(true);
         }
 
         protected Void doInBackground(Void... voidArr) {
-            boolean isNeedSignin = StorageProcessDownloadActivity.this.getStorageClient().isNeedSignin();
+            boolean isNeedSignin = getStorageClient().isNeedSignin();
             if (!isNeedSignin) {
                 progress.show();
             }
             if (item.type == StorageItem.ItemType.LOADMORE) {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onLoadedMore);
+                getEnumerator().enumerate(item, onLoadedMore);
                 return null;
             } else if (!isNeedSignin) {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onEnumerated);
+                getEnumerator().enumerate(item, onEnumerated);
                 return null;
             } else {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onEnumerated, new StorageServiceClient.SigninCompletion() {
+                getEnumerator().enumerate(item, onEnumerated, new StorageServiceClient.SigninCompletion() {
                     public void onSigninCompletion() {
-                        EnumerateTask.this.progress.show((String) null, (StorageActivity.CancelRequestCallback) null, false);
+                        progress.show((String) null, (StorageActivity.CancelRequestCallback) null, false);
                     }
                 });
                 return null;
@@ -314,8 +314,8 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
 
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-            int unused = StorageProcessDownloadActivity.this.mPosition = i;
-            StorageProcessDownloadActivity.this.itemClick(i);
+            int unused = mPosition = i;
+            itemClick(i);
         }
     }
 
@@ -380,7 +380,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                     case LOADMORE:
                         String str = storageItem.name;
                         if (str == null) {
-                            str = StorageProcessDownloadActivity.this.getString(R.string.storage_item_load_more_photos);
+                            str = getString(R.string.storage_item_load_more_photos);
                         }
                         setViewComponents(view2, str, -12345, -12345);
                         break;
@@ -389,7 +389,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                         break;
                     case PHOTO:
                         setViewComponents(view2, storageItem.name, R.drawable.image, -12345);
-                        StorageProcessDownloadActivity.this.getEnumerator().setThumbnailInBackground(storageItem, getIconView(view2));
+                        getEnumerator().setThumbnailInBackground(storageItem, getIconView(view2));
                         break;
                 }
                 viewCache.put(storageItem, view2);
@@ -398,8 +398,8 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
 
         StorageItemAdapter(List<StorageItem> list) {
-            super(StorageProcessDownloadActivity.this.getBaseContext(), R.layout.file_list_item, list);
-            layoutInflater = (LayoutInflater) StorageProcessDownloadActivity.this.getBaseContext().getSystemService(Service.LAYOUT_INFLATER_SERVICE);
+            super(getBaseContext(), R.layout.file_list_item, list);
+            layoutInflater = (LayoutInflater) getBaseContext().getSystemService(Service.LAYOUT_INFLATER_SERVICE);
             storageItems = list;
             viewCache = new HashMap<>();
         }

app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java

@@ -45,24 +45,24 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         button.setText(getString(R.string.upload_btn_label));
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                String filename = StorageProcessUploadActivity.this.getFilename();
-                if (!StorageProcessUploadActivity.this.getStorageClient().isValidUploadName(filename)) {
-                    StorageProcessUploadActivity.this.showErrorDialog((int) R.string.str_error_Filename);
-                } else if (StorageProcessUploadActivity.this.isConnected()) {
+                String filename = getFilename();
+                if (!getStorageClient().isValidUploadName(filename)) {
+                    showErrorDialog((int) R.string.str_error_Filename);
+                } else if (isConnected()) {
                     button.setEnabled(false);
                     UploadTask uploadTask = new UploadTask();
-                    uploadTask.localPaths = new ArrayList(StorageProcessUploadActivity.this.mUploadFileLocalPathList);
+                    uploadTask.localPaths = new ArrayList(mUploadFileLocalPathList);
                     uploadTask.uploadFilename = filename;
-                    uploadTask.fileType = StorageProcessUploadActivity.this.getFiletype();
+                    uploadTask.fileType = getFiletype();
                     uploadTask.execute(new Void[0]);
                 } else {
-                    StorageProcessUploadActivity.this.showConnectionError();
+                    showConnectionError();
                 }
             }
         });
         bindClearButton(R.id.upload_dialog_file_name, R.id.clear_name_btn, new StorageActivity.OnVisibilityListener() {
             public void onVisibilityChanged(int i) {
-                StorageProcessUploadActivity.this.setEnabledSaveButton(i == 0);
+                setEnabledSaveButton(i == 0);
             }
         });
         mUploadFilename = generateUploadFilename(0);
@@ -107,12 +107,12 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         protected Void doInBackground(Void... voidArr) {
             final ReentrantLock reentrantLock;
             final StorageActivity.OverlayProgress overlayProgress = new StorageActivity.OverlayProgress();
-            overlayProgress.show(StorageProcessUploadActivity.this.getString(R.string.uploading_notification), new StorageActivity.CancelRequestCallback() {
+            overlayProgress.show(getString(R.string.uploading_notification), new StorageActivity.CancelRequestCallback() {
                 public void onCancelRequest(Intent intent) {
-                    if (UploadTask.this.uploader != null && UploadTask.this.uploader.isCancelable()) {
-                        UploadTask.this.uploader.cancel();
+                    if (uploader != null && uploader.isCancelable()) {
+                        uploader.cancel();
                     }
-                    UploadTask.this.canceled = true;
+                    canceled = true;
                 }
             });
             String str = "";
@@ -125,7 +125,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
             } else if (StorageServiceClient.UploadFileType.JPEG.equals(fileType)) {
                 str = ".jpg";
             }
-            boolean z = !this.uploadFilename.equals(StorageProcessUploadActivity.this.generateUploadFilename(0));
+            boolean z = !this.uploadFilename.equals(generateUploadFilename(0));
             int size = localPaths.size();
             int i = 0;
             while (true) {
@@ -138,9 +138,9 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                     if (z) {
                         str4 = String.format("%s%03d%s", new Object[]{uploadFilename, Integer.valueOf(i + 1), str});
                     } else {
-                        str4 = String.format("%s%s", new Object[]{StorageProcessUploadActivity.this.generateUploadFilename(i), str});
+                        str4 = String.format("%s%s", new Object[]{generateUploadFilename(i), str});
                     }
-                    overlayProgress.changeMessage(StorageProcessUploadActivity.this.getString(R.string.uploading_notification) + (i + 1) + CommonDefine.SLASH + size);
+                    overlayProgress.changeMessage(getString(R.string.uploading_notification) + (i + 1) + CommonDefine.SLASH + size);
                 }
                 reentrantLock = new ReentrantLock();
                 final Condition newCondition = reentrantLock.newCondition();
@@ -148,13 +148,13 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                     reentrantLock.lock();
                     uploaded = false;
                     taskError = StorageServiceClient.ProcessError.NONE;
-                    uploader = StorageProcessUploadActivity.this.getStorageClient().getUploader(StorageProcessUploadActivity.this, fileType, str3, str4);
+                    uploader = getStorageClient().getUploader(StorageProcessUploadActivity.this, fileType, str3, str4);
                     uploader.start(new StorageServiceClient.UploadCompletion() {
                         public void onUploadComplete(String str, String str2, StorageServiceClient.ProcessError processError) {
                             try {
                                 reentrantLock.lock();
-                                StorageServiceClient.ProcessError unused = UploadTask.this.taskError = processError;
-                                UploadTask.this.uploaded = true;
+                                StorageServiceClient.ProcessError unused = taskError = processError;
+                                uploaded = true;
                                 newCondition.signal();
                             } catch (Exception e) {
                                 EPLog.w("Storage", "onUploadComplete() exception <" + e.toString() + ">");
@@ -184,16 +184,16 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                 taskError = StorageServiceClient.ProcessError.CANCELED;
             }
             reentrantLock.unlock();
-            StorageProcessUploadActivity.this.runOnUiThread(new Runnable() {
+            runOnUiThread(new Runnable() {
                 public void run() {
-                    if (UploadTask.this.taskError == StorageServiceClient.ProcessError.NONE) {
+                    if (taskError == StorageServiceClient.ProcessError.NONE) {
                         overlayProgress.dismiss();
-                        StorageProcessUploadActivity.this.finish();
+                        finish();
                         return;
                     }
-                    StorageProcessUploadActivity.this.setEnabledSaveButton(true);
-                    if (UploadTask.this.taskError == StorageServiceClient.ProcessError.ERROR) {
-                        StorageProcessUploadActivity.this.showErrorDialog((int) R.string.upload_error_mes);
+                    setEnabledSaveButton(true);
+                    if (taskError == StorageServiceClient.ProcessError.ERROR) {
+                        showErrorDialog((int) R.string.upload_error_mes);
                     }
                     overlayProgress.dismiss();
                 }

app/src/main/java/com/epson/iprint/storage/StorageSignInActivity.java

@@ -106,24 +106,24 @@ public abstract class StorageSignInActivity extends StorageActivity {
         StorageActivity.OverlayProgress progress;
 
         BasicSignInTask() {
-            mUserName = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_username_content)).getText().toString();
-            mPassword = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_password_content)).getText().toString();
+            mUserName = ((EditText) findViewById(R.id.login_username_content)).getText().toString();
+            mPassword = ((EditText) findViewById(R.id.login_password_content)).getText().toString();
         }
 
         protected Boolean doInBackground(Void... voidArr) {
             progress = new StorageActivity.OverlayProgress();
             progress.show();
-            return Boolean.valueOf(StorageSignInActivity.this.mBasicSignIn.signInBackground(mUserName, mPassword));
+            return Boolean.valueOf(mBasicSignIn.signInBackground(mUserName, mPassword));
         }
 
         protected void onPostExecute(Boolean bool) {
             if (!bool.booleanValue()) {
-                StorageSignInActivity.this.showLoginError();
+                showLoginError();
                 progress.dismiss();
                 return;
             }
             progress.dismiss();
-            StorageSignInActivity.this.finish();
+            finish();
         }
     }
 

app/src/main/java/com/epson/iprint/storage/StorageWaitingActivity.java

@@ -51,13 +51,13 @@ public class StorageWaitingActivity extends Activity {
         mBroadcastReceiver = new BroadcastReceiver() {
             public void onReceive(Context context, Intent intent) {
                 String action = intent.getAction();
-                if (StorageWaitingActivity.this.mRequestCode == intent.getIntExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, 0)) {
+                if (mRequestCode == intent.getIntExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, 0)) {
                     if (action.equals(StorageWaitingActivity.DISMISS_ACTION)) {
-                        StorageWaitingActivity.this.finish();
+                        finish();
                     } else if (action.equals(StorageWaitingActivity.CHANGE_ACTION)) {
-                        StorageWaitingActivity.this.setMessage(intent);
+                        setMessage(intent);
                     } else if (action.equals(StorageWaitingActivity.REGISTER_ACTION)) {
-                        StorageWaitingActivity.this.setCancelRequest(intent);
+                        setCancelRequest(intent);
                     }
                 }
             }
@@ -75,17 +75,17 @@ public class StorageWaitingActivity extends Activity {
         builder.setCancelable(false);
         builder.setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                StorageWaitingActivity.this.mCancelButton.setEnabled(false);
-                StorageWaitingActivity.this.mMessageText.setText(StorageWaitingActivity.this.getString(R.string.EPS_PRNST_CANCELLING_MSG));
+                mCancelButton.setEnabled(false);
+                mMessageText.setText(getString(R.string.EPS_PRNST_CANCELLING_MSG));
                 Intent intent = new Intent(StorageWaitingActivity.CANCEL_REQUEST_ACTION);
-                intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, StorageWaitingActivity.this.mRequestCode);
-                StorageWaitingActivity.this.sendBroadcast(intent);
+                intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, mRequestCode);
+                sendBroadcast(intent);
                 dialogInterface.cancel();
             }
         });
         builder.setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                StorageWaitingActivity.this.mCancelButton.setEnabled(true);
+                mCancelButton.setEnabled(true);
                 dialogInterface.cancel();
             }
         });
@@ -98,7 +98,7 @@ public class StorageWaitingActivity extends Activity {
         if (intent.getBooleanExtra(EXTRA_CANCEL_ENABLED, false)) {
             mCancelButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    StorageWaitingActivity.this.createCancelDialog().show();
+                    createCancelDialog().show();
                 }
             });
             mCancelButton.setVisibility(0);

app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveStorageProcessUploadActivity.java

@@ -39,16 +39,16 @@ public class OneDriveStorageProcessUploadActivity extends StorageProcessUploadAc
                 new Thread() {
                     public void run() {
                         super.run();
-                        OneDriveStorageProcessUploadActivity.this.mStorageServiceClient.getOneDriveClient(OneDriveStorageProcessUploadActivity.this, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
+                        OneDrivemStorageServiceClient.getOneDriveClient(OneDriveStorageProcessUploadActivity.this, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
                             public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
-                                OneDriveStorageProcessUploadActivity.this.findViewById(R.id.folder_content_layout_for_upload).setVisibility(0);
+                                OneDrivefindViewById(R.id.folder_content_layout_for_upload).setVisibility(0);
                                 if (iOneDriveClient == null) {
-                                    OneDriveStorageProcessUploadActivity.this.mStorageServiceClient.revokeSignedInData(OneDriveStorageProcessUploadActivity.this);
-                                    OneDriveStorageProcessUploadActivity.this.updateSignInStatus();
-                                } else if (OneDriveStorageProcessUploadActivity.this.mExpired) {
-                                    OneDriveStorageProcessUploadActivity.this.mExpired = false;
-                                    OneDriveStorageProcessUploadActivity.this.mStorageServiceClient.resetUploadProcessError();
-                                    ((Button) OneDriveStorageProcessUploadActivity.this.findViewById(R.id.save_button)).performClick();
+                                    OneDrivemStorageServiceClient.revokeSignedInData(OneDriveStorageProcessUploadActivity.this);
+                                    OneDriveupdateSignInStatus();
+                                } else if (OneDrivemExpired) {
+                                    OneDrivemExpired = false;
+                                    OneDrivemStorageServiceClient.resetUploadProcessError();
+                                    ((Button) OneDrivefindViewById(R.id.save_button)).performClick();
                                 }
                             }
                         });

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java

@@ -36,11 +36,11 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                         String string2 = data.getString(escprLib.PRINTER_IP);
                         String string3 = data.getString("id");
                         if (string != null && string2 != null && string3 != null) {
-                            ActivityWiFiDirectManual.this.interruptFindingPrinter();
+                            interruptFindingPrinter();
                             Intent intent = new Intent();
                             intent.putExtras(data);
-                            ActivityWiFiDirectManual.this.setResult(-1, intent);
-                            ActivityWiFiDirectManual.this.finish();
+                            setResult(-1, intent);
+                            finish();
                             return;
                         }
                         return;
@@ -81,7 +81,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 Intent intent = new Intent(ActivityWiFiDirectManual.this, ActivityControlWiFi.class);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);
                 intent.putExtra(ActivityControlWiFi.SHOWWIFISETTINGS, true);
-                ActivityWiFiDirectManual.this.startActivityForResult(intent, 0);
+                startActivityForResult(intent, 0);
             }
         });
         mNoLcdGuidanceWebView = (WebView) findViewById(R.id.guidance_webview);

app/src/main/java/epson/print/ActivityDocsPrintPreview.java

@@ -201,7 +201,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
     private float mStartX;
     final Handler mUiHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
-            if (ActivityDocsPrintPreview.this.isFinishing()) {
+            if (isFinishing()) {
                 int i = message.what;
                 if (!(i == 4 || i == 6 || i == 13 || i == 22 || i == 39 || i == 50 || i == 100)) {
                     switch (i) {
@@ -229,10 +229,10 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             switch (message.what) {
                 case 0:
                     EPLog.d(ActivityDocsPrintPreview.TAG, "handleMessage : CONVERTED_OK");
-                    ActivityDocsPrintPreview.this.enableProgressBar(false);
+                    enableProgressBar(false);
                     int unused = ActivityDocsPrintPreview.mCurrentPageView = message.getData().getInt(CommonDefine.CONVERTED_PAGE);
-                    ActivityDocsPrintPreview.this.updatePageTextView();
-                    ActivityDocsPrintPreview.this.updatePrevNextButtonView();
+                    updatePageTextView();
+                    updatePrevNextButtonView();
                     ActivityDocsPrintPreview activityDocsPrintPreview = ActivityDocsPrintPreview.this;
                     activityDocsPrintPreview.setNewImageView(activityDocsPrintPreview.mPdfRender.getConvertedPagePreview());
                     if (ActivityDocsPrintPreview.mCurrentPageView == 1) {
@@ -247,32 +247,32 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                         ActivityDocsPrintPreview activityDocsPrintPreview5 = ActivityDocsPrintPreview.this;
                         activityDocsPrintPreview5.onClick(activityDocsPrintPreview5.mPrint);
                         EPLog.d(ActivityDocsPrintPreview.TAG, "onClick(mPrint)");
-                        ActivityDocsPrintPreview.this.bAutoStartPrint = false;
+                        bAutoStartPrint = false;
                         break;
                     }
                     break;
                 case 1:
-                    ActivityDocsPrintPreview.this.showDialog(2);
+                    showDialog(2);
                     break;
                 case 4:
                     EPLog.d(ActivityDocsPrintPreview.TAG, "handleMessage : STAR_CONVERT");
-                    ActivityDocsPrintPreview.this.enableProgressBar(true);
+                    enableProgressBar(true);
                     break;
                 case 6:
-                    ActivityDocsPrintPreview.this.enableProgressBar(false);
+                    enableProgressBar(false);
                     ActivityDocsPrintPreview activityDocsPrintPreview6 = ActivityDocsPrintPreview.this;
-                    activityDocsPrintPreview6.showErrorDialog(activityDocsPrintPreview6.getString(R.string.str_error_tile), ActivityDocsPrintPreview.this.getString(R.string.str_error_ms));
+                    activityDocsPrintPreview6.showErrorDialog(activityDocsPrintPreview6.getString(R.string.str_error_tile), getString(R.string.str_error_ms));
                     break;
                 case 7:
                     if (ActivityDocsPrintPreview.mPdfRender != null) {
                         ActivityDocsPrintPreview.mPdfRender.setMIsPreviewCon(false);
                         ActivityDocsPrintPreview.mPdfRender.setPrintingStt(false);
                     }
-                    ActivityDocsPrintPreview.this.cancelLoadRemotePreviewTask();
-                    if (ActivityDocsPrintPreview.this.isCreateJobDone) {
+                    cancelLoadRemotePreviewTask();
+                    if (isCreateJobDone) {
                         try {
                             ActivityDocsPrintPreview.mEpsonService.EpsonConnectEndJob();
-                            ActivityDocsPrintPreview.this.isCreateJobDone = false;
+                            isCreateJobDone = false;
                         } catch (RemoteException e) {
                             e.printStackTrace();
                         }
@@ -280,17 +280,17 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     ExternalFileUtils.getInstance(ActivityDocsPrintPreview.this).initTempViewDir();
                     ExternalFileUtils.getInstance(ActivityDocsPrintPreview.this).initTempCRDir();
                     ExternalFileUtils.getInstance(ActivityDocsPrintPreview.this).getPrintDir();
-                    ExternalFileUtils.getInstance(ActivityDocsPrintPreview.this.getApplicationContext()).initTempCacheDirectory(ExternalFileUtils.TempCacheDirectory.GOOGLE_DRIVE_CONVERT);
-                    ActivityDocsPrintPreview.this.finish();
+                    ExternalFileUtils.getInstance(getApplicationContext()).initTempCacheDirectory(ExternalFileUtils.TempCacheDirectory.GOOGLE_DRIVE_CONVERT);
+                    finish();
                     break;
                 case 10:
-                    ActivityDocsPrintPreview.this.enableProgressBar(true);
+                    enableProgressBar(true);
                     if (ActivityDocsPrintPreview.mEpsonService != null) {
-                        ActivityDocsPrintPreview.this.enableProgressBar(false);
+                        enableProgressBar(false);
                         int unused3 = ActivityDocsPrintPreview.mStartPageView = 1;
                         int unused4 = ActivityDocsPrintPreview.mCurrentPageView = 1;
                         int unused5 = ActivityDocsPrintPreview.mEndPageView = 1;
-                        ActivityDocsPrintPreview.this.resetPageRange();
+                        resetPageRange();
                         ActivityDocsPrintPreview activityDocsPrintPreview7 = ActivityDocsPrintPreview.this;
                         String unused6 = activityDocsPrintPreview7.docFileName = activityDocsPrintPreview7.docFileName_org;
                         ActivityDocsPrintPreview activityDocsPrintPreview8 = ActivityDocsPrintPreview.this;
@@ -298,15 +298,15 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                         if (MyPrinter.isRemotePrinter(activityDocsPrintPreview8)) {
                             ActivityDocsPrintPreview activityDocsPrintPreview9 = ActivityDocsPrintPreview.this;
                             int unused7 = activityDocsPrintPreview9.printMode = (activityDocsPrintPreview9.remoteEnableShowPreview ? 2 : 0) | 1;
-                            if (Utils.isECConvertFile(ActivityDocsPrintPreview.this.docFileName)) {
+                            if (Utils.isECConvertFile(docFileName)) {
                                 ActivityDocsPrintPreview activityDocsPrintPreview10 = ActivityDocsPrintPreview.this;
                                 int unused8 = activityDocsPrintPreview10.printMode = activityDocsPrintPreview10.printMode | 4;
-                            } else if (Utils.checkMimeType(ActivityDocsPrintPreview.this.docFileName, "application/pdf")) {
-                                if (!ActivityDocsPrintPreview.mPdfRender.openPdfFile(ActivityDocsPrintPreview.this.docFileName, "", ActivityDocsPrintPreview.this)) {
+                            } else if (Utils.checkMimeType(docFileName, "application/pdf")) {
+                                if (!ActivityDocsPrintPreview.mPdfRender.openPdfFile(docFileName, "", ActivityDocsPrintPreview.this)) {
                                     ActivityDocsPrintPreview activityDocsPrintPreview11 = ActivityDocsPrintPreview.this;
                                     int unused9 = activityDocsPrintPreview11.printMode = activityDocsPrintPreview11.printMode | 4;
                                 }
-                            } else if (Utils.isGConvertFile(ActivityDocsPrintPreview.this.docFileName)) {
+                            } else if (Utils.isGConvertFile(docFileName)) {
                                 ActivityDocsPrintPreview activityDocsPrintPreview12 = ActivityDocsPrintPreview.this;
                                 int unused10 = activityDocsPrintPreview12.printMode = activityDocsPrintPreview12.printMode | 8;
                                 ActivityDocsPrintPreview activityDocsPrintPreview13 = ActivityDocsPrintPreview.this;
@@ -318,18 +318,18 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                                 return false;
                             }
                         } else {
-                            int unused12 = ActivityDocsPrintPreview.this.printMode = 2;
-                            if (Utils.isGConvertFile(ActivityDocsPrintPreview.this.docFileName)) {
+                            int unused12 = printMode = 2;
+                            if (Utils.isGConvertFile(docFileName)) {
                                 ActivityDocsPrintPreview activityDocsPrintPreview15 = ActivityDocsPrintPreview.this;
                                 int unused13 = activityDocsPrintPreview15.printMode = activityDocsPrintPreview15.printMode | 8;
-                            } else if (!Utils.checkMimeType(ActivityDocsPrintPreview.this.docFileName, "application/pdf")) {
+                            } else if (!Utils.checkMimeType(docFileName, "application/pdf")) {
                                 ActivityDocsPrintPreview activityDocsPrintPreview16 = ActivityDocsPrintPreview.this;
                                 Toast.makeText(activityDocsPrintPreview16, activityDocsPrintPreview16.getString(R.string.file_size_notsupport), 1).show();
                                 ActivityDocsPrintPreview.mUiHandler.sendEmptyMessage(7);
                                 return false;
                             }
                         }
-                        if ((ActivityDocsPrintPreview.this.printMode & 2) != 0) {
+                        if ((printMode & 2) != 0) {
                             ActivityDocsPrintPreview.mDisablePreviewMsg.setVisibility(View.GONE);
                         } else {
                             ActivityDocsPrintPreview.mPageNum.setVisibility(4);
@@ -341,21 +341,21 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                         ActivityDocsPrintPreview.mImageView.setImageBitmap((Bitmap) null);
                         ActivityDocsPrintPreview activityDocsPrintPreview17 = ActivityDocsPrintPreview.this;
                         activityDocsPrintPreview17.setOrentationView(activityDocsPrintPreview17.mIsPortrait);
-                        if ((ActivityDocsPrintPreview.this.printMode & 8) == 0) {
+                        if ((printMode & 8) == 0) {
                             new AsyncTaskExecutor<Void, Void, Void>() {
                                 protected void onPreExecute() {
                                     super.onPreExecute();
-                                    ActivityDocsPrintPreview.this.enableProgressBar(true);
+                                    enableProgressBar(true);
                                 }
 
                                 protected Void doInBackground(Void... voidArr) {
-                                    ActivityDocsPrintPreview.this.adjustPrintSettings();
+                                    adjustPrintSettings();
                                     return null;
                                 }
 
                                 protected void onPostExecute(Void voidR) {
                                     super.onPostExecute(voidR);
-                                    ActivityDocsPrintPreview.this.enableProgressBar(false);
+                                    enableProgressBar(false);
                                     ActivityDocsPrintPreview.mUiHandler.sendEmptyMessage(11);
                                 }
                             }.executeOnExecutor(new Void[0]);
@@ -371,14 +371,14 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                                 }
 
                                 protected void onPostExecute(Boolean bool) {
-                                    if (!ActivityDocsPrintPreview.this.isFinishing()) {
+                                    if (!isFinishing()) {
                                         super.onPostExecute(bool);
                                         if (!bool.booleanValue()) {
-                                            ActivityDocsPrintPreview.this.showDialog(6);
-                                        } else if (ActivityDocsPrintPreview.this.confirmDlgShow) {
-                                            ActivityDocsPrintPreview.this.showDialog(5);
+                                            showDialog(6);
+                                        } else if (confirmDlgShow) {
+                                            showDialog(5);
                                         } else {
-                                            ActivityDocsPrintPreview.this.startConvertActivity();
+                                            startConvertActivity();
                                         }
                                     }
                                 }
@@ -390,32 +390,32 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                         break;
                     }
                 case 11:
-                    if ((ActivityDocsPrintPreview.this.printMode & 4) == 0) {
+                    if ((printMode & 4) == 0) {
                         ActivityDocsPrintPreview.mUiHandler.sendEmptyMessage(13);
                         break;
                     } else {
-                        boolean unused14 = ActivityDocsPrintPreview.this.disablePrintArea = true;
-                        if ((ActivityDocsPrintPreview.this.printMode & 2) != 0) {
-                            if (!ActivityDocsPrintPreview.this.remoteEnableShowWarning) {
+                        boolean unused14 = disablePrintArea = true;
+                        if ((printMode & 2) != 0) {
+                            if (!remoteEnableShowWarning) {
                                 ActivityDocsPrintPreview.mUiHandler.sendEmptyMessage(30);
                                 break;
                             } else {
-                                ActivityDocsPrintPreview.this.showDialog(12);
+                                showDialog(12);
                                 break;
                             }
                         } else {
-                            ActivityDocsPrintPreview.this.isEnableNFCTouch = true;
+                            isEnableNFCTouch = true;
                             break;
                         }
                     }
                 case 13:
-                    if (!ActivityDocsPrintPreview.mPdfRender.openPdfFile(ActivityDocsPrintPreview.this.docFileName, ActivityDocsPrintPreview.this.pdfpass, ActivityDocsPrintPreview.this)) {
+                    if (!ActivityDocsPrintPreview.mPdfRender.openPdfFile(docFileName, pdfpass, ActivityDocsPrintPreview.this)) {
                         if (ActivityDocsPrintPreview.mPdfRender.canPrintableDoc()) {
                             ActivityDocsPrintPreview activityDocsPrintPreview18 = ActivityDocsPrintPreview.this;
                             int unused15 = activityDocsPrintPreview18.mEndPageView = activityDocsPrintPreview18.mPdfRender.totalPages();
-                            ActivityDocsPrintPreview.this.resetPageRange();
-                            if ((ActivityDocsPrintPreview.this.printMode & 2) != 2) {
-                                ActivityDocsPrintPreview.this.isEnableNFCTouch = true;
+                            resetPageRange();
+                            if ((printMode & 2) != 2) {
+                                isEnableNFCTouch = true;
                                 break;
                             } else {
                                 ActivityDocsPrintPreview.mPdfRender.startConvertPage(ActivityDocsPrintPreview.mCurrentPageView, 1, 0);
@@ -432,8 +432,8 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     }
                 case 22:
                     ActivityDocsPrintPreview.mUiHandler.removeMessages(22);
-                    if ((ActivityDocsPrintPreview.this.printMode & 4) != 0 && !ActivityDocsPrintPreview.this.isCreateJobDone) {
-                        new PrintUploadTask().execute(new String[]{ActivityDocsPrintPreview.this.docFileName});
+                    if ((printMode & 4) != 0 && !isCreateJobDone) {
+                        new PrintUploadTask().execute(new String[]{docFileName});
                         break;
                     } else {
                         new PreparePrintTask().executeOnExecutor(new Void[0]);
@@ -441,18 +441,18 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     }
                     break;
                 case 30:
-                    ActivityDocsPrintPreview.this.enableProgressBar(false);
+                    enableProgressBar(false);
                     ActivityDocsPrintPreview activityDocsPrintPreview19 = ActivityDocsPrintPreview.this;
                     activityDocsPrintPreview19.loadRemotePreviewTask = new LoadRemotePreviewTask();
-                    ActivityDocsPrintPreview.this.loadRemotePreviewTask.execute(new String[]{ActivityDocsPrintPreview.this.docFileName});
+                    loadRemotePreviewTask.execute(new String[]{docFileName});
                     break;
                 case 31:
                     EPLog.d(ActivityDocsPrintPreview.TAG, "handleMessage : CONVERTED_OK_EC");
-                    ActivityDocsPrintPreview.this.enableProgressBar(false);
+                    enableProgressBar(false);
                     int unused16 = ActivityDocsPrintPreview.mCurrentPageView = message.getData().getInt(CommonDefine.CONVERTED_PAGE);
-                    ActivityDocsPrintPreview.this.updatePageTextView();
-                    ActivityDocsPrintPreview.this.updatePrevNextButtonView();
-                    ActivityDocsPrintPreview.this.setNewImageView((String) message.obj);
+                    updatePageTextView();
+                    updatePrevNextButtonView();
+                    setNewImageView((String) message.obj);
                     if (ActivityDocsPrintPreview.mBitmap != null) {
                         if (ActivityDocsPrintPreview.mBitmap.getWidth() > ActivityDocsPrintPreview.mBitmap.getHeight()) {
                             boolean unused17 = ActivityDocsPrintPreview.mIsPortrait = false;
@@ -468,30 +468,30 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                         ActivityDocsPrintPreview activityDocsPrintPreview22 = ActivityDocsPrintPreview.this;
                         activityDocsPrintPreview22.onClick(activityDocsPrintPreview22.mPrint);
                         EPLog.d(ActivityDocsPrintPreview.TAG, "onClick(mPrint)");
-                        ActivityDocsPrintPreview.this.bAutoStartPrint = false;
+                        bAutoStartPrint = false;
                         break;
                     }
                     break;
                 case 32:
-                    boolean unused19 = ActivityDocsPrintPreview.this.disablePrintArea = false;
-                    ActivityDocsPrintPreview.this.resetPageRange();
-                    ActivityDocsPrintPreview.this.updatePrevNextButtonView();
-                    ActivityDocsPrintPreview.this.updatePageTextView();
+                    boolean unused19 = disablePrintArea = false;
+                    resetPageRange();
+                    updatePrevNextButtonView();
+                    updatePageTextView();
                     break;
                 case 33:
-                    ActivityDocsPrintPreview.this.resetPageRangeBySettings();
-                    if ((ActivityDocsPrintPreview.this.printMode & 4) == 0) {
-                        if ((ActivityDocsPrintPreview.this.printMode & 2) == 0) {
+                    resetPageRangeBySettings();
+                    if ((printMode & 4) == 0) {
+                        if ((printMode & 2) == 0) {
                             ActivityDocsPrintPreview activityDocsPrintPreview23 = ActivityDocsPrintPreview.this;
                             activityDocsPrintPreview23.setOrentationView(activityDocsPrintPreview23.mIsPortrait);
                             break;
                         } else {
-                            ActivityDocsPrintPreview.this.loadConfig();
+                            loadConfig();
                             ActivityDocsPrintPreview.mPdfRender.startConvertPage(1, 1, 0);
                             break;
                         }
-                    } else if (ActivityDocsPrintPreview.this.isRemotePrintSettingsChanged()) {
-                        if ((ActivityDocsPrintPreview.this.printMode & 2) == 0) {
+                    } else if (isRemotePrintSettingsChanged()) {
+                        if ((printMode & 2) == 0) {
                             ActivityDocsPrintPreview activityDocsPrintPreview24 = ActivityDocsPrintPreview.this;
                             activityDocsPrintPreview24.isCreateJobDone = false;
                             activityDocsPrintPreview24.setOrentationView(activityDocsPrintPreview24.mIsPortrait);
@@ -503,9 +503,9 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     }
                     break;
                 case 39:
-                    String string = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_GENERAL_TITLE);
-                    String string2 = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_GENERAL);
-                    boolean unused20 = ActivityDocsPrintPreview.this.isBackKeyOK = true;
+                    String string = getString(R.string.ECC_ERR_SVR_GENERAL_TITLE);
+                    String string2 = getString(R.string.ECC_ERR_SVR_GENERAL);
+                    boolean unused20 = isBackKeyOK = true;
                     int i2 = message.arg1;
                     if (i2 != -1100) {
                         if (i2 != -1056) {
@@ -513,25 +513,25 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                                 switch (i2) {
                                     case EccErrorInfo.ECC_ERR_SVR_HTTP_NOT_FOUND /*-1209*/:
                                     case EccErrorInfo.ECC_ERR_SVR_BUSY /*-1208*/:
-                                        string = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_BUSY_TITLE);
-                                        string2 = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_BUSY) + "0X" + Integer.toHexString(message.arg1).toUpperCase() + ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_BUSY2);
+                                        string = getString(R.string.ECC_ERR_SVR_BUSY_TITLE);
+                                        string2 = getString(R.string.ECC_ERR_SVR_BUSY) + "0X" + Integer.toHexString(message.arg1).toUpperCase() + getString(R.string.ECC_ERR_SVR_BUSY2);
                                         break;
                                     case EccErrorInfo.ECC_ERR_SVR_PAGE_NOT_PREPARED /*-1207*/:
-                                        new AlertDialog.Builder(ActivityDocsPrintPreview.this).setCancelable(false).setTitle(string).setMessage(ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_PAGE_NOT_PREPARED)).setNegativeButton(ActivityDocsPrintPreview.this.getString(R.string.ok), new DialogInterface.OnClickListener() {
+                                        new AlertDialog.Builder(ActivityDocsPrintPreview.this).setCancelable(false).setTitle(string).setMessage(getString(R.string.ECC_ERR_SVR_PAGE_NOT_PREPARED)).setNegativeButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                                             public void onClick(DialogInterface dialogInterface, int i) {
-                                                ActivityDocsPrintPreview.this.enableProgressBar(false);
+                                                enableProgressBar(false);
                                                 dialogInterface.cancel();
                                             }
                                         }).create().show();
                                         return false;
                                     case -1206:
-                                        string = ActivityDocsPrintPreview.this.getString(R.string.epsonconnect_str_print_job_too_many_title);
-                                        string2 = ActivityDocsPrintPreview.this.getString(R.string.epsonconnect_str_print_job_too_many);
+                                        string = getString(R.string.epsonconnect_str_print_job_too_many_title);
+                                        string2 = getString(R.string.epsonconnect_str_print_job_too_many);
                                         break;
                                     case -1205:
-                                        string = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_FILE_TOO_LONG_TITLE);
+                                        string = getString(R.string.ECC_ERR_SVR_FILE_TOO_LONG_TITLE);
                                         try {
-                                            string2 = String.format(ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_FILE_TOO_LONG_FORMAT), new Object[]{Integer.valueOf(ActivityDocsPrintPreview.mEpsonService.EpsonConnectGetRemotePrintMaxFileSize() / 1048576)});
+                                            string2 = String.format(getString(R.string.ECC_ERR_SVR_FILE_TOO_LONG_FORMAT), new Object[]{Integer.valueOf(ActivityDocsPrintPreview.mEpsonService.EpsonConnectGetRemotePrintMaxFileSize() / 1048576)});
                                             break;
                                         } catch (Exception e2) {
                                             e2.printStackTrace();
@@ -541,52 +541,52 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                                     case -1200:
                                         break;
                                     case -1203:
-                                        string = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_INVALID_ACCESSKEY_TITLE);
-                                        string2 = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_INVALID_ACCESSKEY);
+                                        string = getString(R.string.ECC_ERR_SVR_INVALID_ACCESSKEY_TITLE);
+                                        string2 = getString(R.string.ECC_ERR_SVR_INVALID_ACCESSKEY);
                                         break;
                                     case -1202:
-                                        string = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_REMOTE_INVALID_TITLE);
-                                        string2 = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_REMOTE_INVALID);
+                                        string = getString(R.string.ECC_ERR_SVR_REMOTE_INVALID_TITLE);
+                                        string2 = getString(R.string.ECC_ERR_SVR_REMOTE_INVALID);
                                         break;
                                     case -1201:
-                                        string = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_NOT_REGISTERED_TITLE);
-                                        string2 = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_NOT_REGISTERED);
+                                        string = getString(R.string.ECC_ERR_SVR_NOT_REGISTERED_TITLE);
+                                        string2 = getString(R.string.ECC_ERR_SVR_NOT_REGISTERED);
                                         break;
                                 }
                             } else {
-                                string = ActivityDocsPrintPreview.this.getString(R.string.epsonconnect_str_error_filename_too_long_title);
-                                string2 = ActivityDocsPrintPreview.this.getString(R.string.epsonconnect_str_error_filename_too_long);
+                                string = getString(R.string.epsonconnect_str_error_filename_too_long_title);
+                                string2 = getString(R.string.epsonconnect_str_error_filename_too_long);
                             }
                         }
-                        string = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_GENERAL_TITLE);
-                        string2 = ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_GENERAL) + ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_GENERAL2) + "0X" + Integer.toHexString(message.arg1).toUpperCase() + ActivityDocsPrintPreview.this.getString(R.string.ECC_ERR_SVR_GENERAL3);
+                        string = getString(R.string.ECC_ERR_SVR_GENERAL_TITLE);
+                        string2 = getString(R.string.ECC_ERR_SVR_GENERAL) + getString(R.string.ECC_ERR_SVR_GENERAL2) + "0X" + Integer.toHexString(message.arg1).toUpperCase() + getString(R.string.ECC_ERR_SVR_GENERAL3);
                     } else {
-                        string = ActivityDocsPrintPreview.this.getString(R.string.EC_ERR_COMM_ERROR_TITLE);
-                        string2 = ActivityDocsPrintPreview.this.getString(R.string.EC_ERR_COMM_ERROR);
+                        string = getString(R.string.EC_ERR_COMM_ERROR_TITLE);
+                        string2 = getString(R.string.EC_ERR_COMM_ERROR);
                     }
-                    ActivityDocsPrintPreview.this.showErrorDialog(string, string2);
+                    showErrorDialog(string, string2);
                     break;
                 case 50:
                     ActivityDocsPrintPreview.mLn_zoomview.invalidate();
                     ActivityDocsPrintPreview.mRl_zoomview.invalidate();
                     break;
                 case 100:
-                    ArrayList unused21 = ActivityDocsPrintPreview.this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
-                    if (ActivityDocsPrintPreview.this.aPaperSourceSetting == null) {
-                        ActivityDocsPrintPreview.mSizeInfo.setBackground(ActivityDocsPrintPreview.this.getResources().getDrawable(R.drawable.text_view_boder));
-                        ActivityDocsPrintPreview.mSizeInfo.setTextColor(ActivityDocsPrintPreview.this.getResources().getColor(R.color.epson_blue));
-                        ActivityDocsPrintPreview.this.paperMissmath.setVisibility(View.GONE);
+                    ArrayList unused21 = aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
+                    if (aPaperSourceSetting == null) {
+                        ActivityDocsPrintPreview.mSizeInfo.setBackground(getResources().getDrawable(R.drawable.text_view_boder));
+                        ActivityDocsPrintPreview.mSizeInfo.setTextColor(getResources().getColor(R.color.epson_blue));
+                        paperMissmath.setVisibility(View.GONE);
                         break;
                     } else {
-                        ActivityDocsPrintPreview.mSizeInfo.setBackgroundColor(ActivityDocsPrintPreview.this.getResources().getColor(R.color.epson_blue));
-                        ActivityDocsPrintPreview.mSizeInfo.setTextColor(ActivityDocsPrintPreview.this.getResources().getColor(R.color.all_white));
+                        ActivityDocsPrintPreview.mSizeInfo.setBackgroundColor(getResources().getColor(R.color.epson_blue));
+                        ActivityDocsPrintPreview.mSizeInfo.setTextColor(getResources().getColor(R.color.all_white));
                         PrintSetting printSetting = new PrintSetting(ActivityDocsPrintPreview.this, PrintSetting.Kind.document);
                         printSetting.loadSettings();
-                        if (!ActivityDocsPrintPreview.this.paperSourceInfo.checkPaperMissmatch(printSetting, ActivityDocsPrintPreview.this.aPaperSourceSetting)) {
-                            ActivityDocsPrintPreview.this.paperMissmath.setVisibility(View.GONE);
+                        if (!paperSourceInfo.checkPaperMissmatch(printSetting, aPaperSourceSetting)) {
+                            paperMissmath.setVisibility(View.GONE);
                             break;
                         } else {
-                            ActivityDocsPrintPreview.this.paperMissmath.setVisibility(View.VISIBLE);
+                            paperMissmath.setVisibility(View.VISIBLE);
                             break;
                         }
                     }
@@ -611,7 +611,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         mReviewInvitationViewModel.getShowInvitationLiveData().observe(this, new Observer<Boolean>() {
             public void onChanged(@Nullable Boolean bool) {
                 if (bool.booleanValue()) {
-                    ActivityDocsPrintPreview.this.showStoreDialog();
+                    showStoreDialog();
                 }
             }
         });
@@ -672,12 +672,12 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         });
         mImageView.setOnTouchListener(new View.OnTouchListener() {
             public boolean onTouch(View view, MotionEvent motionEvent) {
-                Display defaultDisplay = ActivityDocsPrintPreview.this.getWindowManager().getDefaultDisplay();
+                Display defaultDisplay = getWindowManager().getDefaultDisplay();
                 Point point = new Point();
                 defaultDisplay.getSize(point);
                 float f = (float) point.y;
                 float f2 = (float) point.x;
-                if ((ActivityDocsPrintPreview.this.printMode & 2) == 0) {
+                if ((printMode & 2) == 0) {
                     return true;
                 }
                 if (f > f2) {
@@ -908,17 +908,17 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                             new AsyncTaskExecutor<Void, Void, Void>() {
                                 protected void onPreExecute() {
                                     super.onPreExecute();
-                                    ActivityDocsPrintPreview.this.enableProgressBar(true);
+                                    enableProgressBar(true);
                                 }
 
                                 protected Void doInBackground(Void... voidArr) {
-                                    ActivityDocsPrintPreview.this.adjustPrintSettings();
+                                    adjustPrintSettings();
                                     return null;
                                 }
 
                                 protected void onPostExecute(Void voidR) {
                                     super.onPostExecute(voidR);
-                                    ActivityDocsPrintPreview.this.enableProgressBar(false);
+                                    enableProgressBar(false);
                                     ActivityDocsPrintPreview.mUiHandler.sendEmptyMessage(11);
                                 }
                             }.executeOnExecutor(new Void[0]);
@@ -979,17 +979,17 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                             new AsyncTaskExecutor<Void, Void, Void>() {
                                 protected void onPreExecute() {
                                     super.onPreExecute();
-                                    ActivityDocsPrintPreview.this.enableProgressBar(true);
+                                    enableProgressBar(true);
                                 }
 
                                 protected Void doInBackground(Void... voidArr) {
-                                    ActivityDocsPrintPreview.this.adjustPrintSettings();
+                                    adjustPrintSettings();
                                     return null;
                                 }
 
                                 protected void onPostExecute(Void voidR) {
                                     super.onPostExecute(voidR);
-                                    ActivityDocsPrintPreview.this.enableProgressBar(false);
+                                    enableProgressBar(false);
                                     ActivityDocsPrintPreview activityDocsPrintPreview = ActivityDocsPrintPreview.this;
                                     activityDocsPrintPreview.bAutoStartPrint = true;
                                     activityDocsPrintPreview.mUiHandler.sendEmptyMessage(33);
@@ -1115,18 +1115,18 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     checkBox.setChecked(false);
                     checkBox.setOnClickListener(new View.OnClickListener() {
                         public void onClick(View view) {
-                            boolean unused = ActivityDocsPrintPreview.this.confirmDlgShow = !((CheckBox) view).isChecked();
+                            boolean unused = confirmDlgShow = !((CheckBox) view).isChecked();
                         }
                     });
                     create.setButton(-1, getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            if (!ActivityDocsPrintPreview.this.confirmDlgShow) {
+                            if (!confirmDlgShow) {
                                 SharedPreferences.Editor edit = PreferenceManager.getDefaultSharedPreferences(ActivityDocsPrintPreview.this).edit();
-                                edit.putBoolean(ActivityDocsPrintPreview.confirmDlgShowPref, ActivityDocsPrintPreview.this.confirmDlgShow);
+                                edit.putBoolean(ActivityDocsPrintPreview.confirmDlgShowPref, confirmDlgShow);
                                 edit.commit();
                             }
                             create.dismiss();
-                            ActivityDocsPrintPreview.this.startConvertActivity();
+                            startConvertActivity();
                         }
                     });
                     create.setButton(-2, getString(R.string.str_no), new DialogInterface.OnClickListener() {
@@ -1143,7 +1143,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     create2.setButton(-1, getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             create2.dismiss();
-                            ActivityDocsPrintPreview.this.startActivity(new Intent("android.settings.WIRELESS_SETTINGS"));
+                            startActivity(new Intent("android.settings.WIRELESS_SETTINGS"));
                             ActivityDocsPrintPreview.mUiHandler.sendEmptyMessage(7);
                         }
                     });
@@ -1232,8 +1232,8 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             final EditText editText = (EditText) inflate2.findViewById(R.id.etPassword);
             return new AlertDialog.Builder(this).setIcon(R.drawable.file).setTitle(getString(R.string.str_enter_pass)).setView(inflate2).setCancelable(false).setPositiveButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    String unused = ActivityDocsPrintPreview.this.pdfpass = editText.getText().toString();
-                    if (!ActivityDocsPrintPreview.mPdfRender.openPdfFile(ActivityDocsPrintPreview.this.docFileName, ActivityDocsPrintPreview.this.pdfpass, ActivityDocsPrintPreview.this)) {
+                    String unused = pdfpass = editText.getText().toString();
+                    if (!ActivityDocsPrintPreview.mPdfRender.openPdfFile(docFileName, pdfpass, ActivityDocsPrintPreview.this)) {
                         ActivityDocsPrintPreview.mUiHandler.sendEmptyMessage(13);
                     } else {
                         ActivityDocsPrintPreview.mUiHandler.sendEmptyMessage(1);
@@ -1277,7 +1277,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         }
 
         protected void onPreExecute() {
-            ActivityDocsPrintPreview.this.enableProgressBar(true);
+            enableProgressBar(true);
             ActivityDocsPrintPreview.mPrint.setEnabled(false);
             mIsLandscape = calcLandscape();
         }
@@ -1287,31 +1287,31 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         }
 
         protected Void doInBackground(Void... voidArr) {
-            if ((ActivityDocsPrintPreview.this.printMode & 4) != 0) {
-                ActivityDocsPrintPreview.this.cancelLoadRemotePreviewTask();
-            } else if ((ActivityDocsPrintPreview.this.printMode & 1) != 0) {
+            if ((printMode & 4) != 0) {
+                cancelLoadRemotePreviewTask();
+            } else if ((printMode & 1) != 0) {
                 OLD_setImageListForLocalPrinter();
             } else {
                 setImageListForLocalPrinter2();
             }
-            if ((ActivityDocsPrintPreview.this.printMode & 1) == 0) {
+            if ((printMode & 1) == 0) {
                 return null;
             }
-            SharedPreferences.Editor edit = ActivityDocsPrintPreview.this.getSharedPreferences("PrintSetting", 0).edit();
-            if ((ActivityDocsPrintPreview.this.printMode & 4) != 0) {
+            SharedPreferences.Editor edit = getSharedPreferences("PrintSetting", 0).edit();
+            if ((printMode & 4) != 0) {
                 edit.putInt(Constants.SOURCE_TYPE, 1);
                 tmpList.clear();
                 EPImage ePImage = new EPImage();
-                ePImage.loadImageFileName = ActivityDocsPrintPreview.this.docFileName_org;
-                ePImage.setOrgName(ActivityDocsPrintPreview.this.docFileName_org);
+                ePImage.loadImageFileName = docFileName_org;
+                ePImage.setOrgName(docFileName_org);
                 tmpList.add(ePImage);
             } else {
                 edit.putInt(Constants.SOURCE_TYPE, 3);
                 EPImage ePImage2 = tmpList.get(0);
-                if (ActivityDocsPrintPreview.this.docFileName_org.lastIndexOf(47) > 0) {
-                    ePImage2.webUrl = ActivityDocsPrintPreview.this.docFileName_org.substring(ActivityDocsPrintPreview.this.docFileName_org.lastIndexOf(47) + 1);
+                if (docFileName_org.lastIndexOf(47) > 0) {
+                    ePImage2.webUrl = docFileName_org.substring(docFileName_org.lastIndexOf(47) + 1);
                 } else {
-                    ePImage2.webUrl = ActivityDocsPrintPreview.this.docFileName_org;
+                    ePImage2.webUrl = docFileName_org;
                 }
             }
             edit.commit();
@@ -1325,7 +1325,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             }
             ActivityDocsPrintPreview.mPrintLog.previewType = 2;
             ActivityDocsPrintPreview activityDocsPrintPreview = ActivityDocsPrintPreview.this;
-            PrintProgress.ProgressParams unused2 = activityDocsPrintPreview.mLocalPrintProgressParams = new LocalDocumentParams(activityDocsPrintPreview.docFileName, ActivityDocsPrintPreview.this.docFileName_org, ActivityDocsPrintPreview.this.pdfpass, ActivityDocsPrintPreview.mPreviewPaperAreaLandscape, ActivityDocsPrintPreview.mStartPage, ActivityDocsPrintPreview.mEndPage, ActivityDocsPrintPreview.mPrintLog);
+            PrintProgress.ProgressParams unused2 = activityDocsPrintPreview.mLocalPrintProgressParams = new LocalDocumentParams(activityDocsPrintPreview.docFileName, docFileName_org, pdfpass, ActivityDocsPrintPreview.mPreviewPaperAreaLandscape, ActivityDocsPrintPreview.mStartPage, ActivityDocsPrintPreview.mEndPage, ActivityDocsPrintPreview.mPrintLog);
         }
 
         private void OLD_setImageListForLocalPrinter() {
@@ -1371,15 +1371,15 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                 }
                 ePImage2.srcWidth = i2;
                 ePImage2.srcHeight = i;
-                ePImage2.setOrgName(ActivityDocsPrintPreview.this.docFileName_org);
+                ePImage2.setOrgName(docFileName_org);
             }
         }
 
         protected void onPostExecute(Void voidR) {
             super.onPostExecute(voidR);
             EPImageList unused = ActivityDocsPrintPreview.mPrintImageList = tmpList;
-            ActivityDocsPrintPreview.this.enableProgressBar(false);
-            ActivityDocsPrintPreview.this.check3GAndStartPrint();
+            enableProgressBar(false);
+            check3GAndStartPrint();
         }
     }
 
@@ -1416,8 +1416,8 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
 
         protected void onPreExecute() {
             ActivityDocsPrintPreview.mRemotePreviewImageList.clear();
-            ActivityDocsPrintPreview.this.updatePageTextView();
-            ActivityDocsPrintPreview.this.loadConfig();
+            updatePageTextView();
+            loadConfig();
             ActivityDocsPrintPreview activityDocsPrintPreview = ActivityDocsPrintPreview.this;
             serverConnectDialog = new CustomProDialog(activityDocsPrintPreview, R.style.AppTheme_Translucent_Gray, R.layout.work_dialog_transparent, true);
             CustomProDialog customProDialog = serverConnectDialog;
@@ -1425,10 +1425,10 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                 customProDialog.setCancelable(false);
                 serverConnectDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
                     public boolean onKey(DialogInterface dialogInterface, int i, KeyEvent keyEvent) {
-                        if (i != 4 || ActivityDocsPrintPreview.this.loadRemotePreviewTask == null) {
+                        if (i != 4 || loadRemotePreviewTask == null) {
                             return false;
                         }
-                        ActivityDocsPrintPreview.this.loadRemotePreviewTask.cancel(true);
+                        loadRemotePreviewTask.cancel(true);
                         return false;
                     }
                 });
@@ -1442,8 +1442,8 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         }
 
         protected void onProgressUpdate(Void... voidArr) {
-            ActivityDocsPrintPreview.this.updatePrevNextButtonView();
-            ActivityDocsPrintPreview.this.updatePageTextView();
+            updatePrevNextButtonView();
+            updatePageTextView();
         }
     }
 
@@ -1882,8 +1882,8 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             ((Button) inflate.findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     ((Button) CustomProDialog.this.findViewById(R.id.close_btn)).setEnabled(false);
-                    if (ActivityDocsPrintPreview.this.loadRemotePreviewTask != null) {
-                        ActivityDocsPrintPreview.this.loadRemotePreviewTask.cancel(true);
+                    if (loadRemotePreviewTask != null) {
+                        loadRemotePreviewTask.cancel(true);
                     }
                 }
             });
@@ -1894,7 +1894,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             } else {
                 ((Button) findViewById(R.id.close_btn)).setVisibility(4);
             }
-            ((TextView) findViewById(R.id.loading_tv)).setText(ActivityDocsPrintPreview.this.getString(R.string.epsonconnect_str_get_server_preview));
+            ((TextView) findViewById(R.id.loading_tv)).setText(getString(R.string.epsonconnect_str_get_server_preview));
         }
     }
 }

app/src/main/java/epson/print/copy/CopyScaleActivity.java

@@ -46,10 +46,10 @@ public class CopyScaleActivity extends ActivityBase {
         optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
                 ArrayList arrayList = new ArrayList();
-                CopyScaleActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
+                copyComponent.setCopyOptionItem(eCopyOptionItem);
                 if (eCopyOptionItem.getKey() == ECopyOptionItem.ECopyOptionItemKey.CopyMagnification) {
                     arrayList.add(eCopyOptionItem);
-                    CopyScaleActivity.this.buildCopyOptions(arrayList);
+                    buildCopyOptions(arrayList);
                 }
             }
         };
@@ -82,12 +82,12 @@ public class CopyScaleActivity extends ActivityBase {
             super();
             bindOption(eCopyOptionItem);
             capabilitySetting(eCopyOptionItem, CopyScaleActivity.this);
-            setOptionValueChangedListener(CopyScaleActivity.this.optionValueChangedListener);
+            setOptionValueChangedListener(optionValueChangedListener);
         }
 
         private ScaleAdapter getArrayAdapter(XScaleValue xScaleValue, Context context) {
             for (int i = 3; i < xScaleValue.getKeyArray().length; i++) {
-                presetArray.add(new ScaleInfo(CopyScaleActivity.this.copyType, (ECopyOptionItem.ECopyOptionItemChoice) xScaleValue.choices.get(i)));
+                presetArray.add(new ScaleInfo(copyType, (ECopyOptionItem.ECopyOptionItemChoice) xScaleValue.choices.get(i)));
             }
             return new ScaleAdapter(context, R.layout.setting_item, presetArray);
         }
@@ -104,11 +104,11 @@ public class CopyScaleActivity extends ActivityBase {
                     i++;
                 }
             }
-            LinearLayout linearLayout = (LinearLayout) CopyScaleActivity.this.findViewById(R.id.auto_fit);
+            LinearLayout linearLayout = (LinearLayout) findViewById(R.id.auto_fit);
             if (selectedItemPos == 0) {
-                ((ImageView) CopyScaleActivity.this.findViewById(R.id.auto_select_icon)).setVisibility(0);
+                ((ImageView) findViewById(R.id.auto_select_icon)).setVisibility(0);
             } else {
-                ((ImageView) CopyScaleActivity.this.findViewById(R.id.auto_select_icon)).setVisibility(8);
+                ((ImageView) findViewById(R.id.auto_select_icon)).setVisibility(8);
             }
             linearLayout.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
@@ -118,15 +118,15 @@ public class CopyScaleActivity extends ActivityBase {
                     if (XScaleValue.this.changedListener != null) {
                         XScaleValue.this.changedListener.onOptionItemChanged(XScaleValue.this.optionItem);
                     }
-                    CopyScaleActivity.this.isKeepSimpleAPConnection = true;
-                    CopyScaleActivity.this.finish();
+                    isKeepSimpleAPConnection = true;
+                    finish();
                 }
             });
-            LinearLayout linearLayout2 = (LinearLayout) CopyScaleActivity.this.findViewById(R.id.full_size);
+            LinearLayout linearLayout2 = (LinearLayout) findViewById(R.id.full_size);
             if (selectedItemPos == 1) {
-                ((ImageView) CopyScaleActivity.this.findViewById(R.id.full_select_icon)).setVisibility(0);
+                ((ImageView) findViewById(R.id.full_select_icon)).setVisibility(0);
             } else {
-                ((ImageView) CopyScaleActivity.this.findViewById(R.id.full_select_icon)).setVisibility(8);
+                ((ImageView) findViewById(R.id.full_select_icon)).setVisibility(8);
             }
             linearLayout2.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
@@ -136,16 +136,16 @@ public class CopyScaleActivity extends ActivityBase {
                     if (XScaleValue.this.changedListener != null) {
                         XScaleValue.this.changedListener.onOptionItemChanged(XScaleValue.this.optionItem);
                     }
-                    CopyScaleActivity.this.isKeepSimpleAPConnection = true;
-                    CopyScaleActivity.this.finish();
+                    isKeepSimpleAPConnection = true;
+                    finish();
                 }
             });
             if (selectedItemPos == 2) {
-                ((ImageView) CopyScaleActivity.this.findViewById(R.id.custom_select_icon)).setVisibility(0);
+                ((ImageView) findViewById(R.id.custom_select_icon)).setVisibility(0);
             } else {
-                ((ImageView) CopyScaleActivity.this.findViewById(R.id.custom_select_icon)).setVisibility(8);
+                ((ImageView) findViewById(R.id.custom_select_icon)).setVisibility(8);
             }
-            ListView listView = (ListView) CopyScaleActivity.this.findViewById(R.id.scale_list);
+            ListView listView = (ListView) findViewById(R.id.scale_list);
             listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                     XScaleValue xScaleValue = XScaleValue.this;
@@ -154,8 +154,8 @@ public class CopyScaleActivity extends ActivityBase {
                     if (XScaleValue.this.changedListener != null) {
                         XScaleValue.this.changedListener.onOptionItemChanged(XScaleValue.this.optionItem);
                     }
-                    CopyScaleActivity.this.isKeepSimpleAPConnection = true;
-                    CopyScaleActivity.this.finish();
+                    isKeepSimpleAPConnection = true;
+                    finish();
                 }
             });
             listView.setAdapter(getArrayAdapter(this, context));
@@ -192,8 +192,8 @@ public class CopyScaleActivity extends ActivityBase {
             String scalePresetName;
 
             ScaleInfo(ECopyComponent.ECopyType eCopyType, ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
-                scalePresetName = CopyScaleActivity.this.string(eCopyOptionItemChoice.name());
-                scaleNum = CopyScaleActivity.this.copyComponent.getCopyValue(eCopyType, eCopyOptionItemChoice);
+                scalePresetName = string(eCopyOptionItemChoice.name());
+                scaleNum = copyComponent.getCopyValue(eCopyType, eCopyOptionItemChoice);
             }
         }
     }
@@ -203,12 +203,12 @@ public class CopyScaleActivity extends ActivityBase {
             super();
             bindOption(R.id.CopyMagnification, eCopyOptionItem);
             clickCustomScale();
-            setOptionValueChangedListener(CopyScaleActivity.this.optionValueChangedListener);
+            setOptionValueChangedListener(optionValueChangedListener);
         }
 
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             optionItem = eCopyOptionItem;
-            editText = (TextView) CopyScaleActivity.this.findViewById(i);
+            editText = (TextView) findViewById(i);
             value = eCopyOptionItem.getSelectedValue();
             if (value == ECopyOptionItem.CopyMagnificationAutofitValue) {
                 editText.setText("---");
@@ -219,7 +219,7 @@ public class CopyScaleActivity extends ActivityBase {
         }
 
         private void clickCustomScale() {
-            ((LinearLayout) CopyScaleActivity.this.findViewById(R.id.copy_scale_custom)).setOnClickListener(new View.OnClickListener() {
+            ((LinearLayout) findViewById(R.id.copy_scale_custom)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     View inflate = LayoutInflater.from(CopyScaleActivity.this).inflate(R.layout.copy_custom_scale, (ViewGroup) null);
                     CopyMagnificationValue.this.editText = (TextView) inflate.findViewById(R.id.SettingCopyMagnification);
@@ -248,9 +248,9 @@ public class CopyScaleActivity extends ActivityBase {
                     AlertDialog.Builder builder = new AlertDialog.Builder(CopyScaleActivity.this);
                     builder.setTitle(R.string.XScale_Custom);
                     builder.setView(inflate);
-                    builder.setPositiveButton(CopyScaleActivity.this.getString(R.string.str_ok), new DialogInterface.OnClickListener() {
+                    builder.setPositiveButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            ActivityBase.ListOptionValue listOptionValue = (ActivityBase.ListOptionValue) CopyScaleActivity.this.optionValueMap.get(ECopyOptionItem.ECopyOptionItemKey.XScale);
+                            ActivityBase.ListOptionValue listOptionValue = (ActivityBase.ListOptionValue) optionValueMap.get(ECopyOptionItem.ECopyOptionItemKey.XScale);
                             listOptionValue.optionItem.selectChoice(ECopyOptionItem.ECopyOptionItemChoice.XScale_Custom);
                             if (CopyMagnificationValue.this.changedListener != null) {
                                 CopyMagnificationValue.this.changedListener.onOptionItemChanged(listOptionValue.optionItem);
@@ -259,19 +259,19 @@ public class CopyScaleActivity extends ActivityBase {
                             if (CopyMagnificationValue.this.changedListener != null) {
                                 CopyMagnificationValue.this.changedListener.onOptionItemChanged(CopyMagnificationValue.this.optionItem);
                             }
-                            CopyScaleActivity.this.isKeepSimpleAPConnection = true;
+                            isKeepSimpleAPConnection = true;
                             CopyMagnificationValue.this.onDismissDialog();
-                            CopyScaleActivity.this.finish();
+                            finish();
                         }
                     });
-                    builder.setNegativeButton(CopyScaleActivity.this.getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
+                    builder.setNegativeButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             CopyMagnificationValue.this.onDismissDialog();
                         }
                     });
                     builder.show();
                     CopyMagnificationValue copyMagnificationValue2 = CopyMagnificationValue.this;
-                    copyMagnificationValue2.setOptionValueChangedListener(CopyScaleActivity.this.optionValueChangedListener);
+                    copyMagnificationValue2.setOptionValueChangedListener(optionValueChangedListener);
                 }
             });
         }

app/src/main/java/epson/print/screen/ActivityIpPrinterSetting.java

@@ -46,15 +46,15 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
             int i = message.what;
             if (i == 0) {
                 EPLog.w(ActivityIpPrinterSetting.TAG, "Recieve ADD_PRINTER");
-                ActivityIpPrinterSetting.this.printerInfo.printerName = data.getString("name");
-                ActivityIpPrinterSetting.this.printerInfo.printerID = data.getString("id");
-                ActivityIpPrinterSetting.this.printerInfo.printerSerialNo = data.getString("serial_no");
+                printerInfo.printerName = data.getString("name");
+                printerInfo.printerID = data.getString("id");
+                printerInfo.printerSerialNo = data.getString("serial_no");
                 return false;
             } else if (i != 8) {
                 return false;
             } else {
                 EPLog.w(ActivityIpPrinterSetting.TAG, "Recieve ADD_SCANNER");
-                ActivityIpPrinterSetting.this.printerInfo.scannerID = data.getString("id");
+                printerInfo.scannerID = data.getString("id");
                 return false;
             }
         }
@@ -95,12 +95,12 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
         }
         clearPrinterNameButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ActivityIpPrinterSetting.this.printerName.setText("");
+                printerName.setText("");
             }
         });
         clearPrinterIpAdressButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ActivityIpPrinterSetting.this.printerIpAdress.setText("");
+                printerIpAdress.setText("");
             }
         });
     }
@@ -134,18 +134,18 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
                 protected void onPreExecute() {
                     progress = new WorkingDialog(ActivityIpPrinterSetting.this);
                     progress.show();
-                    ActivityIpPrinterSetting.mPrinter.getMEscpLib().setHanlder(ActivityIpPrinterSetting.this.mHandler);
-                    ActivityIpPrinterSetting.mScanner.setScanHandler(ActivityIpPrinterSetting.this.mHandler);
+                    ActivityIpPrinterSetting.mPrinter.getMEscpLib().setHanlder(mHandler);
+                    ActivityIpPrinterSetting.mScanner.setScanHandler(mHandler);
                 }
 
                 protected Integer doInBackground(String... strArr) {
                     boolean z;
                     String str = strArr[0];
-                    if (ActivityIpPrinterSetting.this.printerNameArea.getVisibility() == 8) {
-                        ActivityIpPrinterSetting.this.printerInfo = new EPPrinterInfo();
-                        ActivityIpPrinterSetting.this.printerInfo.printerLocation = 3;
-                        ActivityIpPrinterSetting.this.printerInfo.printerID = null;
-                        ActivityIpPrinterSetting.this.printerInfo.scannerID = null;
+                    if (printerNameArea.getVisibility() == 8) {
+                        printerInfo = new EPPrinterInfo();
+                        printerInfo.printerLocation = 3;
+                        printerInfo.printerID = null;
+                        printerInfo.scannerID = null;
                         bAddNewPrinter = true;
                     }
                     mNewIpAddress = str;
@@ -154,7 +154,7 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
                         return Integer.valueOf(doInitDriver);
                     }
                     ActivityIpPrinterSetting.mPrinter.getMEscpLib().setSearchStt(true);
-                    int doProbePrinter = ActivityIpPrinterSetting.mPrinter.doProbePrinter(60, ActivityIpPrinterSetting.this.printerInfo.printerID, str, 3);
+                    int doProbePrinter = ActivityIpPrinterSetting.mPrinter.doProbePrinter(60, printerInfo.printerID, str, 3);
                     ActivityIpPrinterSetting.mPrinter.getMEscpLib().setSearchStt(false);
                     if (doProbePrinter != 0) {
                         return Integer.valueOf(doProbePrinter);
@@ -168,7 +168,7 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
                         z = false;
                     }
                     ActivityIpPrinterSetting.mScanner.setSearchStt(true);
-                    int probeScannerByIp = ActivityIpPrinterSetting.mScanner.probeScannerByIp(ActivityIpPrinterSetting.this.printerInfo.scannerID, str);
+                    int probeScannerByIp = ActivityIpPrinterSetting.mScanner.probeScannerByIp(printerInfo.scannerID, str);
                     ActivityIpPrinterSetting.mScanner.setSearchStt(false);
                     if (!z) {
                         ActivityIpPrinterSetting.mScanner.escanWrapperReleaseDriver();
@@ -195,28 +195,28 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
                             }
                         }
                         ActivityIpPrinterSetting activityIpPrinterSetting = ActivityIpPrinterSetting.this;
-                        Utils.makeMessageBox(activityIpPrinterSetting, activityIpPrinterSetting.getString(numArr[1].intValue()), ActivityIpPrinterSetting.this.getString(numArr[0].intValue()), ActivityIpPrinterSetting.this.getString(R.string.str_ok)).show();
-                    } else if (!bAddNewPrinter || ActivityIpPrinterSetting.this.manager.loadIpPrinterInfo(ActivityIpPrinterSetting.this.printerInfo.printerID) == null) {
-                        if (ActivityIpPrinterSetting.this.oldItemKey != null && ActivityIpPrinterSetting.this.oldItemKey.length() > 0) {
-                            ActivityIpPrinterSetting.this.manager.deleteIpPrinterInfo(ActivityIpPrinterSetting.this.oldItemKey);
+                        Utils.makeMessageBox(activityIpPrinterSetting, activityIpPrinterSetting.getString(numArr[1].intValue()), getString(numArr[0].intValue()), getString(R.string.str_ok)).show();
+                    } else if (!bAddNewPrinter || manager.loadIpPrinterInfo(printerInfo.printerID) == null) {
+                        if (oldItemKey != null && oldItemKey.length() > 0) {
+                            manager.deleteIpPrinterInfo(oldItemKey);
                         }
-                        if (ActivityIpPrinterSetting.this.printerName.getText().toString().length() > 0) {
-                            ActivityIpPrinterSetting.this.printerInfo.userDefName = ActivityIpPrinterSetting.this.printerName.getText().toString();
+                        if (printerName.getText().toString().length() > 0) {
+                            printerInfo.userDefName = printerName.getText().toString();
                         } else {
-                            ActivityIpPrinterSetting.this.printerInfo.userDefName = ActivityIpPrinterSetting.this.printerInfo.printerName;
+                            printerInfo.userDefName = printerInfo.printerName;
                         }
-                        ActivityIpPrinterSetting.this.manager.saveIPPrinterInfo(ActivityIpPrinterSetting.this.printerInfo.printerID, ActivityIpPrinterSetting.this.printerInfo);
-                        ActivityIpPrinterSetting.this.printerInfo.printerIP = mNewIpAddress;
+                        manager.saveIPPrinterInfo(printerInfo.printerID, printerInfo);
+                        printerInfo.printerIP = mNewIpAddress;
                         Intent intent = new Intent();
-                        intent.putExtra(Constants.PRINTER_NAME, ActivityIpPrinterSetting.this.printerInfo.printerName);
-                        intent.putExtra(Constants.PRINTER_ID, ActivityIpPrinterSetting.this.printerInfo.printerID);
-                        intent.putExtra(Constants.SCAN_REFS_SCANNER_ID, ActivityIpPrinterSetting.this.printerInfo.scannerID);
-                        intent.putExtra(Constants.PRINTER_IP, ActivityIpPrinterSetting.this.printerInfo.printerIP);
-                        intent.putExtra(Constants.PRINTER_SERIAL_NO, ActivityIpPrinterSetting.this.printerInfo.printerSerialNo);
-                        ActivityIpPrinterSetting.this.setResult(-1, intent);
-                        ActivityIpPrinterSetting.this.finish();
+                        intent.putExtra(Constants.PRINTER_NAME, printerInfo.printerName);
+                        intent.putExtra(Constants.PRINTER_ID, printerInfo.printerID);
+                        intent.putExtra(Constants.SCAN_REFS_SCANNER_ID, printerInfo.scannerID);
+                        intent.putExtra(Constants.PRINTER_IP, printerInfo.printerIP);
+                        intent.putExtra(Constants.PRINTER_SERIAL_NO, printerInfo.printerSerialNo);
+                        setResult(-1, intent);
+                        finish();
                     } else {
-                        new AlertDialog.Builder(ActivityIpPrinterSetting.this).setCancelable(false).setMessage(ActivityIpPrinterSetting.this.getString(R.string.str_ipprinter_registed_already)).setNegativeButton(ActivityIpPrinterSetting.this.getString(R.string.str_ok), new DialogInterface.OnClickListener() {
+                        new AlertDialog.Builder(ActivityIpPrinterSetting.this).setCancelable(false).setMessage(getString(R.string.str_ipprinter_registed_already)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialogInterface, int i) {
                                 dialogInterface.dismiss();
                             }

app/src/main/java/epson/print/screen/PaperSourceSettingScr.java

@@ -40,9 +40,9 @@ public class PaperSourceSettingScr extends ActivityIACommon {
     ArrayList<PaperSourceSetting> aPaperSourceSetting;
     AdapterView.OnItemClickListener listItemClickLister = new AdapterView.OnItemClickListener() {
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-            PaperSourceSetting paperSourceSetting = (PaperSourceSetting) PaperSourceSettingScr.this.mListBuilder.getData().elementAt(i);
+            PaperSourceSetting paperSourceSetting = (PaperSourceSetting) mListBuilder.getData().elementAt(i);
             if (!paperSourceSetting.bSupportESCPR) {
-                PaperSourceSettingScr.this.showDialog(10);
+                showDialog(10);
                 return;
             }
             PaperSourceSettingScr paperSourceSettingScr = PaperSourceSettingScr.this;
@@ -53,12 +53,12 @@ public class PaperSourceSettingScr extends ActivityIACommon {
             instance.paperSourceValue = paperSourceSetting.paperSource;
             instance.saveSettings();
             try {
-                PaperSourceSettingScr.this.mEpsonService.updatePrinterSettings(PaperSourceSettingScr.this.mPrintSettingTypeName);
+                mEpsonService.updatePrinterSettings(mPrintSettingTypeName);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            PaperSourceSettingScr.this.setResult(3);
-            PaperSourceSettingScr.this.finish();
+            setResult(3);
+            finish();
         }
     };
     private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
@@ -87,23 +87,23 @@ public class PaperSourceSettingScr extends ActivityIACommon {
         public void onServiceDisconnected(ComponentName componentName) {
             EPLog.v("SettingScr", "onServiceDisconnected");
             try {
-                PaperSourceSettingScr.this.mEpsonService.unregisterCallback(PaperSourceSettingScr.this.mCallback);
+                mEpsonService.unregisterCallback(mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            IEpsonService unused = PaperSourceSettingScr.this.mEpsonService = null;
+            IEpsonService unused = mEpsonService = null;
         }
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            IEpsonService unused = PaperSourceSettingScr.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
+            IEpsonService unused = mEpsonService = IEpsonService.Stub.asInterface(iBinder);
             EPLog.v("SettingScr", "onServiceConnected");
-            if (PaperSourceSettingScr.this.mEpsonService != null) {
+            if (mEpsonService != null) {
                 try {
-                    PaperSourceSettingScr.this.mEpsonService.registerCallback(PaperSourceSettingScr.this.mCallback);
+                    mEpsonService.registerCallback(mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
-                PaperSourceSettingScr.this.mHandler.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(1);
             }
         }
     };
@@ -114,14 +114,14 @@ public class PaperSourceSettingScr extends ActivityIACommon {
             if (i == 1) {
                 PaperSourceSettingScr paperSourceSettingScr = PaperSourceSettingScr.this;
                 paperSourceSettingScr.aPaperSourceSetting = paperSourceSettingScr.getIntent().getParcelableArrayListExtra(PaperSourceInfo.KEY_PAPERSOURCEINFO);
-                PaperSourceSettingScr.this.addPaparSettings();
-                PaperSourceSettingScr.this.progress.dismiss();
+                addPaparSettings();
+                progress.dismiss();
                 return false;
             } else if (i != 100) {
                 return false;
             } else {
-                PaperSourceSettingScr.this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
-                PaperSourceSettingScr.this.addPaparSettings();
+                aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
+                addPaparSettings();
                 return false;
             }
         }
@@ -299,8 +299,8 @@ public class PaperSourceSettingScr extends ActivityIACommon {
 
         public void buildViewHolderContentData(int i, Vector<View> vector, Vector<Object> vector2) {
             PaperSourceSetting paperSourceSetting = (PaperSourceSetting) vector2.elementAt(i);
-            ((TextView) vector.elementAt(0)).setText(PaperSourceSettingScr.this.getResources().getString(mPaperSizeLookupTable.getStringId(paperSourceSetting.paperSizeId)));
-            ((TextView) vector.elementAt(1)).setText(PaperSourceSettingScr.this.getResources().getString(mPaperTypeLookupTable.getStringId(paperSourceSetting.paperTypeId)));
+            ((TextView) vector.elementAt(0)).setText(getResources().getString(mPaperSizeLookupTable.getStringId(paperSourceSetting.paperSizeId)));
+            ((TextView) vector.elementAt(1)).setText(getResources().getString(mPaperTypeLookupTable.getStringId(paperSourceSetting.paperTypeId)));
             vector.elementAt(2).setVisibility(curSetting.equals(paperSourceSetting) ? 0 : 8);
             if (!paperSourceSetting.bSupportESCPR) {
                 ((TextView) vector.elementAt(0)).setTextColor(mContext.getResources().getColor(R.color.light_gray));

app/src/main/java/epson/print/storage/StorageProcessDownloadActivity.java

@@ -142,24 +142,24 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         OverlayProgress progress = null;
 
         protected void onPreExecute() {
-            StorageProcessDownloadActivity.this.taskInvoked(true);
+            taskInvoked(true);
         }
 
         protected Void doInBackground(Void... voidArr) {
-            final StorageServiceClient.Downloader downloader = StorageProcessDownloadActivity.this.getStorageClient().getDownloader(StorageProcessDownloadActivity.this, item, localPath);
+            final StorageServiceClient.Downloader downloader = getStorageClient().getDownloader(StorageProcessDownloadActivity.this, item, localPath);
             C09241 r0 = downloader.isCancelable() ? new CancelRequestCallback() {
                 public void onCancelRequest(Intent intent) {
                     downloader.cancel();
                 }
             } : null;
             progress = new OverlayProgress();
-            progress.show(StorageProcessDownloadActivity.this.getString(R.string.downloading_notification), r0);
+            progress.show(getString(R.string.downloading_notification), r0);
             downloader.start(new StorageServiceClient.DownloadCompletion() {
                 public void onDownloadComplete(StorageItem storageItem, String str, StorageServiceClient.ProcessError processError) {
                     if (str != null) {
-                        DownloadTask.this.localPath = str;
+                        localPath = str;
                     }
-                    StorageProcessDownloadActivity.this.runOnUiThread(new DownloadedRun(processError));
+                    runOnUiThread(new DownloadedRun(processError));
                 }
             });
             return null;
@@ -176,23 +176,23 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                 boolean unused = StorageProcessDownloadActivity.mIsDownloading = false;
                 if (error == StorageServiceClient.ProcessError.NONE) {
                     StorageProcessDownloadActivity storageProcessDownloadActivity = StorageProcessDownloadActivity.this;
-                    Intent previewIntent = StorageProcessDownloadActivity.getPreviewIntent(DownloadTask.this.localPath, storageProcessDownloadActivity, StorageProcessDownloadActivity.mPrintLog);
+                    Intent previewIntent = StorageProcessDownloadActivity.getPreviewIntent(localPath, storageProcessDownloadActivity, StorageProcessDownloadActivity.mPrintLog);
                     previewIntent.setFlags(Videoio.CAP_INTELPERC_IMAGE_GENERATOR);
-                    StorageProcessDownloadActivity.this.saveDownloadedFilePath(DownloadTask.this.localPath);
+                    saveDownloadedFilePath(localPath);
                     if (!StorageProcessDownloadActivity.mIsDownloadInterruption) {
                         storageProcessDownloadActivity.startActivityForResult(previewIntent, 0);
                     }
                 } else if (error != StorageServiceClient.ProcessError.CANCELED) {
-                    StorageProcessDownloadActivity.this.showErrorDialog(R.string.download_error_mes);
+                    showErrorDialog(R.string.download_error_mes);
                 }
-                StorageProcessDownloadActivity.this.taskInvoked(false);
-                DownloadTask.this.progress.dismiss();
+                taskInvoked(false);
+                progress.dismiss();
             }
         }
 
         DownloadTask(StorageItem storageItem) {
             item = storageItem;
-            localPath = StorageProcessDownloadActivity.this.getStorageClient().getDownloadLocalPath(StorageProcessDownloadActivity.this, storageItem);
+            localPath = getStorageClient().getDownloadLocalPath(StorageProcessDownloadActivity.this, storageItem);
         }
     }
 
@@ -239,27 +239,27 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                     storageItem2.path = storageItem.path;
                     storageItem2.type = StorageItem.ItemType.DIRECTORY;
                     storageItem2.userInfo = storageItem.userInfo;
-                    if (EnumerateTask.this.enumeratedItems == null) {
-                        EnumerateTask.this.enumeratedItems = new ArrayList();
+                    if (enumeratedItems == null) {
+                        enumeratedItems = new ArrayList();
                     }
-                    EnumerateTask.this.enumeratedItems.add(0, storageItem2);
+                    enumeratedItems.add(0, storageItem2);
                 }
-                StorageProcessDownloadActivity.this.runOnUiThread(new Runnable() {
+                runOnUiThread(new Runnable() {
                     public void run() {
-                        if (processError == StorageServiceClient.ProcessError.NONE && EnumerateTask.this.enumeratedItems != null) {
-                            StorageProcessDownloadActivity.mListView.setAdapter(new StorageItemAdapter(EnumerateTask.this.enumeratedItems));
+                        if (processError == StorageServiceClient.ProcessError.NONE && enumeratedItems != null) {
+                            StorageProcessDownloadActivity.mListView.setAdapter(new StorageItemAdapter(enumeratedItems));
                         } else if (processError != StorageServiceClient.ProcessError.CANCELED) {
-                            StorageProcessDownloadActivity.this.showErrorDialog(R.string.unknow_error_mes);
+                            showErrorDialog(R.string.unknow_error_mes);
                         }
-                        StorageProcessDownloadActivity.this.taskInvoked(false);
-                        EnumerateTask.this.progress.dismiss();
+                        taskInvoked(false);
+                        progress.dismiss();
                     }
                 });
             }
         };
         StorageServiceClient.EnumerateCompletion onLoadedMore = new StorageServiceClient.EnumerateCompletion() {
             public void onEnumerateComplete(final List<StorageItem> list, final StorageServiceClient.ProcessError processError) {
-                StorageProcessDownloadActivity.this.runOnUiThread(new Runnable() {
+                runOnUiThread(new Runnable() {
                     public void run() {
                         if (processError == StorageServiceClient.ProcessError.NONE) {
                             StorageItemAdapter storageItemAdapter = (StorageItemAdapter) StorageProcessDownloadActivity.mListView.getAdapter();
@@ -268,10 +268,10 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                                 storageItemAdapter.notifyDataSetChanged();
                             }
                         } else if (processError != StorageServiceClient.ProcessError.CANCELED) {
-                            StorageProcessDownloadActivity.this.showErrorDialog(R.string.unknow_error_mes);
+                            showErrorDialog(R.string.unknow_error_mes);
                         }
-                        StorageProcessDownloadActivity.this.taskInvoked(false);
-                        EnumerateTask.this.progress.dismiss();
+                        taskInvoked(false);
+                        progress.dismiss();
                     }
                 });
             }
@@ -279,24 +279,24 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         OverlayProgress progress = new OverlayProgress();
 
         protected void onPreExecute() {
-            StorageProcessDownloadActivity.this.taskInvoked(true);
+            taskInvoked(true);
         }
 
         protected Void doInBackground(Void... voidArr) {
-            boolean isNeedSignin = StorageProcessDownloadActivity.this.getStorageClient().isNeedSignin();
+            boolean isNeedSignin = getStorageClient().isNeedSignin();
             if (!isNeedSignin) {
                 progress.show();
             }
             if (item.type == StorageItem.ItemType.LOADMORE) {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onLoadedMore);
+                getEnumerator().enumerate(item, onLoadedMore);
                 return null;
             } else if (!isNeedSignin) {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onEnumerated);
+                getEnumerator().enumerate(item, onEnumerated);
                 return null;
             } else {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onEnumerated, new StorageServiceClient.SigninCompletion() {
+                getEnumerator().enumerate(item, onEnumerated, new StorageServiceClient.SigninCompletion() {
                     public void onSigninCompletion() {
-                        EnumerateTask.this.progress.show((String) null, (CancelRequestCallback) null, false);
+                        progress.show((String) null, (CancelRequestCallback) null, false);
                     }
                 });
                 return null;
@@ -314,7 +314,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
 
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
             int unused = StorageProcessDownloadActivity.mPosition = i;
-            StorageProcessDownloadActivity.this.itemClick(i);
+            itemClick(i);
         }
     }
 
@@ -379,7 +379,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                     case LOADMORE:
                         String str = storageItem.name;
                         if (str == null) {
-                            str = StorageProcessDownloadActivity.this.getString(R.string.storage_item_load_more_photos);
+                            str = getString(R.string.storage_item_load_more_photos);
                         }
                         setViewComponents(view2, str, -12345, -12345);
                         break;
@@ -388,7 +388,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                         break;
                     case PHOTO:
                         setViewComponents(view2, storageItem.name, R.drawable.image, -12345);
-                        StorageProcessDownloadActivity.this.getEnumerator().setThumbnailInBackground(storageItem, getIconView(view2));
+                        getEnumerator().setThumbnailInBackground(storageItem, getIconView(view2));
                         break;
                 }
                 viewCache.put(storageItem, view2);
@@ -397,8 +397,8 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
 
         StorageItemAdapter(List<StorageItem> list) {
-            super(StorageProcessDownloadActivity.this.getBaseContext(), R.layout.file_list_item, list);
-            layoutInflater = (LayoutInflater) StorageProcessDownloadActivity.this.getBaseContext().getSystemService(Service.LAYOUT_INFLATER_SERVICE);
+            super(getBaseContext(), R.layout.file_list_item, list);
+            layoutInflater = (LayoutInflater) getBaseContext().getSystemService(Service.LAYOUT_INFLATER_SERVICE);
             storageItems = list;
             viewCache = new HashMap<>();
         }

app/src/main/java/epson/print/storage/StorageProcessUploadActivity.java

@@ -44,24 +44,24 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         button.setText(getString(R.string.upload_btn_label));
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                String filename = StorageProcessUploadActivity.this.getFilename();
-                if (!StorageProcessUploadActivity.this.getStorageClient().isValidUploadName(filename)) {
-                    StorageProcessUploadActivity.this.showErrorDialog(R.string.str_error_Filename);
-                } else if (StorageProcessUploadActivity.this.isConnected()) {
+                String filename = getFilename();
+                if (!getStorageClient().isValidUploadName(filename)) {
+                    showErrorDialog(R.string.str_error_Filename);
+                } else if (isConnected()) {
                     button.setEnabled(false);
                     UploadTask uploadTask = new UploadTask();
                     uploadTask.localPaths = new ArrayList(StorageProcessUploadActivity.mUploadFileLocalPathList);
                     uploadTask.uploadFilename = filename;
-                    uploadTask.fileType = StorageProcessUploadActivity.this.getFiletype();
+                    uploadTask.fileType = getFiletype();
                     uploadTask.execute(new Void[0]);
                 } else {
-                    StorageProcessUploadActivity.this.showConnectionError();
+                    showConnectionError();
                 }
             }
         });
         bindClearButton(R.id.upload_dialog_file_name, R.id.clear_name_btn, new OnVisibilityListener() {
             public void onVisibilityChanged(int i) {
-                StorageProcessUploadActivity.this.setEnabledSaveButton(i == 0);
+                setEnabledSaveButton(i == 0);
             }
         });
         mUploadFilename = generateUploadFilename(0);
@@ -106,12 +106,12 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         protected Void doInBackground(Void... voidArr) {
             final ReentrantLock reentrantLock;
             final OverlayProgress overlayProgress = new OverlayProgress();
-            overlayProgress.show(StorageProcessUploadActivity.this.getString(R.string.uploading_notification), new CancelRequestCallback() {
+            overlayProgress.show(getString(R.string.uploading_notification), new CancelRequestCallback() {
                 public void onCancelRequest(Intent intent) {
-                    if (UploadTask.this.uploader != null && UploadTask.this.uploader.isCancelable()) {
-                        UploadTask.this.uploader.cancel();
+                    if (uploader != null && uploader.isCancelable()) {
+                        uploader.cancel();
                     }
-                    UploadTask.this.canceled = true;
+                    canceled = true;
                 }
             });
             String str = "";
@@ -124,7 +124,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
             } else if (StorageServiceClient.UploadFileType.JPEG.equals(fileType)) {
                 str = ".jpg";
             }
-            boolean z = !this.uploadFilename.equals(StorageProcessUploadActivity.this.generateUploadFilename(0));
+            boolean z = !this.uploadFilename.equals(generateUploadFilename(0));
             int size = localPaths.size();
             int i = 0;
             while (true) {
@@ -137,9 +137,9 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                     if (z) {
                         str4 = String.format("%s%03d%s", new Object[]{this.uploadFilename, Integer.valueOf(i + 1), str});
                     } else {
-                        str4 = String.format("%s%s", new Object[]{StorageProcessUploadActivity.this.generateUploadFilename(i), str});
+                        str4 = String.format("%s%s", new Object[]{generateUploadFilename(i), str});
                     }
-                    overlayProgress.changeMessage(StorageProcessUploadActivity.this.getString(R.string.uploading_notification) + (i + 1) + CommonDefine.SLASH + size);
+                    overlayProgress.changeMessage(getString(R.string.uploading_notification) + (i + 1) + CommonDefine.SLASH + size);
                 }
                 reentrantLock = new ReentrantLock();
                 final Condition newCondition = reentrantLock.newCondition();
@@ -147,13 +147,13 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                     reentrantLock.lock();
                     uploaded = false;
                     taskError = StorageServiceClient.ProcessError.NONE;
-                    uploader = StorageProcessUploadActivity.this.getStorageClient().getUploader(StorageProcessUploadActivity.this, fileType, str3, str4);
+                    uploader = getStorageClient().getUploader(StorageProcessUploadActivity.this, fileType, str3, str4);
                     uploader.start(new StorageServiceClient.UploadCompletion() {
                         public void onUploadComplete(String str, String str2, StorageServiceClient.ProcessError processError) {
                             try {
                                 reentrantLock.lock();
-                                StorageServiceClient.ProcessError unused = UploadTask.this.taskError = processError;
-                                UploadTask.this.uploaded = true;
+                                StorageServiceClient.ProcessError unused = taskError = processError;
+                                uploaded = true;
                                 newCondition.signal();
                             } catch (Exception e) {
                                 EPLog.w("Storage", "onUploadComplete() exception <" + e.toString() + ">");
@@ -183,16 +183,16 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                 taskError = StorageServiceClient.ProcessError.CANCELED;
             }
             reentrantLock.unlock();
-            StorageProcessUploadActivity.this.runOnUiThread(new Runnable() {
+            runOnUiThread(new Runnable() {
                 public void run() {
-                    if (UploadTask.this.taskError == StorageServiceClient.ProcessError.NONE) {
+                    if (taskError == StorageServiceClient.ProcessError.NONE) {
                         overlayProgress.dismiss();
-                        StorageProcessUploadActivity.this.finish();
+                        finish();
                         return;
                     }
-                    StorageProcessUploadActivity.this.setEnabledSaveButton(true);
-                    if (UploadTask.this.taskError == StorageServiceClient.ProcessError.ERROR) {
-                        StorageProcessUploadActivity.this.showErrorDialog(R.string.upload_error_mes);
+                    setEnabledSaveButton(true);
+                    if (taskError == StorageServiceClient.ProcessError.ERROR) {
+                        showErrorDialog(R.string.upload_error_mes);
                     }
                     overlayProgress.dismiss();
                 }

app/src/main/java/epson/print/storage/StorageSignInActivity.java

@@ -106,8 +106,8 @@ public abstract class StorageSignInActivity extends StorageActivity {
         OverlayProgress progress;
 
         BasicSignInTask() {
-            mUserName = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_username_content)).getText().toString();
-            mPassword = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_password_content)).getText().toString();
+            mUserName = ((EditText) findViewById(R.id.login_username_content)).getText().toString();
+            mPassword = ((EditText) findViewById(R.id.login_password_content)).getText().toString();
         }
 
         protected Boolean doInBackground(Void... voidArr) {
@@ -118,12 +118,12 @@ public abstract class StorageSignInActivity extends StorageActivity {
 
         protected void onPostExecute(Boolean bool) {
             if (!bool.booleanValue()) {
-                StorageSignInActivity.this.showLoginError();
+                showLoginError();
                 progress.dismiss();
                 return;
             }
             progress.dismiss();
-            StorageSignInActivity.this.finish();
+            finish();
         }
     }
 

app/src/main/java/epson/scan/activity/I2ScanActivity.java

@@ -94,19 +94,19 @@ public class I2ScanActivity extends ActivityIACommon implements I2ScanAreaView.F
         mSaveButton = new CustomButtonWrapper((Button) findViewById(R.id.btnSave), R.drawable.scan_save);
         mSaveButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                I2ScanActivity.this.onSaveButtonClicked();
+                I2onSaveButtonClicked();
             }
         });
         mMailButton = new CustomButtonWrapper((Button) findViewById(R.id.btnMail), R.drawable.scan_mail);
         mMailButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                I2ScanActivity.this.startMailActivity();
+                I2startMailActivity();
             }
         });
         mPrintButton = new CustomButtonWrapper((Button) findViewById(R.id.btnPrint), R.drawable.scan_print);
         mPrintButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                I2ScanActivity.this.startPrintActivity();
+                I2startPrintActivity();
             }
         });
         mScanButton = (Button) findViewById(R.id.btnScan);
@@ -119,19 +119,19 @@ public class I2ScanActivity extends ActivityIACommon implements I2ScanAreaView.F
         mScanCancelButton = (Button) findViewById(R.id.btnCancelScan);
         mScanCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                I2ScanActivity.this.confirmCancelScan();
+                I2confirmCancelScan();
             }
         });
         mNextPageButton = (Button) findViewById(R.id.btnNext);
         mNextPageButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                I2ScanActivity.this.changePage(1);
+                I2changePage(1);
             }
         });
         mPreviousPageButton = (Button) findViewById(R.id.btnPrev);
         mPreviousPageButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                I2ScanActivity.this.changePage(-1);
+                I2changePage(-1);
             }
         });
         mExternalIntentData = ScanActivityCommonParams.getExternalIntentData(getIntent());
@@ -435,7 +435,7 @@ public class I2ScanActivity extends ActivityIACommon implements I2ScanAreaView.F
     private void requestStartScan() {
         runOnUiThread(new Runnable() {
             public void run() {
-                I2ScanActivity.this.startScan();
+                I2startScan();
             }
         });
     }
@@ -752,7 +752,7 @@ public class I2ScanActivity extends ActivityIACommon implements I2ScanAreaView.F
         }
 
         public void onScanEnd(I2ScanTask.TaskError taskError) {
-            I2ScanActivity.this.localScanEnd(taskError);
+            I2localScanEnd(taskError);
         }
     }
 
@@ -832,17 +832,17 @@ public class I2ScanActivity extends ActivityIACommon implements I2ScanAreaView.F
         }
 
         protected void onPostExecute(Integer num) {
-            I2ScanActivity.this.updateScanEnd();
+            I2updateScanEnd();
             if (num != null && num.intValue() != 1) {
                 if (num.intValue() == 0) {
                     ArrayList<String> arrayList = mScanFileList;
                     if (arrayList != null) {
-                        I2ScanActivity.this.finishWithScanParam(arrayList);
+                        I2finishWithScanParam(arrayList);
                         return;
                     }
                     return;
                 }
-                I2ScanActivity.this.displayScanError(convertError(num.intValue()));
+                I2displayScanError(convertError(num.intValue()));
             }
         }
 

app/src/main/java/epson/scan/activity/ScanActivity.java

@@ -116,10 +116,10 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     private boolean mActivityPaused;
     private View.OnClickListener mButtonCancelScanListener = new View.OnClickListener() {
         public void onClick(View view) {
-            String localClassName = ScanActivity.this.getLocalClassName();
-            EPLog.i(localClassName, "isStopScan = " + ScanActivity.this.isStopScan);
-            if (!ScanActivity.this.escan.isJobDone() && !ScanActivity.this.isStopScan) {
-                ScanActivity.this.hideScanningPop();
+            String localClassName = getLocalClassName();
+            EPLog.i(localClassName, "isStopScan = " + isStopScan);
+            if (!escan.isJobDone() && !isStopScan) {
+                hideScanningPop();
                 ScanActivity scanActivity = ScanActivity.this;
                 scanActivity.confirmationDialog(scanActivity.getString(R.string.str_msg_scan_cancel));
             }
@@ -127,79 +127,79 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     };
     private View.OnClickListener mButtonMailListener = new View.OnClickListener() {
         public void onClick(View view) {
-            if (ScanActivity.this.totalScanned > 0 && ScanActivity.this.isCompletedScanProcess()) {
+            if (totalScanned > 0 && isCompletedScanProcess()) {
                 Intent intent = new Intent(ScanActivity.this, MailActivity.class);
-                intent.putStringArrayListExtra(Define.SAVING_FILE_PATH, ScanActivity.this.getListSavedJPGFilePath());
-                ScanActivity.this.startActivityForResult(intent, 1);
+                intent.putStringArrayListExtra(Define.SAVING_FILE_PATH, getListSavedJPGFilePath());
+                startActivityForResult(intent, 1);
             }
         }
     };
     private View.OnClickListener mButtonNextListener = new View.OnClickListener() {
         public void onClick(View view) {
-            if (ScanActivity.this.isCompletedScanProcess()) {
-                ScanActivity.this.curentViewingFile++;
-                if (ScanActivity.this.curentViewingFile > 300 || ScanActivity.this.curentViewingFile > ScanActivity.this.totalScanned) {
+            if (isCompletedScanProcess()) {
+                curentViewingFile++;
+                if (curentViewingFile > 300 || curentViewingFile > totalScanned) {
                     ScanActivity scanActivity = ScanActivity.this;
                     scanActivity.curentViewingFile--;
                     return;
                 }
                 ScanActivity scanActivity2 = ScanActivity.this;
                 scanActivity2.updateThumbResult(scanActivity2.curentViewingFile);
-                ScanActivity.this.showDisplayingResult();
-                ScanActivity.this.scanArea.postInvalidate();
+                showDisplayingResult();
+                scanArea.postInvalidate();
             }
         }
     };
     private View.OnClickListener mButtonPrevListener = new View.OnClickListener() {
         public void onClick(View view) {
-            if (ScanActivity.this.isCompletedScanProcess()) {
-                ScanActivity.this.curentViewingFile--;
-                if (ScanActivity.this.curentViewingFile < 1) {
-                    ScanActivity.this.curentViewingFile++;
+            if (isCompletedScanProcess()) {
+                curentViewingFile--;
+                if (curentViewingFile < 1) {
+                    curentViewingFile++;
                     return;
                 }
                 ScanActivity scanActivity = ScanActivity.this;
                 scanActivity.updateThumbResult(scanActivity.curentViewingFile);
-                ScanActivity.this.showDisplayingResult();
-                ScanActivity.this.scanArea.postInvalidate();
+                showDisplayingResult();
+                scanArea.postInvalidate();
             }
         }
     };
     private View.OnClickListener mButtonPrintListener = new View.OnClickListener() {
         public void onClick(View view) {
-            if (ScanActivity.this.totalScanned > 0) {
+            if (totalScanned > 0) {
                 Intent intent = new Intent(ScanActivity.this, ActivityPrintWeb.class);
                 intent.putExtra("from", 1);
-                intent.putStringArrayListExtra("print_web", ScanActivity.this.getListSavedJPGFilePath());
+                intent.putStringArrayListExtra("print_web", getListSavedJPGFilePath());
                 intent.putExtra("print_log", ScanActivity.getPrintLog());
-                ScanActivity.this.startActivityForResult(intent, 3);
+                startActivityForResult(intent, 3);
             }
         }
     };
     private View.OnClickListener mButtonSaveListener = new View.OnClickListener() {
         public void onClick(View view) {
-            if (ScanActivity.this.totalScanned > 0 && ScanActivity.this.isCompletedScanProcess()) {
-                if (ScanActivity.this.isCustomAction) {
+            if (totalScanned > 0 && isCompletedScanProcess()) {
+                if (isCustomAction) {
                     Intent intent = new Intent();
-                    if (ScanActivity.this.extParam != null) {
-                        intent.putExtra(ScanActivity.RETURN_KEY_SCAN_FILE, ScanActivity.this.extParam.getArrayOutFilePath());
-                        ScanActivity.this.setResult(-1, intent);
-                        ScanActivity.this.finish();
+                    if (extParam != null) {
+                        intent.putExtra(ScanActivity.RETURN_KEY_SCAN_FILE, extParam.getArrayOutFilePath());
+                        setResult(-1, intent);
+                        finish();
                         return;
                     }
                     return;
                 }
                 Intent intent2 = new Intent(ScanActivity.this, StorageServer.class);
                 intent2.putExtra(Define.PICK_SERVER_FOR, 2);
-                intent2.putStringArrayListExtra(Define.SAVING_FILE_PATH, ScanActivity.this.getListSavedJPGFilePath());
+                intent2.putStringArrayListExtra(Define.SAVING_FILE_PATH, getListSavedJPGFilePath());
                 intent2.putExtra(StorageServer.FOR_PRINT_LOGGER_CALL_FROM, 1);
-                ScanActivity.this.startActivityForResult(intent2, 1);
+                startActivityForResult(intent2, 1);
             }
         }
     };
     private View.OnClickListener mButtonScanListener = new View.OnClickListener() {
         public void onClick(View view) {
-            ScanActivity.this.check3GAndStartPrint();
+            check3GAndStartPrint();
         }
     };
     private I1ScanParams mI1ScanParams;
@@ -209,114 +209,114 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             RectF bmRectF;
             if (!ScanActivity.mActivityPaused && ScanActivity.mScanAreaBackgroundViewSizeChanged) {
                 boolean unused = ScanActivity.mScanAreaBackgroundViewSizeChanged = false;
-                boolean unused2 = ScanActivity.this.isNeedGetScanSize = true;
-                boolean unused3 = ScanActivity.this.isNeedScale = true;
-                ScanActivity.this.llScanArea.invalidate();
-                ScanActivity.this.llScanAreaBackground.invalidate();
-                ScanActivity.this.scanArea.invalidate();
-                ScanActivity.this.scanAreaBackground.invalidate();
-                ScanActivity.this.flScanResult.invalidate();
+                boolean unused2 = isNeedGetScanSize = true;
+                boolean unused3 = isNeedScale = true;
+                llScanArea.invalidate();
+                llScanAreaBackground.invalidate();
+                scanArea.invalidate();
+                scanAreaBackground.invalidate();
+                flScanResult.invalidate();
             }
-            if (ScanActivity.this.isNeedGetScanSize) {
-                if (ScanActivity.this.isDoctable) {
+            if (isNeedGetScanSize) {
+                if (isDoctable) {
                     ScanActivity scanActivity = ScanActivity.this;
                     scanActivity.setMaxwidth(Utils.getPrefInt(scanActivity.getContext(), Constants.SCAN_REFS_SUPPORTED_OPTIONS, Constants.SCAN_REFS_MAX_WIDTH));
                     ScanActivity scanActivity2 = ScanActivity.this;
                     scanActivity2.setMaxheight(Utils.getPrefInt(scanActivity2.getContext(), Constants.SCAN_REFS_SUPPORTED_OPTIONS, Constants.SCAN_REFS_MAX_HEIGHT));
                 }
-                if (ScanActivity.this.getMaxwidth() == 0) {
-                    ScanActivity.this.setMaxwidth(Constants.SCAN_MAX_WIDTH);
+                if (getMaxwidth() == 0) {
+                    setMaxwidth(Constants.SCAN_MAX_WIDTH);
                 }
-                if (ScanActivity.this.getMaxheight() == 0) {
-                    ScanActivity.this.setMaxheight(Constants.SCAN_MAX_HEIGHT);
+                if (getMaxheight() == 0) {
+                    setMaxheight(Constants.SCAN_MAX_HEIGHT);
                 }
-                int prefInt = !"".equals(Utils.getPrefString(ScanActivity.this.getContext(), Constants.SCAN_REFS_USED_SCANNER_PATH, Constants.SCAN_REFS_SCANNER_MODEL)) ? Utils.getPrefInt(ScanActivity.this.getContext(), Constants.SCAN_REFS_USED_SCANNER_PATH, Constants.SCAN_REFS_SETTINGS_RESOLUTION) : 150;
-                if (prefInt == ScanActivity.this.resolution && !ScanActivity.this.isDoctable) {
-                    boolean unused4 = ScanActivity.this.isNeedUpdateScanningArea = true;
+                int prefInt = !"".equals(Utils.getPrefString(getContext(), Constants.SCAN_REFS_USED_SCANNER_PATH, Constants.SCAN_REFS_SCANNER_MODEL)) ? Utils.getPrefInt(getContext(), Constants.SCAN_REFS_USED_SCANNER_PATH, Constants.SCAN_REFS_SETTINGS_RESOLUTION) : 150;
+                if (prefInt == resolution && !isDoctable) {
+                    boolean unused4 = isNeedUpdateScanningArea = true;
                 }
-                int unused5 = ScanActivity.this.resolution = prefInt;
+                int unused5 = resolution = prefInt;
                 ScanActivity scanActivity3 = ScanActivity.this;
                 int unused6 = scanActivity3.areaHeightOnScreen = scanActivity3.llScanAreaBackground.getHeight();
                 ScanActivity scanActivity4 = ScanActivity.this;
                 int unused7 = scanActivity4.areaWidthOnScreen = scanActivity4.llScanAreaBackground.getWidth();
             }
-            ScanActivity.this.initFrameWithScreensize();
-            Point point = ScanActivity.this.getmBaseTop();
-            Point point2 = ScanActivity.this.getmBaseBot();
+            initFrameWithScreensize();
+            Point point = getmBaseTop();
+            Point point2 = getmBaseBot();
             int i2 = point2.x - point.x;
             int i3 = point2.y - point.y;
             ScanActivity scanActivity5 = ScanActivity.this;
-            scanActivity5.setmBaseTop(new Point((((scanActivity5.areaWidthOnScreen) - ScanActivity.this.getMaxScanWidthOnScreen())) / 2, ScanActivity.mARGIN_TOP_BOT));
+            scanActivity5.setmBaseTop(new Point((((scanActivity5.areaWidthOnScreen) - getMaxScanWidthOnScreen())) / 2, ScanActivity.mARGIN_TOP_BOT));
             ScanActivity scanActivity6 = ScanActivity.this;
-            scanActivity6.setmBaseBot(new Point(scanActivity6.areaWidthOnScreen - ScanActivity.this.getmBaseTop().x, ScanActivity.this.areaHeightOnScreen - ScanActivity.mARGIN_TOP_BOT));
-            if (!ScanActivity.this.isDoctable && !ScanActivity.this.isNeedGetScanSize) {
+            scanActivity6.setmBaseBot(new Point(scanActivity6.areaWidthOnScreen - getmBaseTop().x, areaHeightOnScreen - ScanActivity.mARGIN_TOP_BOT));
+            if (!isDoctable && !isNeedGetScanSize) {
                 ScanActivity scanActivity7 = ScanActivity.this;
-                scanActivity7.setPiBaseTop(new ScanBaseView.PointInfo(scanActivity7.getmBaseTop().x, ScanActivity.this.getmBaseTop().y));
+                scanActivity7.setPiBaseTop(new ScanBaseView.PointInfo(scanActivity7.getmBaseTop().x, getmBaseTop().y));
                 ScanActivity scanActivity8 = ScanActivity.this;
-                scanActivity8.setPiBaseBot(new ScanBaseView.PointInfo(scanActivity8.getmBaseBot().x, ScanActivity.this.getmBaseBot().y));
+                scanActivity8.setPiBaseBot(new ScanBaseView.PointInfo(scanActivity8.getmBaseBot().x, getmBaseBot().y));
                 ScanActivity scanActivity9 = ScanActivity.this;
                 scanActivity9.setmTop(scanActivity9.getmBaseTop());
                 ScanActivity scanActivity10 = ScanActivity.this;
                 scanActivity10.setmBot(scanActivity10.getmBaseBot());
             }
-            if (ScanActivity.this.isNeedGetScanSize) {
-                if (ScanActivity.this.isNeedUpdateScanningArea) {
+            if (isNeedGetScanSize) {
+                if (isNeedUpdateScanningArea) {
                     ScanActivity scanActivity11 = ScanActivity.this;
-                    scanActivity11.setPiBaseTop(new ScanBaseView.PointInfo(scanActivity11.getmBaseTop().x, ScanActivity.this.getmBaseTop().y));
+                    scanActivity11.setPiBaseTop(new ScanBaseView.PointInfo(scanActivity11.getmBaseTop().x, getmBaseTop().y));
                     ScanActivity scanActivity12 = ScanActivity.this;
-                    scanActivity12.setPiBaseBot(new ScanBaseView.PointInfo(scanActivity12.getmBaseBot().x, ScanActivity.this.getmBaseBot().y));
+                    scanActivity12.setPiBaseBot(new ScanBaseView.PointInfo(scanActivity12.getmBaseBot().x, getmBaseBot().y));
                     ScanActivity scanActivity13 = ScanActivity.this;
                     scanActivity13.setmTop(scanActivity13.getmBaseTop());
                     ScanActivity scanActivity14 = ScanActivity.this;
                     scanActivity14.setmBot(scanActivity14.getmBaseBot());
-                    ScanActivity.this.setScreenStatus(1);
+                    setScreenStatus(1);
                 }
-                if (ScanActivity.this.isNeedScale) {
-                    boolean unused8 = ScanActivity.this.isNeedScale = false;
+                if (isNeedScale) {
+                    boolean unused8 = isNeedScale = false;
                     Point point3 = new Point();
                     float f = (float) i2;
-                    point2.x = (((float) ScanActivity.this.getmBaseTop().x) + (((float) ((ScanActivity.this.getmBaseBot().x - ScanActivity.this.getmBaseTop().x) * (ScanActivity.this.getmTop().x - point.x))) / f));
+                    point2.x = (((float) getmBaseTop().x) + (((float) ((getmBaseBot().x - getmBaseTop().x) * (getmTop().x - point.x))) / f));
                     float f2 = (float) i3;
-                    point2.y = (((float) ScanActivity.this.getmBaseTop().y) + (((float) ((ScanActivity.this.getmBaseBot().y - ScanActivity.this.getmBaseTop().y) * (ScanActivity.this.getmTop().y - point.y))) / f2));
-                    point3.x = (((float) ScanActivity.this.getmBaseTop().x) + (((float) ((ScanActivity.this.getmBaseBot().x - ScanActivity.this.getmBaseTop().x) * (ScanActivity.this.getmBot().x - point.x))) / f));
-                    point3.y = (((float) ScanActivity.this.getmBaseTop().y) + (((float) ((ScanActivity.this.getmBaseBot().y - ScanActivity.this.getmBaseTop().y) * (ScanActivity.this.getmBot().y - point.y))) / f2));
+                    point2.y = (((float) getmBaseTop().y) + (((float) ((getmBaseBot().y - getmBaseTop().y) * (getmTop().y - point.y))) / f2));
+                    point3.x = (((float) getmBaseTop().x) + (((float) ((getmBaseBot().x - getmBaseTop().x) * (getmBot().x - point.x))) / f));
+                    point3.y = (((float) getmBaseTop().y) + (((float) ((getmBaseBot().y - getmBaseTop().y) * (getmBot().y - point.y))) / f2));
                     ScanActivity scanActivity15 = ScanActivity.this;
                     scanActivity15.setPiBaseTop(new ScanBaseView.PointInfo(point2.x, point2.y));
                     ScanActivity scanActivity16 = ScanActivity.this;
                     scanActivity16.setPiBaseBot(new ScanBaseView.PointInfo(point3.x, point3.y));
-                    ScanActivity.this.setmTop(point2);
-                    ScanActivity.this.setmBot(point3);
-                    if (!ScanActivity.this.isNeedRedrawBitmap && (bmRectF = ScanActivity.this.getBmRectF()) != null) {
-                        bmRectF.left = ((float) ScanActivity.this.getmBaseTop().x) + ((((float) (ScanActivity.this.getmBaseBot().x - ScanActivity.this.getmBaseTop().x)) * (bmRectF.left - ((float) point.x))) / f);
-                        bmRectF.top = ((float) ScanActivity.this.getmBaseTop().y) + ((((float) (ScanActivity.this.getmBaseBot().y - ScanActivity.this.getmBaseTop().y)) * (bmRectF.top - ((float) point.y))) / f2);
-                        bmRectF.right = ((float) ScanActivity.this.getmBaseTop().x) + ((((float) (ScanActivity.this.getmBaseBot().x - ScanActivity.this.getmBaseTop().x)) * (bmRectF.right - ((float) point.x))) / f);
-                        bmRectF.bottom = ((float) ScanActivity.this.getmBaseTop().y) + ((((float) (ScanActivity.this.getmBaseBot().y - ScanActivity.this.getmBaseTop().y)) * (bmRectF.bottom - ((float) point.y))) / f2);
-                        ScanActivity.this.setBmRectF(bmRectF);
+                    setmTop(point2);
+                    setmBot(point3);
+                    if (!isNeedRedrawBitmap && (bmRectF = getBmRectF()) != null) {
+                        bmRectF.left = ((float) getmBaseTop().x) + ((((float) (getmBaseBot().x - getmBaseTop().x)) * (bmRectF.left - ((float) point.x))) / f);
+                        bmRectF.top = ((float) getmBaseTop().y) + ((((float) (getmBaseBot().y - getmBaseTop().y)) * (bmRectF.top - ((float) point.y))) / f2);
+                        bmRectF.right = ((float) getmBaseTop().x) + ((((float) (getmBaseBot().x - getmBaseTop().x)) * (bmRectF.right - ((float) point.x))) / f);
+                        bmRectF.bottom = ((float) getmBaseTop().y) + ((((float) (getmBaseBot().y - getmBaseTop().y)) * (bmRectF.bottom - ((float) point.y))) / f2);
+                        setBmRectF(bmRectF);
                     }
                 }
                 ScanActivity scanActivity17 = ScanActivity.this;
-                scanActivity17.setmCenter(scanActivity17.calculateTheCenterPoint(scanActivity17.getmTop(), ScanActivity.this.getmBot()));
+                scanActivity17.setmCenter(scanActivity17.calculateTheCenterPoint(scanActivity17.getmTop(), getmBot()));
                 ScanActivity scanActivity18 = ScanActivity.this;
                 scanActivity18.setInSampleSize(Math.round((float) (100 / ((scanActivity18.areaHeightOnScreen * 100) / 650))));
-                ScanActivity.this.get_bmOption().inSampleSize = ScanActivity.this.getInSampleSize();
-                ScanActivity.this.setupScanArea();
-                boolean unused9 = ScanActivity.this.isNeedGetScanSize = false;
-                ScanActivity.this.setSetSize(true);
-                SharedPreferences sharedPreferences = ScanActivity.this.context.getSharedPreferences(Constants.SCAN_REFS_USED_SCANNER_PATH, 0);
-                if (ScanActivity.this.isDoctable) {
+                get_bmOption().inSampleSize = getInSampleSize();
+                setupScanArea();
+                boolean unused9 = isNeedGetScanSize = false;
+                setSetSize(true);
+                SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.SCAN_REFS_USED_SCANNER_PATH, 0);
+                if (isDoctable) {
                     i = sharedPreferences.getInt(Constants.SCAN_REFS_SCANNER_CHOSEN_SIZE_DOC, Constants.PaperName.EPS_MSID_UNKNOWN.getCode());
                 } else {
                     i = sharedPreferences.getInt(epson.common.Constants.SCAN_REFS_SCANNER_CHOSEN_SIZE_ADF, Constants.PaperName.EPS_MSID_UNKNOWN.getCode());
                 }
-                if (ScanActivity.this.isNeedUpdateScanningArea) {
+                if (isNeedUpdateScanningArea) {
                     if (i == Constants.PaperName.EPS_MSID_UNKNOWN.getCode()) {
-                        ScanActivity.this.chooseScanSize(ScanSizeHelper.getDefaultScanSize());
+                        chooseScanSize(ScanSizeHelper.getDefaultScanSize());
                     } else {
-                        ScanActivity.this.chooseScanSize(i);
+                        chooseScanSize(i);
                     }
                 }
-                ScanActivity.this.scanArea.redrawCBHandler = ScanActivity.this.scanningProgressHandler;
-                boolean unused10 = ScanActivity.this.isNeedUpdateScanningArea = false;
+                scanArea.redrawCBHandler = scanningProgressHandler;
+                boolean unused10 = isNeedUpdateScanningArea = false;
             }
             return true;
         }
@@ -914,8 +914,8 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
         gestureDetector = new GestureDetector(this, new ScanAreaGestureDetector());
         gestureListener = new View.OnTouchListener() {
             public boolean onTouch(View view, MotionEvent motionEvent) {
-                ScanActivity.this.gestureDetector.onTouchEvent(motionEvent);
-                ScanActivity.this.scanArea.onTouchEvent(motionEvent);
+                gestureDetector.onTouchEvent(motionEvent);
+                scanArea.onTouchEvent(motionEvent);
                 return true;
             }
         };
@@ -926,10 +926,10 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction()) {
                     case 0:
-                        ScanActivity.this.btnNext.setBackgroundResource(R.drawable.bt_right_hover);
+                        btnNext.setBackgroundResource(R.drawable.bt_right_hover);
                         return false;
                     case 1:
-                        ScanActivity.this.btnNext.setBackgroundResource(R.drawable.bt_right_1);
+                        btnNext.setBackgroundResource(R.drawable.bt_right_1);
                         return false;
                     default:
                         return false;
@@ -942,10 +942,10 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction()) {
                     case 0:
-                        ScanActivity.this.btnPrev.setBackgroundResource(R.drawable.bt_left_hover);
+                        btnPrev.setBackgroundResource(R.drawable.bt_left_hover);
                         return false;
                     case 1:
-                        ScanActivity.this.btnPrev.setBackgroundResource(R.drawable.bt_left);
+                        btnPrev.setBackgroundResource(R.drawable.bt_left);
                         return false;
                     default:
                         return false;
@@ -1254,104 +1254,104 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 public void run() {
                     if (!WiFiDirectManager.isNeedConnect(ScanActivity.this, WiFiDirectManager.DEVICE_TYPE_SCANNER) || !WiFiDirectManager.reconnect(ScanActivity.this, WiFiDirectManager.DEVICE_TYPE_SCANNER, 10)) {
                         if (!ScanContinueParam.isContinueScanning()) {
-                            ScanCount.countUpScanPage(ScanActivity.this.getApplicationContext());
+                            ScanCount.countUpScanPage(getApplicationContext());
                         }
                         if (!Utils.isMediaMounted()) {
-                            int unused = ScanActivity.this.error = 101;
-                            ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-1);
-                        } else if (!ScanActivity.this.canStartScan()) {
-                            int unused2 = ScanActivity.this.error = -1001;
-                            ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-1);
-                        } else if (ScanActivity.this.usingScannerId == null || ScanActivity.this.usingScannerId.trim().length() < 1) {
-                            int unused3 = ScanActivity.this.error = -1300;
-                            ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-1);
+                            int unused = error = 101;
+                            scanningProgressHandler.sendEmptyMessage(-1);
+                        } else if (!canStartScan()) {
+                            int unused2 = error = -1001;
+                            scanningProgressHandler.sendEmptyMessage(-1);
+                        } else if (usingScannerId == null || usingScannerId.trim().length() < 1) {
+                            int unused3 = error = -1300;
+                            scanningProgressHandler.sendEmptyMessage(-1);
                         } else {
-                            if (ScanActivity.this.usingScannerLocation != 3) {
+                            if (usingScannerLocation != 3) {
                                 ScanActivity scanActivity = ScanActivity.this;
-                                int unused4 = scanActivity.error = scanActivity.escan.probeScannerById(ScanActivity.this.usingScannerId, ScanActivity.this.usingScannerIp);
-                                if (ScanActivity.this.error == -1051) {
-                                    EPLog.e(ScanActivity.this.getLocalClassName(), "scan, ESCAN_ERR_LIB_NOT_INITIALIZED");
-                                    ScanActivity.this.escan.escanWrapperInitDriver(ScanActivity.this);
+                                int unused4 = scanActivity.error = scanActivity.escan.probeScannerById(usingScannerId, usingScannerIp);
+                                if (error == -1051) {
+                                    EPLog.e(getLocalClassName(), "scan, ESCAN_ERR_LIB_NOT_INITIALIZED");
+                                    escan.escanWrapperInitDriver(ScanActivity.this);
                                     ScanActivity scanActivity2 = ScanActivity.this;
-                                    int unused5 = scanActivity2.error = scanActivity2.escan.probeScannerById(ScanActivity.this.usingScannerId, ScanActivity.this.usingScannerIp);
+                                    int unused5 = scanActivity2.error = scanActivity2.escan.probeScannerById(usingScannerId, usingScannerIp);
                                 }
                             } else {
                                 ScanActivity scanActivity3 = ScanActivity.this;
-                                int unused6 = scanActivity3.error = scanActivity3.escan.probeScannerByIp(ScanActivity.this.usingScannerId, ScanActivity.this.usingScannerIp);
-                                if (ScanActivity.this.error == -1051) {
-                                    EPLog.e(ScanActivity.this.getLocalClassName(), "scan, ESCAN_ERR_LIB_NOT_INITIALIZED");
-                                    ScanActivity.this.escan.escanWrapperInitDriver(ScanActivity.this);
+                                int unused6 = scanActivity3.error = scanActivity3.escan.probeScannerByIp(usingScannerId, usingScannerIp);
+                                if (error == -1051) {
+                                    EPLog.e(getLocalClassName(), "scan, ESCAN_ERR_LIB_NOT_INITIALIZED");
+                                    escan.escanWrapperInitDriver(ScanActivity.this);
                                     ScanActivity scanActivity4 = ScanActivity.this;
-                                    int unused7 = scanActivity4.error = scanActivity4.escan.probeScannerByIp(ScanActivity.this.usingScannerId, ScanActivity.this.usingScannerIp);
+                                    int unused7 = scanActivity4.error = scanActivity4.escan.probeScannerByIp(usingScannerId, usingScannerIp);
                                 }
                             }
-                            if (ScanActivity.this.error == 0) {
-                                EPLog.i(ScanActivity.this.getLocalClassName(), "scan, done probe");
-                                if (ScanActivity.this.escan.getListFoundScanner() == null || ScanActivity.this.escan.getListFoundScanner().size() < 1) {
-                                    EPLog.e(ScanActivity.this.getLocalClassName(), "scan, ESCAN_ERR_SCANNER_NOT_FOUND");
-                                    int unused8 = ScanActivity.this.error = -1300;
-                                    if (!ScanActivity.this.isStopScan) {
-                                        ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-1);
+                            if (error == 0) {
+                                EPLog.i(getLocalClassName(), "scan, done probe");
+                                if (escan.getListFoundScanner() == null || escan.getListFoundScanner().size() < 1) {
+                                    EPLog.e(getLocalClassName(), "scan, ESCAN_ERR_SCANNER_NOT_FOUND");
+                                    int unused8 = error = -1300;
+                                    if (!isStopScan) {
+                                        scanningProgressHandler.sendEmptyMessage(-1);
                                         return;
                                     }
                                     return;
                                 }
                                 ScanActivity scanActivity5 = ScanActivity.this;
                                 int unused9 = scanActivity5.error = scanActivity5.escan.escanWrapperSetScanner(0);
-                                if (ScanActivity.this.error != 0) {
-                                    int unused10 = ScanActivity.this.error = -1300;
-                                    ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-1);
+                                if (error != 0) {
+                                    int unused10 = error = -1300;
+                                    scanningProgressHandler.sendEmptyMessage(-1);
                                     return;
                                 }
                                 ScanActivity scanActivity6 = ScanActivity.this;
                                 String unused11 = scanActivity6.usingScannerIp = scanActivity6.escan.getListFoundScanner().get(0).getIp();
-                                ScanActivity.this.escan.resetEscanLib();
-                                if (ScanActivity.this.escan.getListScannedFile() == null) {
-                                    EPLog.i(ScanActivity.this.getLocalClassName(), "scan, getListScannedFile == NULL");
-                                    ScanActivity.this.escan.setListScannedFile(new ArrayList());
+                                escan.resetEscanLib();
+                                if (escan.getListScannedFile() == null) {
+                                    EPLog.i(getLocalClassName(), "scan, getListScannedFile == NULL");
+                                    escan.setListScannedFile(new ArrayList());
                                 } else if (!ScanContinueParam.isContinueScanning()) {
-                                    EPLog.i(ScanActivity.this.getLocalClassName(), "scan, getListScannedFile != NULL");
-                                    ScanActivity.this.escan.getListScannedFile().clear();
-                                    int unused12 = ScanActivity.this.previousTotalScanned = 0;
+                                    EPLog.i(getLocalClassName(), "scan, getListScannedFile != NULL");
+                                    escan.getListScannedFile().clear();
+                                    int unused12 = previousTotalScanned = 0;
                                 }
                                 ScanActivity scanActivity7 = ScanActivity.this;
                                 int unused13 = scanActivity7.error = scanActivity7.escan.GetSupportedOption();
-                                ScanActivity.this.escan.makeJobAttribute(ScanActivity.this.getContext(), ScanActivity.this.extParam);
+                                escan.makeJobAttribute(getContext(), extParam);
                                 synchronized (ScanActivity.this) {
-                                    I1ScanParams unused14 = ScanActivity.mI1ScanParams = ScanActivity.this.escan.getScanParams();
+                                    I1ScanParams unused14 = ScanActivity.mI1ScanParams = escan.getScanParams();
                                 }
-                                if (ScanActivity.this.isStopScan || ScanActivity.this.escan.isScanning()) {
-                                    EPLog.e(ScanActivity.this.getLocalClassName(), "scan, after makeJobAttribute");
+                                if (isStopScan || escan.isScanning()) {
+                                    EPLog.e(getLocalClassName(), "scan, after makeJobAttribute");
                                     return;
                                 }
                                 ScanActivity scanActivity8 = ScanActivity.this;
                                 String access$3300 = scanActivity8.makeImageName(scanActivity8.extParam);
-                                String localClassName = ScanActivity.this.getLocalClassName();
+                                String localClassName = getLocalClassName();
                                 EPLog.i(localClassName, "scan, fname = " + access$3300);
                                 ScanActivity scanActivity9 = ScanActivity.this;
                                 int unused15 = scanActivity9.error = scanActivity9.escan.startScanJob(access$3300);
-                                String localClassName2 = ScanActivity.this.getLocalClassName();
-                                EPLog.i(localClassName2, "[ESCAN][DONE] escanLib().startScanJob - return - " + ScanActivity.this.error);
-                                if (ScanActivity.this.error == 40) {
-                                    boolean unused16 = ScanActivity.this.isStopScan = true;
-                                    int unused17 = ScanActivity.this.error = 0;
+                                String localClassName2 = getLocalClassName();
+                                EPLog.i(localClassName2, "[ESCAN][DONE] escanLib().startScanJob - return - " + error);
+                                if (error == 40) {
+                                    boolean unused16 = isStopScan = true;
+                                    int unused17 = error = 0;
                                 }
-                                if (!ScanActivity.this.isStopScan) {
-                                    EPLog.e(ScanActivity.this.getLocalClassName(), "IN-> isStopScan.");
-                                    if (!(ScanActivity.this.escan.getStatus()[2] == 4 || (ScanActivity.this.error == 0 && ScanActivity.this.escan.getStatus()[2] == 0))) {
-                                        ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-1);
-                                        if (ScanActivity.this.escan.getListScannedFile().size() > 0) {
-                                            EPLog.e(ScanActivity.this.getLocalClassName(), "END SCAN because error.");
-                                            ScanActivity.this.scanningProgressHandler.sendEmptyMessageDelayed(2, 500);
+                                if (!isStopScan) {
+                                    EPLog.e(getLocalClassName(), "IN-> isStopScan.");
+                                    if (!(escan.getStatus()[2] == 4 || (error == 0 && escan.getStatus()[2] == 0))) {
+                                        scanningProgressHandler.sendEmptyMessage(-1);
+                                        if (escan.getListScannedFile().size() > 0) {
+                                            EPLog.e(getLocalClassName(), "END SCAN because error.");
+                                            scanningProgressHandler.sendEmptyMessageDelayed(2, 500);
                                         }
-                                        EPLog.e(ScanActivity.this.getLocalClassName(), "SCAN error.");
+                                        EPLog.e(getLocalClassName(), "SCAN error.");
                                         return;
                                     }
                                 }
-                                EPLog.i(ScanActivity.this.getLocalClassName(), "END SCAN NORMALY.");
-                                ScanActivity.this.scanningProgressHandler.sendEmptyMessage(2);
-                            } else if (!ScanActivity.this.isStopScan) {
-                                ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-1);
+                                EPLog.i(getLocalClassName(), "END SCAN NORMALY.");
+                                scanningProgressHandler.sendEmptyMessage(2);
+                            } else if (!isStopScan) {
+                                scanningProgressHandler.sendEmptyMessage(-1);
                             }
                         }
                     }
@@ -1677,21 +1677,21 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             confirmAlertDialog.setMessage(str);
             confirmAlertDialog.setButton(-2, getText(R.string.str_no), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    if (!ScanActivity.this.escan.isJobDone()) {
-                        ScanActivity.this.showScanningPop();
+                    if (!escan.isJobDone()) {
+                        showScanningPop();
                     }
-                    boolean unused = ScanActivity.this.isConfirmCancel = false;
+                    boolean unused = isConfirmCancel = false;
                 }
             });
             confirmAlertDialog.setButton(-1, getText(R.string.str_yes), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    boolean unused = ScanActivity.this.isConfirmCancel = true;
-                    String localClassName = ScanActivity.this.getLocalClassName();
-                    EPLog.i(localClassName, "yes pressed, isConfirmCancel = " + ScanActivity.this.isConfirmCancel);
-                    if (!ScanActivity.this.escan.isJobDone()) {
-                        ScanActivity.this.showScanningPop();
+                    boolean unused = isConfirmCancel = true;
+                    String localClassName = getLocalClassName();
+                    EPLog.i(localClassName, "yes pressed, isConfirmCancel = " + isConfirmCancel);
+                    if (!escan.isJobDone()) {
+                        showScanningPop();
                     }
-                    ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-2);
+                    scanningProgressHandler.sendEmptyMessage(-2);
                 }
             });
             confirmAlertDialog.show();
@@ -1813,7 +1813,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
         }
 
         public boolean onFling(MotionEvent motionEvent, MotionEvent motionEvent2, float f, float f2) {
-            Display defaultDisplay = ScanActivity.this.getWindowManager().getDefaultDisplay();
+            Display defaultDisplay = getWindowManager().getDefaultDisplay();
             Point point = new Point();
             defaultDisplay.getSize(point);
             float f3 = (float) point.y;
@@ -1823,12 +1823,12 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             }
             double rawX = ((motionEvent.getRawX() - motionEvent2.getRawX()));
             if (rawX < ((-f3)) * 0.1d) {
-                ScanActivity.this.prevPage();
+                prevPage();
                 return false;
             } else if (rawX <= (f3) * 0.1d) {
                 return false;
             } else {
-                ScanActivity.this.nextPage();
+                nextPage();
                 return false;
             }
         }
@@ -1854,14 +1854,14 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
         }
 
         protected Bitmap doInBackground(String... strArr) {
-            if (ScanActivity.this.escan.isJobDone()) {
+            if (escan.isJobDone()) {
                 return null;
             }
-            return ScanActivity.this.showBitmap(strArr[0]);
+            return showBitmap(strArr[0]);
         }
 
         protected void onPostExecute(Bitmap bitmap) {
-            ScanActivity.this.displayPreview(bitmap);
+            displayPreview(bitmap);
         }
     }
 

app/src/main/java/epson/scan/activity/ScanSettingsDetailActivity.java

@@ -39,19 +39,19 @@ public class ScanSettingsDetailActivity extends ActivityIACommon {
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
             if (view.getTag() instanceof ScanSettingsDetailAdapter.DetailSettingHolder) {
                 ScanSettingsDetailAdapter.DetailSettingHolder detailSettingHolder = (ScanSettingsDetailAdapter.DetailSettingHolder) view.getTag();
-                if (ScanSettingsDetailActivity.this.screenId == R.string.str_settings_source_title) {
-                    ScanSettingsDetailActivity.this.lastValue = detailSettingHolder.value;
-                    String unused = ScanSettingsDetailActivity.this.strSelText = detailSettingHolder.text.getText().toString();
-                    ScanSettingsDetailActivity.this.ssdAdapter.setSelected(ScanSettingsDetailActivity.this.lastValue);
-                    ScanSettingsDetailActivity.this.ssdAdapter.notifyDataSetChanged();
-                    if (ScanSettingsDetailActivity.this.lastValue == 1) {
-                        ScanSettingsDetailActivity.this.listSelect2.setVisibility(View.VISIBLE);
+                if (screenId == R.string.str_settings_source_title) {
+                    lastValue = detailSettingHolder.value;
+                    String unused = strSelText = detailSettingHolder.text.getText().toString();
+                    ssdAdapter.setSelected(lastValue);
+                    ssdAdapter.notifyDataSetChanged();
+                    if (lastValue == 1) {
+                        listSelect2.setVisibility(View.VISIBLE);
                     } else {
-                        ScanSettingsDetailActivity.this.listSelect2.setVisibility(View.GONE);
+                        listSelect2.setVisibility(View.GONE);
                     }
                 } else {
-                    Intent intent = ScanSettingsDetailActivity.this.getIntent();
-                    int i2 = ScanSettingsDetailActivity.this.screenId;
+                    Intent intent = getIntent();
+                    int i2 = screenId;
                     if (i2 != R.string.str_advance_setting) {
                         if (i2 == R.string.str_scanning_size) {
                             intent.putExtra(Constants.SCAN_REFS_SCANNER_CHOSEN_SIZE, detailSettingHolder.value);
@@ -64,8 +64,8 @@ public class ScanSettingsDetailActivity extends ActivityIACommon {
                         intent.putExtra(Constants.SCAN_REFS_SETTINGS_COLOR, detailSettingHolder.value);
                         intent.putExtra(Constants.SCAN_REFS_SETTINGS_COLOR_NAME, detailSettingHolder.text.getText().toString());
                     }
-                    ScanSettingsDetailActivity.this.setResult(-1, intent);
-                    ScanSettingsDetailActivity.this.finish();
+                    setResult(-1, intent);
+                    finish();
                 }
             }
         }
@@ -74,15 +74,15 @@ public class ScanSettingsDetailActivity extends ActivityIACommon {
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
             EPLog.i("mListOptionClick2", "[position]" + i);
             EPLog.i("mListOptionClick2", "[id]" + j);
-            int unused = ScanSettingsDetailActivity.this.lastAdfGuid = i;
+            int unused = lastAdfGuid = i;
             switch (i) {
                 case 0:
-                    ScanSettingsDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
-                    ScanSettingsDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)));
+                    ScanSettingsDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                    ScanSettingsDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)));
                     break;
                 case 1:
-                    ScanSettingsDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)));
-                    ScanSettingsDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                    ScanSettingsDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)));
+                    ScanSettingsDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
                     break;
             }
             ScanSettingsDetailActivity.mlAdapter.notifyDataSetChanged();

app/src/main/java/epson/server/screens/UploadScreen.java

@@ -61,18 +61,18 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
         public boolean handleMessage(Message message) {
             int i = message.what;
             if (i == 0) {
-                UploadScreen.this.setScreenState(false);
+                setScreenState(false);
             } else if (i == 16) {
-                EPLog.i("createUploadThread", "5:" + UploadScreen.this.isSaved);
-                if (UploadScreen.this.isSaved) {
-                    UploadScreen.this.setResult(-1, UploadScreen.this.getIntent());
-                    UploadScreen.this.finish();
+                EPLog.i("createUploadThread", "5:" + isSaved);
+                if (isSaved) {
+                    setResult(-1, getIntent());
+                    finish();
                 } else {
-                    EPLog.i("createUploadThread", "6:" + UploadScreen.this.isSaved);
+                    EPLog.i("createUploadThread", "6:" + isSaved);
                     UploadScreen uploadScreen = UploadScreen.this;
                     uploadScreen.errorDialog = new ErrorDialog(uploadScreen, R.style.AppTheme_Translucent, 4, 0, false);
-                    UploadScreen.this.errorDialog.show();
-                    UploadScreen.this.setScreenState(false);
+                    errorDialog.show();
+                    setScreenState(false);
                 }
             }
             return false;
@@ -165,7 +165,7 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                         Intent intent = new Intent();
                         try {
                             if (!fileBrower.isAvailableFileName(UploadScreen.mFileName.getText().toString())) {
-                                Toast.makeText(UploadScreen.this.getApplicationContext(), R.string.str_error_Filename, 1).show();
+                                Toast.makeText(getApplicationContext(), R.string.str_error_Filename, 1).show();
                                 return;
                             }
                             intent.setAction("android.intent.action.SEND");
@@ -183,7 +183,7 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                 intent.setType("application/pdf");
                             } else {
                                 String obj = UploadScreen.mFileName.getText().toString();
-                                if (!obj.equals("EPSON" + UploadScreen.this.utils.editNumber(UploadScreen.this.count))) {
+                                if (!obj.equals("EPSON" + utils.editNumber(count))) {
                                     str = UploadScreen.mFileName.getText().toString();
                                     z = true;
                                 } else if (UploadScreen.mListFilePath.size() == 1) {
@@ -194,7 +194,7 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                     z = false;
                                 }
                                 ArrayList arrayList2 = new ArrayList();
-                                int access$500 = UploadScreen.this.count;
+                                int access$500 = count;
                                 ExternalFileUtils.getInstance(UploadScreen.this).createTempFolder(ExternalFileUtils.getInstance(UploadScreen.this).getScannedImageDir());
                                 if (UploadScreen.mListFilePath.size() == 1) {
                                     UploadScreen uploadScreen = UploadScreen.this;
@@ -206,7 +206,7 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                     for (int i = 0; i < UploadScreen.mListFilePath.size(); i++) {
                                         UploadScreen uploadScreen2 = UploadScreen.this;
                                         access$500++;
-                                        arrayList2.add(ScannedFileProvider.getUriForFile(UploadScreen.this, MyUtility.createTempFile(uploadScreen2, (String) UploadScreen.mListFilePath.get(i), str + UploadScreen.this.utils.editNumber(access$500) + ".jpg")));
+                                        arrayList2.add(ScannedFileProvider.getUriForFile(UploadScreen.this, MyUtility.createTempFile(uploadScreen2, (String) UploadScreen.mListFilePath.get(i), str + utils.editNumber(access$500) + ".jpg")));
                                     }
                                 }
                                 if (arrayList2.size() <= 1) {
@@ -217,7 +217,7 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                 }
                                 intent.setType("image/jpg");
                             }
-                            UploadScreen.this.startActivity(Intent.createChooser(intent, UploadScreen.this.getString(R.string.open_in)));
+                            startActivity(Intent.createChooser(intent, getString(R.string.open_in)));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -233,15 +233,15 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                     public void onClick(View view) {
                         String str;
                         if (!fileBrower.isAvailableFileName(UploadScreen.mFileName.getText().toString())) {
-                            Toast.makeText(UploadScreen.this.getApplicationContext(), R.string.str_error_Filename, 1).show();
+                            Toast.makeText(getApplicationContext(), R.string.str_error_Filename, 1).show();
                         } else if (UploadScreen.mFileName.getText().toString().length() > 0) {
-                            UploadScreen.this.setScreenState(true);
+                            setScreenState(true);
                             Iterator it = UploadScreen.mListFilePath.iterator();
                             while (it.hasNext()) {
                                 UploadScreen.mSaveFiles.add(new File((String) it.next()));
                             }
                             String obj = UploadScreen.mFileName.getText().toString();
-                            if (!obj.equals("EPSON" + UploadScreen.this.utils.editNumber(UploadScreen.this.count))) {
+                            if (!obj.equals("EPSON" + utils.editNumber(count))) {
                                 boolean unused = UploadScreen.mIsRename = true;
                                 str = UploadScreen.mFileName.getText().toString();
                             } else if (UploadScreen.mSaveFiles.size() == 1) {
@@ -267,10 +267,10 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
         new Thread() {
             public void run() {
                 File file;
-                UploadScreen.this.isSaved = false;
+                isSaved = false;
                 try {
                     MyUtility.createFolder(CommonDefine.EPSONIPRINT_FOLDER);
-                    int access$500 = UploadScreen.this.count;
+                    int access$500 = count;
                     if (UploadScreen.mSaveFiles.size() != 1) {
                         if (UploadScreen.mIsRename) {
                             access$500 = 1;
@@ -281,24 +281,24 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                 if (!it.hasNext()) {
                                     break;
                                 }
-                                UploadScreen.this.isSaved = true;
+                                isSaved = true;
                                 UploadScreen uploadScreen = UploadScreen.this;
                                 String absolutePath = ((File) it.next()).getAbsolutePath();
-                                File createTempFile = MyUtility.createTempFile(uploadScreen, absolutePath, UploadScreen.this.currentFileName + UploadScreen.this.utils.editNumber(access$500) + ".jpg");
+                                File createTempFile = MyUtility.createTempFile(uploadScreen, absolutePath, currentFileName + utils.editNumber(access$500) + ".jpg");
                                 if (createTempFile == null) {
-                                    UploadScreen.this.isSaved = false;
+                                    isSaved = false;
                                     break;
                                 }
-                                File file2 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + UploadScreen.this.utils.editNumber(access$500) + ".jpg");
+                                File file2 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + utils.editNumber(access$500) + ".jpg");
                                 if (file2.exists() && !UploadScreen.mIsRename) {
                                     int i = 1;
                                     while (true) {
-                                        File file3 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + UploadScreen.this.utils.editNumber(access$500) + " (" + i + ")" + ".jpg");
+                                        File file3 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + utils.editNumber(access$500) + " (" + i + ")" + ".jpg");
                                         if (!file3.exists()) {
                                             file2 = file3;
                                             break;
                                         } else if (i >= 99) {
-                                            file2 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + UploadScreen.this.utils.editNumber(access$500) + " (" + 99 + ")" + ".jpg");
+                                            file2 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + utils.editNumber(access$500) + " (" + 99 + ")" + ".jpg");
                                             break;
                                         } else {
                                             i++;
@@ -307,7 +307,7 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                 }
                                 access$500++;
                                 MyUtility.copy(createTempFile, file2);
-                                UploadScreen.this.addMediaStorage(file2.getAbsolutePath());
+                                addMediaStorage(file2.getAbsolutePath());
                                 if (createTempFile.isFile()) {
                                     createTempFile.delete();
                                 }
@@ -320,19 +320,19 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                             }
                             libHaru libharu = new libHaru();
                             if (UploadScreen.mIsRename) {
-                                file = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + CommonDefine.FileType_PDF);
+                                file = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + CommonDefine.FileType_PDF);
                             } else {
-                                file = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + UploadScreen.this.utils.editNumber(access$500) + CommonDefine.FileType_PDF);
+                                file = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + utils.editNumber(access$500) + CommonDefine.FileType_PDF);
                             }
                             if (file.exists() && !UploadScreen.mIsRename) {
                                 int i2 = 1;
                                 while (true) {
-                                    File file4 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + UploadScreen.this.utils.editNumber(access$500) + " (" + i2 + ")" + CommonDefine.FileType_PDF);
+                                    File file4 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + utils.editNumber(access$500) + " (" + i2 + ")" + CommonDefine.FileType_PDF);
                                     if (!file4.exists()) {
                                         file = file4;
                                         break;
                                     } else if (i2 >= 99) {
-                                        file = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + UploadScreen.this.utils.editNumber(access$500) + " (" + 99 + ")" + CommonDefine.FileType_PDF);
+                                        file = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + utils.editNumber(access$500) + " (" + 99 + ")" + CommonDefine.FileType_PDF);
                                         break;
                                     } else {
                                         i2++;
@@ -340,8 +340,8 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                 }
                             }
                             if (libharu.createPDF(arrayList, file.getAbsolutePath()) == 0) {
-                                UploadScreen.this.isSaved = true;
-                                UploadScreen.this.addMediaStorage(file.getAbsolutePath());
+                                isSaved = true;
+                                addMediaStorage(file.getAbsolutePath());
                             }
                         }
                     } else if (UploadScreen.mFileType.equals(Constants.PDF_TYPE)) {
@@ -351,16 +351,16 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                             arrayList2.add(((File) it3.next()).getAbsolutePath());
                         }
                         libHaru libharu2 = new libHaru();
-                        File file5 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + CommonDefine.FileType_PDF);
+                        File file5 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + CommonDefine.FileType_PDF);
                         if (file5.exists() && !UploadScreen.mIsRename) {
                             int i3 = 1;
                             while (true) {
-                                File file6 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + " (" + i3 + ")" + CommonDefine.FileType_PDF);
+                                File file6 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + " (" + i3 + ")" + CommonDefine.FileType_PDF);
                                 if (!file6.exists()) {
                                     file5 = file6;
                                     break;
                                 } else if (i3 >= 99) {
-                                    file5 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + " (" + 99 + ")" + CommonDefine.FileType_PDF);
+                                    file5 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + " (" + 99 + ")" + CommonDefine.FileType_PDF);
                                     break;
                                 } else {
                                     i3++;
@@ -368,17 +368,17 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                             }
                         }
                         if (libharu2.createPDF(arrayList2, file5.getAbsolutePath()) == 0) {
-                            UploadScreen.this.isSaved = true;
-                            UploadScreen.this.addMediaStorage(file5.getAbsolutePath());
+                            isSaved = true;
+                            addMediaStorage(file5.getAbsolutePath());
                         }
                     } else {
                         EPLog.i("createUploadThread", "1");
                         UploadScreen uploadScreen2 = UploadScreen.this;
                         String absolutePath2 = ((File) UploadScreen.mSaveFiles.get(0)).getAbsolutePath();
-                        File createTempFile2 = MyUtility.createTempFile(uploadScreen2, absolutePath2, UploadScreen.this.currentFileName + ".jpg");
+                        File createTempFile2 = MyUtility.createTempFile(uploadScreen2, absolutePath2, currentFileName + ".jpg");
                         EPLog.i("createUploadThread", ExifInterface.GPS_MEASUREMENT_2D + createTempFile2);
                         if (createTempFile2 != null) {
-                            File file7 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + ".jpg");
+                            File file7 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + ".jpg");
                             StringBuilder sb = new StringBuilder();
                             sb.append(ExifInterface.GPS_MEASUREMENT_3D);
                             sb.append(file7);
@@ -386,12 +386,12 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                             if (file7.exists() && !UploadScreen.mIsRename) {
                                 int i4 = 1;
                                 while (true) {
-                                    File file8 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + " (" + i4 + ")" + ".jpg");
+                                    File file8 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + " (" + i4 + ")" + ".jpg");
                                     if (!file8.exists()) {
                                         file7 = file8;
                                         break;
                                     } else if (i4 >= 99) {
-                                        file7 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + " (" + 99 + ")" + ".jpg");
+                                        file7 = new File(CommonDefine.EPSONIPRINT_FOLDER + currentFileName + " (" + 99 + ")" + ".jpg");
                                         break;
                                     } else {
                                         i4++;
@@ -399,12 +399,12 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                 }
                             }
                             MyUtility.copy(createTempFile2, file7);
-                            UploadScreen.this.addMediaStorage(file7.getAbsolutePath());
+                            addMediaStorage(file7.getAbsolutePath());
                             if (createTempFile2.isFile()) {
                                 createTempFile2.delete();
                             }
-                            UploadScreen.this.isSaved = true;
-                            EPLog.i("createUploadThread", "4:" + UploadScreen.this.isSaved);
+                            isSaved = true;
+                            EPLog.i("createUploadThread", "4:" + isSaved);
                         }
                     }
                     UploadScreen.mSaveFiles.clear();
@@ -441,34 +441,34 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
             if (i != 16) {
                 switch (i) {
                     case 0:
-                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(UploadScreen.this.getString(R.string.authenticate_error_title));
-                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(UploadScreen.this.getString(R.string.authenticate_error_mes));
+                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(getString(R.string.authenticate_error_title));
+                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(getString(R.string.authenticate_error_mes));
                         break;
                     case 1:
-                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(UploadScreen.this.getString(R.string.download_error_title));
-                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(UploadScreen.this.getString(R.string.download_error_mes));
+                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(getString(R.string.download_error_title));
+                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(getString(R.string.download_error_mes));
                         break;
                     case 2:
-                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(UploadScreen.this.getString(R.string.upload_error_title));
-                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(UploadScreen.this.getString(R.string.upload_error_mes));
+                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(getString(R.string.upload_error_title));
+                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(getString(R.string.upload_error_mes));
                         break;
                     case 3:
-                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(UploadScreen.this.getString(R.string.error));
-                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(UploadScreen.this.getString(R.string.network_error_mes));
+                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(getString(R.string.error));
+                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(getString(R.string.network_error_mes));
                         break;
                     case 4:
-                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(UploadScreen.this.getString(R.string.upload_error_title));
-                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(UploadScreen.this.getString(R.string.str_error_Filename));
+                        ((TextView) inflate.findViewById(R.id.dialog_title)).setText(getString(R.string.upload_error_title));
+                        ((TextView) inflate.findViewById(R.id.dialog_content)).setText(getString(R.string.str_error_Filename));
                         break;
                 }
             } else {
-                ((TextView) inflate.findViewById(R.id.dialog_title)).setText(UploadScreen.this.getString(R.string.unknow_error_title));
-                ((TextView) inflate.findViewById(R.id.dialog_content)).setText(UploadScreen.this.getString(R.string.unknow_error_mes));
+                ((TextView) inflate.findViewById(R.id.dialog_title)).setText(getString(R.string.unknow_error_title));
+                ((TextView) inflate.findViewById(R.id.dialog_content)).setText(getString(R.string.unknow_error_mes));
             }
             ((Button) inflate.findViewById(R.id.f337ok)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    ErrorDialog.this.dismiss();
-                    int unused = UploadScreen.this.count = 0;
+                    dismiss();
+                    int unused = count = 0;
                     if (ErrorDialog.mIsCloseDialog) {
                         int unused2 = ErrorDialog.mExtraCode;
                         int unused3 = ErrorDialog.mExtraCode;