diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
index 4ea2d1f5..cd43fb88 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
+++ b/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})
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 24369f1d..d6a35aed 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/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.isAppFirstStart()) {
- mdParser.parse(
- getResources().openRawResource(R.raw.license), "");
- String html = mdParser.getHtml()
- + "
"
- + "
" + getString(R.string.fragment_license__thirdparty_libs) + "
"
- + mdParser.parse(getResources().openRawResource(R.raw.license_third_party), "");
- 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());
+ if (_appSettings.isAppCurrentVersionFirstStart(true)) {
+ SimpleMarkdownParser smp = SimpleMarkdownParser.get().setDefaultSmpFilter(SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW);
+ String html = "";
+ html += smp.parse(getString(R.string.copyright_license_text_official).replace("\n", " \n"), "").getHtml();
+ html += "
" + getString(R.string.changelog) + "
" + smp.parse(getResources().openRawResource(R.raw.changelog), "", SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW, SimpleMarkdownParser.FILTER_CHANGELOG).getHtml();
+ html += "
" + getString(R.string.licenses) + "
" + smp.parse(getResources().openRawResource(R.raw.licenses_3rd_party), "").getHtml();
+ ActivityUtils _au = new ActivityUtils(this);
+ _au.showDialogWithHtmlTextView(R.string.licenses, html);
}
} catch (IOException e) {
e.printStackTrace();
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java b/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
index f99172f5..81dbc5c8 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
+++ b/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);
}
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
index 0c8999a0..5240e6e8 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
+++ b/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;
}
diff --git a/app/src/main/res/layout/about__fragment_license.xml b/app/src/main/res/layout/about__fragment_license.xml
index ca42b98e..eb6a1b30 100644
--- a/app/src/main/res/layout/about__fragment_license.xml
+++ b/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"/>
+ android:text="@string/copyright_license_text_official"/>