Merge pull request #2882 from nextcloud/backport-2881

Backport of #2881
nextcloud · Aug 20, 2018 · 1dde64f · 1dde64f
2 parents 870a8d1 + c4e7932
commit 1dde64f
Show file tree

Hide file tree

Showing 31 changed files with 3,350 additions and 2,807 deletions.
diff --git a/build.gradle b/build.gradle
@@ -89,6 +89,7 @@ android {
         testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\""
 
         multiDexEnabled true
+        vectorDrawables.useSupportLibrary = true
 
         versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
 

diff --git a/drawable_resources/first_run_files.svg b/drawable_resources/first_run_files.svg
diff --git a/drawable_resources/first_run_groupware.svg b/drawable_resources/first_run_groupware.svg
diff --git a/drawable_resources/first_run_talk.svg b/drawable_resources/first_run_talk.svg
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -252,6 +252,10 @@
         <activity android:name=".ui.activity.UploadListActivity" />
         <activity android:name=".ui.activity.WhatsNewActivity"
                   android:theme="@style/Theme.ownCloud.noActionBar.Login" />
+        <activity
+            android:name=".ui.activity.FirstRunActivity"
+            android:theme="@style/Theme.ownCloud.noActionBar.Login"
+            android:configChanges="orientation|screenSize"/>
 
         <receiver android:name=".files.BootupBroadcastReceiver" >
             <intent-filter>

diff --git a/src/main/java/com/owncloud/android/MainApp.java b/src/main/java/com/owncloud/android/MainApp.java
@@ -636,4 +636,9 @@ private static void cleanOldEntries() {
             }
         }
     }
+
+    static public int getLastSeenVersionCode(Context context) {
+        SharedPreferences pref = android.preference.PreferenceManager.getDefaultSharedPreferences(context);
+        return pref.getInt(WhatsNewActivity.KEY_LAST_SEEN_VERSION_CODE, 0);
+    }
 }