Move logic to method so rest of code works with changes from develop

Author: Amanda Riu

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -2300,11 +2300,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {
         boolean isFreeWPCom = mSite.isWPCom() && SiteUtils.onFreePlan(mSite);
         boolean isWPComSite = mSite.isWPCom() || mSite.isWPComAtomic();
 
-        int hashedUserId = convertUserIdToHash(getUserId(), "can_view_editor_onboarding");
-        boolean canViewEditorOnboarding = !AppPrefs.hasLaunchedGutenbergEditor() && (
-                hashedUserId % 100 >= (100 - EDITOR_ONBOARDING_PHASE_PERCENTAGE)
-                || BuildConfig.DEBUG
-        );
+        boolean enableEditorOnboarding = !AppPrefs.hasLaunchedGutenbergEditor() && canViewEditorOnboarding();
 
         return new GutenbergPropsBuilder(
                 mContactInfoBlockFeatureConfig.isEnabled() && SiteUtils.supportsContactInfoFeature(mSite),
@@ -2328,21 +2324,19 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {
      * Temporary method for the Editor Onboarding project to control the percentage
      * of users able to use this new editor onboarding tooltip feature. This will eventually
      * be removed when the functionality is opened to all users.
-     *
-     * If the currently logged in user is a WPcom user, then return the userId associated with
-     * that account. If logged in via self-hosted admin creds then this value will be '0'. In this
-     * case we use the anonymous ID generated by Tracks saved in SharedPrefs.
-     *
-     * @return A unique ID for the logged in user
      */
-    private String getUserId() {
+    private boolean canViewEditorOnboarding() {
+        // Get the userId for the logged in user. If not WPcom, use the anonymous userId
+        // generated by tracks.
         long userAccountId = mAccountStore.getAccount().getUserId();
         String userId = String.valueOf(userAccountId);
         if (userAccountId == 0) {
             SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
             userId = preferences.getString("nosara_tracks_anon_id", null);
         }
-        return userId;
+
+        int hashedUserId = convertUserIdToHash(userId, "can_view_editor_onboarding");
+        return hashedUserId % 100 >= (100 - EDITOR_ONBOARDING_PHASE_PERCENTAGE) || BuildConfig.DEBUG;
     }
 
     /**