Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8554478b authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'lineage-18.1' of gitlab.e.foundation:e/os/android_packages_apps_Updater into v1-r 

 Conflicts:
	res/values-ast-rES/strings.xml
	res/values/strings.xml
	src/org/lineageos/updater/UpdatesActivity.java
	src/org/lineageos/updater/UpdatesCheckReceiver.java
	src/org/lineageos/updater/UpdatesListAdapter.java
	src/org/lineageos/updater/controller/UpdaterService.java
	src/org/lineageos/updater/download/HttpURLConnectionClient.java
	src/org/lineageos/updater/misc/Utils.java
parents 5d42b97c f7f4e1a0

AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
    <uses-permission android:name="android.permission.REBOOT" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.RECOVERY" />

    <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />



    <application

        android:allowBackup="false"
@@ -25,6 +25,7 @@ 
            android:name=".UpdatesActivity"

            android:excludeFromRecents="true"

            android:label="@string/display_name"

            android:exported="true"

            android:theme="@style/AppTheme.NoActionBar"

            android:launchMode="singleTop">

            <intent-filter android:priority="1">
@@ -50,7 +51,7 @@ 
            </intent-filter>

        </receiver>



        <receiver android:name=".UpdatesCheckReceiver">

        <receiver android:name=".UpdatesCheckReceiver" android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED"/>

            </intent-filter>

build.gradle

+11 −13
Original line number Diff line number Diff line 
repositories {

    google()

    jcenter()

    mavenCentral()

}



buildscript {

    repositories {

        google()

        jcenter()

        mavenCentral()

    }



    dependencies {

        classpath 'com.android.tools.build:gradle:3.5.0'

        classpath 'com.android.tools.build:gradle:7.1.1'

    }

}
@@ -21,18 +21,13 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) 
apply plugin: 'com.android.application'



android {

    compileSdkVersion 29

    compileSdkVersion 30



    defaultConfig {

        minSdkVersion 27

        targetSdkVersion 29

        targetSdkVersion 30

    }



    lintOptions {

        ignore 'ProtectedPermissions'

        // These depend on translations

        ignore 'ExtraTranslation', 'ImpliedQuantity', 'MissingQuantity', 'MissingTranslation'

    }



    sourceSets {

        main {
@@ -55,14 +50,17 @@ android { 
            storePassword keystoreProperties['storePassword']

        }

    }

    lint {

        ignore 'ProtectedPermissions', 'ExtraTranslation', 'ImpliedQuantity', 'MissingQuantity', 'MissingTranslation'

    }

}



dependencies {

    compileOnly fileTree(dir: 'system_libs/', include: ['*.jar'])



    implementation 'com.google.android.material:material:1.0.0'

    implementation 'androidx.appcompat:appcompat:1.1.0'

    implementation 'com.google.android.material:material:1.4.0'

    implementation 'androidx.appcompat:appcompat:1.3.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.preference:preference:1.1.0'

    implementation 'androidx.recyclerview:recyclerview:1.0.0'

    implementation 'androidx.recyclerview:recyclerview:1.2.1'

}

privapp_whitelist_org.lineageos.updater.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>

        <permission name="android.permission.REBOOT"/>

        <permission name="android.permission.RECOVERY"/>

        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>

    </privapp-permissions>

</permissions>

res/layout-large-notouch/activity_updates.xml

+16 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:orientation="horizontal"

    android:id="@+id/main_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:padding="16dp"

    android:weightSum="2">

    android:weightSum="2"

    android:baselineAligned="false">



    <RelativeLayout

        android:layout_width="0dp"
@@ -29,57 +30,57 @@ 
                android:fontFamily="sans-serif-light"

                android:paddingBottom="16dp"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="56sp" />

                android:textSize="56sp"

                tools:text="LineageOS\n18.1" />



            <TextView

                android:id="@+id/header_build_version"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/header_title"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="14sp" />

                android:textSize="14sp"

                tools:text="Android 11"/>



            <TextView

                android:id="@+id/header_build_date"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/header_build_version"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="14sp" />

                android:textSize="14sp"

                tools:text="2022-01-01"/>



            <TextView

                android:id="@+id/header_last_check"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/header_build_date"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="14sp" />

                android:textSize="14sp"

                tools:text="Last checked: 2022-01-01"/>



        </LinearLayout>

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/header_last_check"

            android:layout_alignParentBottom="true"

            android:weightSum="2"

            android:orientation="horizontal">



            <Button

                android:id="@+id/refresh"

                android:drawableLeft="@drawable/ic_menu_refresh"

                android:drawableStart="@drawable/ic_menu_refresh"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:text="refresh"

                android:text="@string/menu_refresh"

                style="@style/Widget.AppCompat.Button.Borderless.Colored"/>



            <Button

                android:id="@+id/preferences"

                android:drawableLeft="@drawable/ic_menu_preferences"

                android:drawableStart="@drawable/ic_menu_preferences"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:text="preferences"

                android:text="@string/menu_preferences"

                style="@style/Widget.AppCompat.Button.Borderless.Colored"/>



        </LinearLayout>

res/layout-large-notouch/update_item_view.xml

+4 −2
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:weightSum="1">

        android:weightSum="1"

        android:baselineAligned="false">



        <LinearLayout

            android:layout_width="0dp"
@@ -90,7 +91,8 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="end"

                android:padding="8dp" />

                android:padding="8dp"

                android:contentDescription="@null" />

            <Button

                android:id="@id/update_action"

                style="@style/Widget.AppCompat.Button.Borderless.Colored"