Include wizard steps for 2.11

Author: davigonz

owncloudApp/src/main/java/com/owncloud/android/MainApp.java

@@ -68,9 +68,10 @@ public class MainApp extends Application {
     private static final int CLICKS_DEFAULT = 0;
 
     private static Context mContext;
-
     private static boolean mDeveloper;
 
+    public static String BETA_VERSION = "beta";
+
     public void onCreate() {
         super.onCreate();
         MainApp.mContext = getApplicationContext();
@@ -234,6 +235,21 @@ public static String getUserAgent() {
         return String.format(appString, version);
     }
 
+    public static boolean isBeta() {
+        boolean isBeta = false;
+        try {
+            String packageName = getAppContext().getPackageName();
+            PackageInfo packageInfo = getAppContext().getPackageManager().getPackageInfo(packageName, 0);
+            String versionName = packageInfo.versionName;
+            if (versionName.contains(BETA_VERSION)) {
+                isBeta = true;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return isBeta;
+    }
+
     public static boolean isDeveloper() {
         return mDeveloper;
     }
@@ -242,9 +258,7 @@ public void startLogIfDeveloper() {
         mDeveloper = BuildConfig.DEBUG || PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
                 .getInt(CLICK_DEV_MENU, CLICKS_DEFAULT) > CLICKS_NEEDED_TO_BE_DEVELOPER;
 
-
         if (isDeveloper()) {
-
             String dataFolder = getDataFolder();
 
             // Set folder for store logs
@@ -255,5 +269,4 @@ public void startLogIfDeveloper() {
                     BuildConfig.COMMIT_SHA1);
         }
     }
-
 }

owncloudApp/src/main/java/com/owncloud/android/features/FeatureList.java

@@ -55,13 +55,11 @@ public class FeatureList {
             new FeatureItem(R.drawable.whats_new_video_streaming, R.string.welcome_feature_5_title,
                     R.string.welcome_feature_5_text, "2.7.0", "0", SHOW_ON_FIRST_RUN),
 
-            // Features introduced in 2.9.0
-            new FeatureItem(R.drawable.whats_new_current_folder_search, R.string.welcome_feature_6_title,
-                    R.string.welcome_feature_6_text, "2.9.3", "0", SHOW_ON_UPGRADE),
-            new FeatureItem(R.drawable.whats_new_select_all, R.string.welcome_feature_7_title,
-                    R.string.welcome_feature_7_text, "2.9.3", "0", SHOW_ON_UPGRADE),
-            new FeatureItem(R.drawable.whats_new_av_offline_jobs, R.string.welcome_feature_8_title,
-                    R.string.welcome_feature_8_text, "2.9.3", "0", SHOW_ON_UPGRADE)
+            // Features introduced in 2.11.0
+            new FeatureItem(R.drawable.whats_new_document_provider, R.string.welcome_feature_9_title,
+                    R.string.welcome_feature_9_text, "2.11.0", "0", SHOW_ON_UPGRADE),
+            new FeatureItem(R.drawable.whats_new_logs_search, R.string.welcome_feature_10_title,
+                    R.string.welcome_feature_10_text, "2.11.0", "0", SHOW_ON_UPGRADE)
     };
 
     static public FeatureItem[] get() {
@@ -74,7 +72,6 @@ static public FeatureItem[] getFiltered(final int lastSeenVersionCode, final boo
         Log_OC.d(TAG, "Getting filtered features");
 
         for (FeatureItem item : get()) {
-
             final int itemVersionCode = isBeta ? item.getBetaVersionNumber() : item.getVersionNumber();
             if (isFirstRun && item.shouldShowOnFirstRun()) {
                 features.add(item);

owncloudApp/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java

@@ -69,7 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mPager = findViewById(R.id.contentPanel);
 
         FeaturesViewAdapter adapter = new FeaturesViewAdapter(getSupportFragmentManager(),
-                FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), MainApp.isDeveloper()));
+                FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), MainApp.isBeta()));
 
         mProgress.setNumberOfSteps(adapter.getCount());
         mPager.setAdapter(adapter);
@@ -146,11 +146,12 @@ static private boolean shouldShow(Context context) {
         boolean showWizard = context.getResources().getBoolean(R.bool.wizard_enabled);
         return showWizard &&
                 ((isFirstRun() && context instanceof AccountAuthenticatorActivity) ||
-                (
-                        !(isFirstRun() && (context instanceof FileDisplayActivity)) &&
-                        !(context instanceof PassCodeActivity) &&
-                        (FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), MainApp.isDeveloper()).length > 0)
-                ));
+                        (
+                                !(isFirstRun() && (context instanceof FileDisplayActivity)) &&
+                                        !(context instanceof PassCodeActivity) &&
+                                        (FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(),
+                                                MainApp.isBeta()).length > 0)
+                        ));
     }
 
     @Override

owncloudApp/src/main/res/drawable-hdpi/whats_new_document_provider.png

@@ -597,5 +597,9 @@
     <string name="welcome_feature_7_text">Select all files at once</string>
     <string name="welcome_feature_8_title">Available offline</string>
     <string name="welcome_feature_8_text">Your files automatically synchronized</string>
+    <string name="welcome_feature_9_title">Document provider</string>
+    <string name="welcome_feature_9_text">Access and edit your ownCloud files from other apps</string>
+    <string name="welcome_feature_10_title">Logs with search for everyone</string>
+    <string name="welcome_feature_10_text">Send us your logs to make the app work better</string>
     <string name="no_borwser_installed_alert">No browser installed. Please install a Browser in order to allow a secure login.</string>
 </resources>