Merge license and changelog dialog on first start

app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java

@@ -263,7 +263,7 @@ public class AboutActivity extends ThemedActivity
             contributors.setTextFormatted(getString(R.string.fragment_license__contributors_thank_you,
                     ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.contributors, "")));
             thirdPartyLibs.setTextFormatted(
-                    ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.license_third_party, ""));
+                    ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.licenses_3rd_party, ""));
         }
 
         @OnClick({R.id.fragment_license__leafpic_button, R.id.fragment_license__license_button})

app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java

@@ -229,23 +229,16 @@ public class MainActivity extends ThemedActivity
             }
         }
 
-        // Show first start dialog
+        // Show first start / update dialog
         try {
-            SimpleMarkdownParser mdParser = SimpleMarkdownParser.get().setDefaultSmpFilter(SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW);
+            if (_appSettings.isAppCurrentVersionFirstStart(true)) {
-            if (_appSettings.isAppFirstStart()) {
+                SimpleMarkdownParser smp = SimpleMarkdownParser.get().setDefaultSmpFilter(SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW);
-                mdParser.parse(
+                String html = "";
-                        getResources().openRawResource(R.raw.license), "");
+                html += smp.parse(getString(R.string.copyright_license_text_official).replace("\n", "  \n"), "").getHtml();
-                String html = mdParser.getHtml()
+                html += "<br/><br/><br/><big><big>" + getString(R.string.changelog) + "</big></big><br/>" + smp.parse(getResources().openRawResource(R.raw.changelog), "", SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW, SimpleMarkdownParser.FILTER_CHANGELOG).getHtml();
-                        + "<br/><br/><br/>"
+                html += "<br/><br/><br/><big><big>" + getString(R.string.licenses) + "</big></big><br/>" + smp.parse(getResources().openRawResource(R.raw.licenses_3rd_party), "").getHtml();
-                        + "<h1>" + getString(R.string.fragment_license__thirdparty_libs) + "</h1>"
+                ActivityUtils _au = new ActivityUtils(this);
-                        + mdParser.parse(getResources().openRawResource(R.raw.license_third_party), "");
+                _au.showDialogWithHtmlTextView(R.string.licenses, html);
-                html = mdParser.setHtml(html).removeMultiNewlines().getHtml();
-                ActivityUtils.get(this).showDialogWithHtmlTextView(R.string.about_activity__title_about_license, html);
-                _appSettings.isAppCurrentVersionFirstStart();
-            } else if (_appSettings.isAppCurrentVersionFirstStart()) {
-                SimpleMarkdownParser smp = new SimpleMarkdownParser().parse(
-                        getResources().openRawResource(R.raw.changelog), "");
-                ActivityUtils.get(this).showDialogWithHtmlTextView(R.string.changelog, smp.getHtml());
             }
         } catch (IOException e) {
             e.printStackTrace();

app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java

@@ -21,7 +21,7 @@ import java.util.Locale;
 
 @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"})
 public class ActivityUtils extends net.gsantner.opoc.util.ActivityUtils {
-    protected ActivityUtils(Activity activity) {
+    public ActivityUtils(Activity activity) {
         super(activity);
     }
 

app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java

@@ -367,9 +367,11 @@ public class AppSettings extends SharedPreferencesPropertyBackend {
         return value;
     }
 
-    public boolean isAppCurrentVersionFirstStart() {
+    public boolean isAppCurrentVersionFirstStart(boolean doSet) {
         int value = getInt(R.string.pref_key__app_first_start_current_version, -1);
-        setInt(R.string.pref_key__app_first_start_current_version, BuildConfig.VERSION_CODE);
+        if (doSet) {
+            setInt(R.string.pref_key__app_first_start_current_version, BuildConfig.VERSION_CODE);
+        }
         return value != BuildConfig.VERSION_CODE && !BuildConfig.IS_TEST_BUILD;
     }
 

app/src/main/res/layout/about__fragment_license.xml

@@ -108,14 +108,14 @@
                     style="@android:style/TextAppearance.DeviceDefault.Large"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_license__license"
+                    android:text="@string/licenses"
                     android:layout_marginBottom="8dp"/>
 
                 <TextView
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fragment_license__license_text"/>
+                    android:text="@string/copyright_license_text_official"/>
 
                 <Button
                     android:id="@+id/fragment_license__license_button"

app/src/main/res/values/strings-about.xml

@@ -46,9 +46,9 @@
     <string name="fragment_license__maintainers_text">This app is currently being developed and maintained by &lt;br>&lt;br>%1$s</string>
     <string name="fragment_license__contributors">Contributors</string>
     <string name="fragment_license__contributors_thank_you">%1$s&lt;br>&lt;br>Thank you!</string>
-    <string name="fragment_license__license" translatable="false">@string/about_activity__title_about_license</string>
+    <string name="licenses" translatable="false">@string/about_activity__title_about_license</string>
-    <string name="fragment_license__license_text" translatable="false">
+    <string name="copyright_license_text_official" translatable="false">
-        Copyright © 2015-2017
+        Copyright © 2015-2018
         \nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
         \n
         \nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.