0

app/src/main/java/epson/print/storage/evernote/EvernoteClient.java

@@ -24,15 +24,6 @@ public class EvernoteClient extends StorageServiceClient {
         return true;
     }
 
-    public boolean isSignedIn(Context context) {
-        return epson.server.service.EvernoteClient.getEvernoteSession(context).isLoggedIn();
-    }
-
-    public boolean revokeSignedInData(Activity activity) {
-        epson.server.service.EvernoteClient.logout(activity);
-        return true;
-    }
-
     public boolean isValidUploadName(String str) {
         if (str.startsWith(CommonDefine.DOT)) {
             return false;

app/src/main/java/epson/provider/IAFileProvider.java

@@ -6,8 +6,7 @@ import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.support.p000v4.content.FileProvider;
-
+import androidx.core.content.FileProvider;
 import java.io.File;
 import java.io.FileNotFoundException;
 

app/src/main/java/epson/server/service/EvernoteClient.java

@@ -1,26 +0,0 @@
-package epson.server.service;
-
-import android.content.Context;
-
-import com.epson.iprint.storage.SecureKeyStore;
-import com.evernote.client.android.EvernoteSession;
-
-public class EvernoteClient {
-    static EvernoteSession session;
-
-    public static EvernoteSession getEvernoteSession(Context context) {
-        EvernoteSession evernoteSession = session;
-        if (evernoteSession != null) {
-            return evernoteSession;
-        }
-        session = new EvernoteSession.Builder(context).setEvernoteService(EvernoteSession.EvernoteService.PRODUCTION).setSupportAppLinkedNotebooks(false).build(new SecureKeyStore().getApiKeyB(context), new SecureKeyStore().getSecKeyB(context)).asSingleton();
-        return session;
-    }
-
-    public static void logout(Context context) {
-        try {
-            getEvernoteSession(context).logOut();
-        } catch (Exception unused) {
-        }
-    }
-}

app/src/main/java/epson/server/utils/MyUtility.java

@@ -39,12 +39,6 @@ public final class MyUtility {
                     return file;
                 }
             }
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return null;
-        } catch (IOException e2) {
-            e2.printStackTrace();
-            return null;
         }
     }
 

app/src/main/java/epson/server/utils/NetworkConnectivityListener.java

@@ -29,22 +29,22 @@ public class NetworkConnectivityListener {
 
         public void onReceive(Context context, Intent intent) {
             if (Utils.getInstance().isNetworkAvailable(context)) {
-                boolean unused = NetworkConnectivityListener.this.isOnline = true;
+                boolean unused = isOnline = true;
                 EPLog.m307e("ConnectivityBroadcastReceiver:  ", "===========OKKKKKKKKKKKKKKKKKKKK");
                 return;
             }
-            boolean unused2 = NetworkConnectivityListener.this.isOnline = false;
+            boolean unused2 = isOnline = false;
             cancelDownload();
             EPLog.m307e("ConnectivityBroadcastReceiver:  ", "============FALSEEEEEEEEEEEEEEEEE");
         }
 
         private void cancelDownload() {
-            NetworkConnectivityListener.mActivityHandler.sendEmptyMessage(4);
+            mActivityHandler.sendEmptyMessage(4);
             Message message = new Message();
             message.what = 1;
             message.arg1 = 1;
-            NetworkConnectivityListener.mActivityHandler.sendMessage(message);
-            NetworkConnectivityListener.this.stopListening();
+            mActivityHandler.sendMessage(message);
+            stopListening();
         }
     }
 

app/src/main/res/layout/activity_check_eula.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.p003v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
         android:textColor="#ff000000"
         android:id="@+id/toolbar"
@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/Use_Information_Title" />
-    </android.support.p003v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <com.epson.mobilephone.common.license.RestoreScrollView
         android:id="@+id/eulaCheckMainScrollView"

app/src/main/res/layout/activity_info_display.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.p003v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
         android:id="@+id/toolbar"
         android:background="@drawable/underline"

app/src/main/res/layout/activity_license_top.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.p003v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
         android:textColor="#ff000000"
         android:id="@+id/toolbar"
@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/Use_Information_Title" />
-    </android.support.p003v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <ImageView
         android:layout_width="match_parent"

app/src/main/res/layout/activity_temp_image_pager.xml

@@ -9,7 +9,7 @@
 
     <include layout="@layout/navigationbar" />
 
-    <android.support.p000v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:paddingLeft="0dp"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_user_survey_invitation.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.p003v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
         android:textColor="#ff000000"
         android:id="@+id/toolbar"

app/src/main/res/menu/camera_menu.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/cam_setting" android:id="@+id/camera_setting" android:title="@string/str_settings" app:showAsAction="always"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:icon="@drawable/cam_setting"
+        android:id="@+id/camera_setting"
+        android:title="@string/str_settings"
+        app:showAsAction="always" />
 </menu>

app/src/main/res/menu/information_menu.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_action_about" android:id="@+id/information_setting" android:title="@string/title_support" android:alphabeticShortcut="f" android:numericShortcut="0" app:showAsAction="ifRoom"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:icon="@drawable/ic_action_about"
+        android:id="@+id/information_setting"
+        android:title="@string/title_support"
+        android:alphabeticShortcut="f"
+        android:numericShortcut="0"
+        app:showAsAction="ifRoom" />
 </menu>

app/src/main/res/menu/menu_cancel.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/menuCancel" android:title="@string/str_cancel" app:showAsAction="never|always|withText"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menuCancel"
+        android:title="@string/str_cancel"
+        app:showAsAction="never|always|withText" />
 </menu>

app/src/main/res/menu/menu_done.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/menuSettingsDone" android:title="@string/str_done" app:showAsAction="never|always|withText"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menuSettingsDone"
+        android:title="@string/str_done"
+        app:showAsAction="never|always|withText" />
 </menu>

app/src/main/res/menu/menu_image_selector.xml

@@ -1,7 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_zoom" android:visible="false" android:orderInCategory="80" android:title="@string/photo_zoom_mode" app:showAsAction="ifRoom"/>
-    <item android:id="@+id/action_select" android:visible="false" android:orderInCategory="80" android:title="@string/photo_select_mode" app:showAsAction="ifRoom"/>
-    <item android:id="@+id/action_thumbnail_type_select" android:orderInCategory="100" android:title="@string/str_use_mediastorage_thumbnail_short" app:showAsAction="never"/>
-    <item android:id="@+id/action_go_preview" android:orderInCategory="90" android:title="@string/str_next" app:showAsAction="always"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_zoom"
+        android:visible="false"
+        android:orderInCategory="80"
+        android:title="@string/photo_zoom_mode"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_select"
+        android:visible="false"
+        android:orderInCategory="80"
+        android:title="@string/photo_select_mode"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_thumbnail_type_select"
+        android:orderInCategory="100"
+        android:title="@string/str_use_mediastorage_thumbnail_short"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_go_preview"
+        android:orderInCategory="90"
+        android:title="@string/str_next"
+        app:showAsAction="always" />
 </menu>

app/src/main/res/menu/menu_image_view_pager.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_go_preview" android:orderInCategory="100" android:title="@string/str_next" app:showAsAction="always"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_go_preview"
+        android:orderInCategory="100"
+        android:title="@string/str_next"
+        app:showAsAction="always" />
 </menu>

app/src/main/res/menu/menu_ok.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/ok" android:title="@string/ok" app:showAsAction="never|always|withText"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/ok"
+        android:title="@string/ok"
+        app:showAsAction="never|always|withText" />
 </menu>

app/src/main/res/menu/menu_sign_inout.xml

@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/menu_signin" android:title="@string/sign_in_btn_label" app:showAsAction="never|always|withText"/>
-    <item android:id="@+id/menu_signout" android:title="@string/sign_out_btn_label" app:showAsAction="never|always|withText"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_signin"
+        android:title="@string/sign_in_btn_label"
+        app:showAsAction="never|always|withText" />
+    <item
+        android:id="@+id/menu_signout"
+        android:title="@string/sign_out_btn_label"
+        app:showAsAction="never|always|withText" />
 </menu>

app/src/main/res/menu/print_menu.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/settings" android:id="@+id/Menu_Show_PrintSettings" android:title="@string/str_btn_printer_settings" android:alphabeticShortcut="f" android:numericShortcut="0" app:showAsAction="always"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:icon="@drawable/settings"
+        android:id="@+id/Menu_Show_PrintSettings"
+        android:title="@string/str_btn_printer_settings"
+        android:alphabeticShortcut="f"
+        android:numericShortcut="0"
+        app:showAsAction="always" />
 </menu>

app/src/main/res/menu/print_option_menu.xml

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/back" android:id="@+id/go_back" android:title="@string/str_back"/>
-    <item android:icon="@drawable/next_web" android:id="@+id/go_next" android:title="@string/str_next"/>
-    <item android:icon="@drawable/print" android:id="@+id/print_option" android:title="@string/str_print" app:showAsAction="always"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:icon="@drawable/back"
+        android:id="@+id/go_back"
+        android:title="@string/str_back" />
+    <item
+        android:icon="@drawable/next_web"
+        android:id="@+id/go_next"
+        android:title="@string/str_next" />
+    <item
+        android:icon="@drawable/print"
+        android:id="@+id/print_option"
+        android:title="@string/str_print"
+        app:showAsAction="always" />
 </menu>

app/src/main/res/menu/scan_menu.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/settings" android:id="@+id/btn_scan_settings" android:title="@string/str_lbl_title_scan_settings" app:showAsAction="always"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:icon="@drawable/settings"
+        android:id="@+id/btn_scan_settings"
+        android:title="@string/str_lbl_title_scan_settings"
+        app:showAsAction="always" />
 </menu>

app/src/main/res/menu/thumbnail_settings_menu.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:title="@string/str_settings_thumbnail">
         <menu>
-            <item android:id="@+id/id_toggle_use_mediastorage_thumbnail" android:title="@string/str_use_mediastorage_thumbnail" android:titleCondensed="@string/str_use_mediastorage_thumbnail_short" android:checkable="true"/>
+            <item
+                android:id="@+id/id_toggle_use_mediastorage_thumbnail"
+                android:title="@string/str_use_mediastorage_thumbnail"
+                android:titleCondensed="@string/str_use_mediastorage_thumbnail_short"
+                android:checkable="true" />
         </menu>
     </item>
 </menu>

app/src/main/res/menu/thumbnail_settings_menu_cancel.xml

@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/menuCancel" android:title="@string/str_cancel" app:showAsAction="never|always|withText"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menuCancel"
+        android:title="@string/str_cancel"
+        app:showAsAction="never|always|withText" />
     <item android:title="@string/str_settings_thumbnail">
         <menu>
-            <item android:id="@+id/id_toggle_use_mediastorage_thumbnail" android:title="@string/str_use_mediastorage_thumbnail" android:titleCondensed="@string/str_use_mediastorage_thumbnail_short" android:checkable="true"/>
+            <item
+                android:id="@+id/id_toggle_use_mediastorage_thumbnail"
+                android:title="@string/str_use_mediastorage_thumbnail"
+                android:titleCondensed="@string/str_use_mediastorage_thumbnail_short"
+                android:checkable="true" />
         </menu>
     </item>
 </menu>

app/src/main/res/values/dimen.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+    <dimen name="activity_horizontal_margin">8dp</dimen>
+    <dimen name="activity_vertical_margin">8dp</dimen>
+    <dimen name="box_body_material">16sp</dimen>
+    <dimen name="box_text_size_subhead_material">16sp</dimen>
+    <dimen name="box_text_size_title_material">20sp</dimen>
+    <dimen name="choose_storage_btn_margin">15dp</dimen>
+    <dimen name="choose_storage_btn_text_size">25dp</dimen>
+    <dimen name="collaboration_cell_height">72dp</dimen>
+    <dimen name="collaboration_thumb_size">40dp</dimen>
+    <dimen name="compat_button_inset_horizontal_material">4dp</dimen>
+    <dimen name="compat_button_inset_vertical_material">6dp</dimen>
+    <dimen name="compat_button_padding_horizontal_material">8dp</dimen>
+    <dimen name="compat_button_padding_vertical_material">4dp</dimen>
+    <dimen name="compat_control_corner_material">2dp</dimen>
+    <dimen name="compat_notification_large_icon_max_height">320dp</dimen>
+    <dimen name="compat_notification_large_icon_max_width">320dp</dimen>
+    <dimen name="disabled_alpha_material_dark">0.3</dimen>
+    <dimen name="disabled_alpha_material_light">0.26</dimen>
+    <dimen name="highlight_alpha_material_colored">0.26</dimen>
+    <dimen name="highlight_alpha_material_dark">0.2</dimen>
+    <dimen name="highlight_alpha_material_light">0.12</dimen>
+    <dimen name="hint_alpha_material_dark">0.5</dimen>
+    <dimen name="hint_alpha_material_light">0.38</dimen>
+    <dimen name="hint_pressed_alpha_material_dark">0.7</dimen>
+    <dimen name="hint_pressed_alpha_material_light">0.54</dimen>
+    <dimen name="image_selector_grid_thumbnail_size">88dp</dimen>
+    <dimen name="image_selector_grid_thumbnail_spacing">1dp</dimen>
+    <dimen name="image_selector_list_size">72dp</dimen>
+    <dimen name="image_selector_select_button_multi_width">150dp</dimen>
+    <dimen name="image_selector_select_button_single_width">100dp</dimen>
+    <dimen name="imgsel_grid_sel_icon_size">18dp</dimen>
+    <dimen name="keyline_margin">16dp</dimen>
+    <dimen name="list_item_height">40dp</dimen>
+    <dimen name="list_item_text_padding_left">50dp</dimen>
+    <dimen name="notification_action_icon_size">32dp</dimen>
+    <dimen name="notification_action_text_size">13sp</dimen>
+    <dimen name="notification_big_circle_margin">12dp</dimen>
+    <dimen name="notification_content_margin_start">0dp</dimen>
+    <dimen name="notification_large_icon_height">64dp</dimen>
+    <dimen name="notification_large_icon_width">64dp</dimen>
+    <dimen name="notification_main_column_padding_top">0dp</dimen>
+    <dimen name="notification_media_narrow_margin">12dp</dimen>
+    <dimen name="notification_right_icon_size">16dp</dimen>
+    <dimen name="notification_right_side_padding_top">4dp</dimen>
+    <dimen name="notification_small_icon_background_padding">3dp</dimen>
+    <dimen name="notification_small_icon_size_as_large">24dp</dimen>
+    <dimen name="notification_subtext_size">13sp</dimen>
+    <dimen name="notification_top_pad">10dp</dimen>
+    <dimen name="notification_top_pad_large_text">5dp</dimen>
+    <dimen name="subtitle_corner_radius">2dp</dimen>
+    <dimen name="subtitle_outline_width">2dp</dimen>
+    <dimen name="subtitle_shadow_offset">2dp</dimen>
+    <dimen name="subtitle_shadow_radius">2dp</dimen>
+    <dimen name="title_height">45dp</dimen>
+    <dimen name="tooltip_corner_radius">2dp</dimen>
+    <dimen name="tooltip_horizontal_padding">16dp</dimen>
+    <dimen name="tooltip_margin">8dp</dimen>
+    <dimen name="tooltip_precise_anchor_extra_offset">8dp</dimen>
+    <dimen name="tooltip_precise_anchor_threshold">96dp</dimen>
+    <dimen name="tooltip_vertical_padding">6.5dp</dimen>
+    <dimen name="tooltip_y_offset_non_touch">0dp</dimen>
+    <dimen name="tooltip_y_offset_touch">16dp</dimen>
+</resources>

app/src/main/res/xml/ga_global_tracker.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="ga_trackingId">UA-77809718-5
-    </string>
-    <bool name="ga_autoActivityTracking">false
-    </bool>
+    <string name="ga_trackingId">UA-77809718-5</string>
+    <bool name="ga_autoActivityTracking">false</bool>
 </resources>