Update some dates and minor changes

owncloud · Feb 20, 2018 · d8824ca · d8824ca
1 parent c523f5d
commit d8824ca
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 32 deletions.
diff --git a/res/drawable/indicator_dot_not_selected.xml b/res/drawable/indicator_dot_not_selected.xml
@@ -2,8 +2,8 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2015 Bartosz Przybylski
-  Copyright (C) 2015 ownCloud Inc.
+  Copyright (C) 2018 Bartosz Przybylski
+  Copyright (C) 2018 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,

diff --git a/res/drawable/indicator_dot_selected.xml b/res/drawable/indicator_dot_selected.xml
@@ -2,8 +2,8 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2015 Bartosz Przybylski
-  Copyright (C) 2015 ownCloud Inc.
+  Copyright (C) 2018 Bartosz Przybylski
+  Copyright (C) 2018 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,

diff --git a/res/drawable/whats_new_progress_transition.xml b/res/drawable/whats_new_progress_transition.xml
@@ -2,8 +2,8 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2015 Bartosz Przybylski
-  Copyright (C) 2015 ownCloud Inc.
+  Copyright (C) 2018 Bartosz Przybylski
+  Copyright (C) 2018 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,

diff --git a/res/values/setup.xml b/res/values/setup.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Beta indicator -->
-    <bool name="is_beta">false</bool>
 
     <!-- App name  and other strings-->
     <string name="app_name" formatted="false">ownCloud</string>

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
@@ -169,10 +169,7 @@ public static Context getAppContext() {
     public static String getAccountType() {
         return getAppContext().getResources().getString(R.string.account_type);
     }
-
-
-    // Non gradle build systems do not provide BuildConfig.VERSION_CODE
-    // so we must fallback to this method :(
+
     public static int getVersionCode() {
         try {
             String thisPackageName = getAppContext().getPackageName();
@@ -182,8 +179,6 @@ public static int getVersionCode() {
         }
     }
 
-    //  From AccountAuthenticator 
-    //  public static final String AUTHORITY = "org.owncloud";
     public static String getAuthority() {
         return getAppContext().getResources().getString(R.string.authority);
     }

diff --git a/src/com/owncloud/android/features/FeatureList.java b/src/com/owncloud/android/features/FeatureList.java
@@ -2,8 +2,8 @@
  *   ownCloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2015 Bartosz Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2018 Bartosz Przybylski
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -41,19 +41,18 @@ public class FeatureList {
     static final private boolean SHOW_ON_FIRST_RUN = true;
     static final private boolean SHOW_ON_UPGRADE = false;
 
-
     static final private FeatureItem featuresList[] = {
             // Basic features showed on first install
             new FeatureItem(R.drawable.whats_new_files, R.string.welcome_feature_1_title,
-                    R.string.welcome_feature_1_text, "1.0.0", "0", SHOW_ON_FIRST_RUN),
+                    R.string.welcome_feature_1_text, "2.6.0", "0", SHOW_ON_FIRST_RUN),
             new FeatureItem(R.drawable.whats_new_share, R.string.welcome_feature_2_title,
-                    R.string.welcome_feature_2_text, "1.0.0", "0", SHOW_ON_FIRST_RUN),
+                    R.string.welcome_feature_2_text, "2.6.0", "0", SHOW_ON_FIRST_RUN),
             new FeatureItem(R.drawable.whats_new_accounts, R.string.welcome_feature_3_title,
-                    R.string.welcome_feature_3_text, "1.0.0", "0" ,SHOW_ON_FIRST_RUN),
+                    R.string.welcome_feature_3_text, "2.6.0", "0" ,SHOW_ON_FIRST_RUN),
             new FeatureItem(R.drawable.whats_new_camera_uploads, R.string.welcome_feature_4_title,
-                    R.string.welcome_feature_4_text, "1.0.0", "0", SHOW_ON_FIRST_RUN),
+                    R.string.welcome_feature_4_text, "2.6.0", "0", SHOW_ON_FIRST_RUN),
             new FeatureItem(R.drawable.whats_new_video_streaming, R.string.welcome_feature_5_title,
-                    R.string.welcome_feature_5_text, "1.0.0", "0", SHOW_ON_FIRST_RUN),
+                    R.string.welcome_feature_5_text, "2.6.0", "0", SHOW_ON_FIRST_RUN),
             // Features introduced in certain point in time
     };
 

diff --git a/src/com/owncloud/android/ui/activity/WhatsNewActivity.java b/src/com/owncloud/android/ui/activity/WhatsNewActivity.java
@@ -1,8 +1,8 @@
 /**
  *   ownCloud Android client application
  *
- *   Copyright (C) 2015 Bartosz Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2018 Bartosz Przybylski
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -40,6 +40,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticatorActivity;
@@ -66,7 +67,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mProgress = (ProgressIndicator) findViewById(R.id.progressIndicator);
         mPager = (ViewPager)findViewById(R.id.contentPanel);
-        final boolean isBeta = getResources().getBoolean(R.bool.is_beta);
+        boolean isBeta = BuildConfig.BUILD_TYPE.equals(MainApp.BUILD_TYPE_BETA);
+
         FeaturesViewAdapter adapter = new FeaturesViewAdapter(getSupportFragmentManager(),
                 FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta));
 
@@ -154,7 +156,7 @@ static public void runIfNeeded(Context context) {
     }
 
     static private boolean shouldShow(Context context) {
-        final boolean isBeta = context.getResources().getBoolean(R.bool.is_beta);
+        boolean isBeta = BuildConfig.BUILD_TYPE.equals(MainApp.BUILD_TYPE_BETA);
         return (isFirstRun() && context instanceof AccountAuthenticatorActivity) ||
                 (
                         !(isFirstRun() && (context instanceof FileDisplayActivity)) &&
@@ -235,5 +237,4 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
             return v;
         }
     }
-
-}
+}
diff --git a/src/com/owncloud/android/ui/whatsnew/ProgressIndicator.java b/src/com/owncloud/android/ui/whatsnew/ProgressIndicator.java
@@ -2,8 +2,8 @@
  *   ownCloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2015 Bartosz Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2018 Bartosz Przybylski
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -96,5 +96,4 @@ private void setup() {
         mDotsContainer.setLayoutParams(params);
         addView(mDotsContainer);
     }
-
-}
+}