Эх сурвалжийг харах

Merge pull request #2205 from nextcloud/fixActionBarAndroid4

Fix crash on 4.x devices
Andy Scherzinger 7 жил өмнө
parent
commit
0b94dea7b9

+ 0 - 4
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1645,11 +1645,7 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                     ActionBar actionBar = ((FileDisplayActivity) getActivity()).getSupportActionBar();
 
                     if (actionBar != null) {
-                        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT) {
-                            actionBar.setTitle(title);
-                        } else {
                             ThemeUtils.setColoredTitle(actionBar, title);
-                        }
                     }
                 }
             }

+ 13 - 5
src/main/java/com/owncloud/android/utils/ThemeUtils.java

@@ -172,8 +172,12 @@ public class ThemeUtils {
      */
     public static void setColoredTitle(ActionBar actionBar, String title) {
         if (actionBar != null) {
-            String colorHex = colorToHexString(fontColor());
-            actionBar.setTitle(Html.fromHtml("<font color='" + colorHex + "'>" + title + "</font>"));
+            if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT) {
+                actionBar.setTitle(title);
+            } else {
+                String colorHex = colorToHexString(fontColor());
+                actionBar.setTitle(Html.fromHtml("<font color='" + colorHex + "'>" + title + "</font>"));
+            }
         }
     }
 
@@ -189,9 +193,13 @@ public class ThemeUtils {
      * @param titleId   title to be shown
      */
     public static void setColoredTitle(ActionBar actionBar, int titleId, Context context) {
-        String colorHex = colorToHexString(fontColor());
-        String title = context.getString(titleId);
-        actionBar.setTitle(Html.fromHtml("<font color='" + colorHex + "'>" + title + "</font>"));
+        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT) {
+            actionBar.setTitle(titleId);
+        } else {
+            String colorHex = colorToHexString(fontColor());
+            String title = context.getString(titleId);
+            actionBar.setTitle(Html.fromHtml("<font color='" + colorHex + "'>" + title + "</font>"));
+        }
     }
 
     public static String getDefaultDisplayNameForRootFolder() {