Merge pull request #1321 from alexbakker/about-libraries

Switch to AboutLibraries for the third-party license list

Author: michaelschattgen

app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 
 def getCmdOutput = { cmd ->
     def stdout = new ByteArrayOutputStream()
@@ -120,6 +121,17 @@ protobuf {
     }
 }
 
+aboutLibraries {
+    // Tasks for aboutLibraries are not run automatically to keep the build reproducible
+    // To update manually: ./gradlew app:exportLibraryDefinitions -PaboutLibraries.exportPath=src/main/res/raw
+    prettyPrint = true
+    configPath = "app/config"
+    fetchRemoteFunding = false
+    registerAndroidTasks = false
+    exclusionPatterns = [~"javax.annotation.*"]
+    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+}
+
 dependencies {
     def cameraxVersion = '1.3.1'
     def glideVersion = '4.16.0'
@@ -161,9 +173,12 @@ dependencies {
     implementation 'com.google.android.material:material:1.11.0'
     implementation 'com.google.protobuf:protobuf-javalite:3.25.1'
     implementation 'com.google.zxing:core:3.5.2'
+    implementation("com.mikepenz:aboutlibraries:11.1.0") {
+        exclude group: 'com.mikepenz', module: 'aboutlibraries-core'
+    }
+    implementation "com.mikepenz:aboutlibraries-core-android:11.1.0"
     implementation 'com.nulab-inc:zxcvbn:1.8.2'
     implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0'
     implementation 'net.lingala.zip4j:zip4j:2.11.5'
     implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
     implementation 'org.bouncycastle:bcprov-jdk18on:1.77'

app/config/libraries/krop.json

@@ -0,0 +1,6 @@
+{
+    "uniqueId": "com.github.avito-tech:krop",
+    "licenses": [
+        "MIT"
+    ]
+}

app/config/libraries/libsu.json

@@ -0,0 +1,6 @@
+{
+    "uniqueId": "com.github.topjohnwu.libsu:.*::regex",
+    "licenses": [
+        "Apache-2.0"
+    ]
+}

app/config/libraries/textdrawable.json

@@ -0,0 +1,6 @@
+{
+    "uniqueId": "com.amulyakhare:com.amulyakhare.textdrawable",
+    "licenses": [
+        "MIT"
+    ]
+}

app/src/main/AndroidManifest.xml

@@ -82,6 +82,8 @@
             android:label="@string/title_activity_manage_groups" />
         <activity android:name=".ui.AssignIconsActivity"
             android:label="@string/title_activity_assign_icons"/>
+        <activity android:name=".ui.LicensesActivity"
+            android:label="@string/title_activity_licenses"/>
         <activity
             android:name=".ui.PanicResponderActivity"
             android:exported="true"

app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java

@@ -0,0 +1,55 @@
+package com.beemdevelopment.aegis.helpers;
+
+import android.content.res.Configuration;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.beemdevelopment.aegis.Preferences;
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.Theme;
+import com.google.android.material.color.DynamicColors;
+import com.google.android.material.color.DynamicColorsOptions;
+
+import java.util.Map;
+
+public class ThemeHelper {
+    private final AppCompatActivity _activity;
+    private final Preferences _prefs;
+
+    public ThemeHelper(AppCompatActivity activity, Preferences prefs) {
+        _activity = activity;
+        _prefs = prefs;
+    }
+
+    /**
+     * Sets the theme of the activity. The actual style that is set is picked from the
+     * given map, based on the theme configured by the user.
+     */
+    public void setTheme(Map<Theme, Integer> themeMap) {
+        int theme = themeMap.get(getConfiguredTheme());
+        _activity.setTheme(theme);
+
+        if (_prefs.isDynamicColorsEnabled()) {
+            DynamicColorsOptions.Builder optsBuilder = new DynamicColorsOptions.Builder();
+            if (getConfiguredTheme().equals(Theme.AMOLED)) {
+                optsBuilder.setThemeOverlay(R.style.ThemeOverlay_Aegis_Dynamic_Amoled);
+            }
+            DynamicColors.applyToActivityIfAvailable(_activity, optsBuilder.build());
+        }
+    }
+
+    public Theme getConfiguredTheme() {
+        Theme theme = _prefs.getCurrentTheme();
+
+        if (theme == Theme.SYSTEM || theme == Theme.SYSTEM_AMOLED) {
+            int currentNightMode = _activity.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            if (currentNightMode == Configuration.UI_MODE_NIGHT_YES) {
+                theme = theme == Theme.SYSTEM_AMOLED ? Theme.AMOLED : Theme.DARK;
+            } else {
+                theme = Theme.LIGHT;
+            }
+        }
+
+        return theme;
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/licenses/GlideLicense.java

@@ -16,15 +16,10 @@
 
 import com.beemdevelopment.aegis.BuildConfig;
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.licenses.GlideLicense;
-import com.beemdevelopment.aegis.licenses.ProtobufLicense;
 import com.beemdevelopment.aegis.ui.dialogs.ChangelogDialog;
 import com.beemdevelopment.aegis.ui.dialogs.LicenseDialog;
 import com.google.android.material.color.MaterialColors;
 
-import de.psdev.licensesdialog.LicenseResolver;
-import de.psdev.licensesdialog.LicensesDialog;
-
 public class AboutActivity extends AegisActivity {
 
     private static String GITHUB = "https://github.com/beemdevelopment/Aegis";
@@ -53,12 +48,15 @@ protected void onCreate(Bundle savedInstanceState) {
         View btnLicense = findViewById(R.id.btn_license);
         btnLicense.setOnClickListener(v -> {
             LicenseDialog.create()
-                    .setTheme(getConfiguredTheme())
+                    .setTheme(_themeHelper.getConfiguredTheme())
                     .show(getSupportFragmentManager(), null);
         });
 
         View btnThirdPartyLicenses = findViewById(R.id.btn_third_party_licenses);
-        btnThirdPartyLicenses.setOnClickListener(v -> showThirdPartyLicenseDialog());
+        btnThirdPartyLicenses.setOnClickListener(v -> {
+            Intent intent = new Intent(this, LicensesActivity.class);
+            startActivity(intent);
+        });
 
         TextView appVersion = findViewById(R.id.app_version);
         appVersion.setText(getCurrentAppVersion());
@@ -89,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
         View btnChangelog = findViewById(R.id.btn_changelog);
         btnChangelog.setOnClickListener(v -> {
             ChangelogDialog.create()
-                    .setTheme(getConfiguredTheme())
+                    .setTheme(_themeHelper.getConfiguredTheme())
                     .show(getSupportFragmentManager(), null);
         });
     }
@@ -126,27 +124,6 @@ private void openMail(String mailaddress) {
         startActivity(Intent.createChooser(mailIntent, getString(R.string.email)));
     }
 
-    private void showThirdPartyLicenseDialog() {
-        String stylesheet = getString(R.string.custom_notices_format_style);
-        String backgroundColor = getThemeColorAsHex(com.google.android.material.R.attr.colorSurfaceContainerLow);
-        String textColor = getThemeColorAsHex(com.google.android.material.R.attr.colorOnSurface);
-        String licenseColor = getThemeColorAsHex(com.google.android.material.R.attr.colorSurfaceContainerLow);
-        String linkColor = getThemeColorAsHex(com.google.android.material.R.attr.colorAccent);
-
-        stylesheet = String.format(stylesheet, backgroundColor, textColor, licenseColor, linkColor);
-
-        LicenseResolver.registerLicense(new GlideLicense());
-        LicenseResolver.registerLicense(new ProtobufLicense());
-
-        new LicensesDialog.Builder(this)
-                .setNotices(R.raw.notices)
-                .setTitle(R.string.third_party_licenses)
-                .setNoticesCssStyle(stylesheet)
-                .setIncludeOwnLicense(true)
-                .build()
-                .show();
-    }
-
     private String getThemeColorAsHex(@AttrRes int attributeId) {
         int color = MaterialColors.getColor(this, attributeId, getClass().getCanonicalName());
         return String.format("%06X", 0xFFFFFF & color);

app/src/main/java/com/beemdevelopment/aegis/licenses/ProtobufLicense.java

@@ -20,20 +20,17 @@
 
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.Theme;
 import com.beemdevelopment.aegis.ThemeMap;
+import com.beemdevelopment.aegis.helpers.ThemeHelper;
 import com.beemdevelopment.aegis.icons.IconPackManager;
 import com.beemdevelopment.aegis.vault.VaultManager;
 import com.beemdevelopment.aegis.vault.VaultRepositoryException;
-import com.google.android.material.color.DynamicColors;
-import com.google.android.material.color.DynamicColorsOptions;
 import com.google.android.material.color.MaterialColors;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Locale;
-import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -46,6 +43,7 @@
 @AndroidEntryPoint
 public abstract class AegisActivity extends AppCompatActivity implements VaultManager.LockListener {
     protected Preferences _prefs;
+    protected ThemeHelper _themeHelper;
 
     @Inject
     protected VaultManager _vaultManager;
@@ -59,6 +57,7 @@ public abstract class AegisActivity extends AppCompatActivity implements VaultMa
     protected void onCreate(Bundle savedInstanceState) {
         // set the theme and locale before creating the activity
         _prefs = EarlyEntryPoints.get(getApplicationContext(), PrefEntryPoint.class).getPreferences();
+        _themeHelper = new ThemeHelper(this, _prefs);
         onSetTheme();
         setLocale(_prefs.getLocale());
         super.onCreate(savedInstanceState);
@@ -111,39 +110,7 @@ public void onLocked(boolean userInitiated) {
      * Called when the activity is expected to set its theme.
      */
     protected void onSetTheme() {
-        setTheme(ThemeMap.DEFAULT);
-    }
-
-    /**
-     * Sets the theme of the activity. The actual style that is set is picked from the
-     * given map, based on the theme configured by the user.
-     */
-    protected void setTheme(Map<Theme, Integer> themeMap) {
-        int theme = themeMap.get(getConfiguredTheme());
-        setTheme(theme);
-
-        if (_prefs.isDynamicColorsEnabled()) {
-            DynamicColorsOptions.Builder optsBuilder = new DynamicColorsOptions.Builder();
-            if (getConfiguredTheme().equals(Theme.AMOLED)) {
-                optsBuilder.setThemeOverlay(R.style.ThemeOverlay_Aegis_Dynamic_Amoled);
-            }
-            DynamicColors.applyToActivityIfAvailable(this, optsBuilder.build());
-        }
-    }
-
-    protected Theme getConfiguredTheme() {
-        Theme theme = _prefs.getCurrentTheme();
-
-        if (theme == Theme.SYSTEM || theme == Theme.SYSTEM_AMOLED) {
-            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-            if (currentNightMode == Configuration.UI_MODE_NIGHT_YES) {
-                theme = theme == Theme.SYSTEM_AMOLED ? Theme.AMOLED : Theme.DARK;
-            } else {
-                theme = Theme.LIGHT;
-            }
-        }
-
-        return theme;
+        _themeHelper.setTheme(ThemeMap.DEFAULT);
     }
 
     protected void setLocale(Locale locale) {