Refactoring

app/src/main/java/eu/faircode/email/ActivityView.java

@@ -111,7 +111,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     private ImageButton ibHide;
     private ImageButton ibSettings;
     private ImageButton ibFetchMore;
-    private ImageButton ibSync;
+    private ImageButton ibForceSync;
     private View vSeparatorOptions;
     private ImageButton ibExpanderAccount;
     private RecyclerView rvAccount;
@@ -220,6 +220,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         content_separator = findViewById(R.id.content_separator);
         content_pane = findViewById(R.id.content_pane);
 
+        // Special: Surface Duo
         boolean duo = Helper.isSurfaceDuo();
         if (duo && content_pane != null) {
             View content_frame = findViewById(R.id.content_frame);
@@ -283,7 +284,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         ibHide = drawerContainer.findViewById(R.id.ibHide);
         ibSettings = drawerContainer.findViewById(R.id.ibSettings);
         ibFetchMore = drawerContainer.findViewById(R.id.ibFetchMore);
-        ibSync = drawerContainer.findViewById(R.id.ibSync);
+        ibForceSync = drawerContainer.findViewById(R.id.ibForceSync);
         vSeparatorOptions = drawerContainer.findViewById(R.id.vSeparatorOptions);
         grpOptions = drawerContainer.findViewById(R.id.grpOptions);
         ibExpanderAccount = drawerContainer.findViewById(R.id.ibExpanderAccount);
@@ -374,6 +375,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             }
         });
 
+        // Fetch more messages
         ibFetchMore.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -386,7 +388,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             }
         });
 
-        ibSync.setOnClickListener(new View.OnClickListener() {
+        // Force sync
+        ibForceSync.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 ServiceSynchronize.reload(ActivityView.this, null, true, "nav:sync");

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

@@ -66,13 +66,13 @@
         android:contentDescription="@string/title_synchronize_more"
         android:padding="6dp"
         android:tooltipText="@string/title_synchronize_more"
-        app:layout_constraintEnd_toStartOf="@+id/ibSync"
+        app:layout_constraintEnd_toStartOf="@+id/ibForceSync"
         app:layout_constraintStart_toEndOf="@id/ibSettings"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/twotone_get_app_24" />
 
     <ImageButton
-        android:id="@+id/ibSync"
+        android:id="@+id/ibForceSync"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackgroundBorderless"
@@ -87,7 +87,7 @@
         android:id="@+id/grpOptions"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:constraint_referenced_ids="ibPin,ibHide,ibSettings,ibFetchMore,ibSync" />
+        app:constraint_referenced_ids="ibPin,ibHide,ibSettings,ibFetchMore,ibForceSync" />
 
     <View
         android:id="@+id/vSeparatorOptions"