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

Commit 2450f9c7 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch 'epic13-s-bringup' into 'v1-s' 

Updater: Add gitlab CI

See merge request !73
parents 580c7ec2 efc97fe7

.gitlab-ci.yml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
stages:

  - update-from-upstream



include:

  - project: 'e/templates'

    ref: master

    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'

res/menu/menu_toolbar.xml

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ 
        app:showAsAction="never" />

    <item

        android:id="@+id/menu_show_changelog"

        android:title="@string/menu_show_changelog"

        android:title="@string/menu_show_changelog_e"

        app:showAsAction="never" />

</menu>

res/values/strings.xml

+15 −2
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ 
          {type} - Build type

          {incr} - Incremental version

    -->

    <string name="updater_server_url" translatable="false">https://download.lineageos.org/api/v1/{device}/{type}/{incr}</string>

    <string name="updater_server_url" translatable="false">https://ota.ecloud.global/api/v1/{device}/{type}/{incr}</string>

    <string name="ota_staging_server_url" translatable="false"> https://test.ota.ecloud.global/api/v1/{device}/{type}/{incr}</string>



    <string name="verification_failed_notification">Verification failed</string>

    <string name="verifying_download_notification">Verifying update</string>
@@ -75,7 +76,7 @@ 
    <string name="menu_copy_url">Copy URL</string>

    <string name="menu_export_update">Export update</string>

    <string name="menu_show_changelog">Show changelog</string>

    <string name="menu_changelog_url" translatable="false">https://download.lineageos.org/<xliff:g id="device_name">%1$s</xliff:g>/changes</string>

    <string name="menu_changelog_url" translatable="false">https://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%1$s</xliff:g>-s</string>

    <string name="menu_ab_perf_mode">Prioritize update process</string>

    <string name="menu_update_recovery">Update recovery</string>

    <string name="toast_forced_update_recovery">It is impossible to disable Lineage Recovery updates on this device.</string>
@@ -157,4 +158,16 @@ 
    <string name="info_dialog_title">Did you know?</string>

    <string name="info_dialog_message">LineageOS updates are full installation packages. That means you can always install only the latest update, even if you skipped some in between!</string>

    <string name="info_dialog_ok">Thanks for the info!</string>



    <!-- /e/ addition begin -->



    <!-- /e/ build version -->

    <string name="list_build_version_e">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>

    <string name="list_build_version_date_e">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>



    <!-- /e/ changelog -->

    <string name="menu_show_changelog_e">Show release notes</string>



    <!-- /e/ info dialog-->

    <string name="info_dialog_message_e">/e/OS updates are full installation packages. That means you can always install only the latest update, even if you skipped some in between!</string>

</resources>

src/org/lineageos/updater/UpdaterReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class UpdaterReceiver extends BroadcastReceiver { 
        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);

        String buildDate = StringGenerator.getDateLocalizedUTC(context,

                DateFormat.MEDIUM, preferences.getLong(Constants.PREF_INSTALL_NEW_TIMESTAMP, 0));

        String buildInfo = context.getString(R.string.list_build_version_date,

        String buildInfo = context.getString(R.string.list_build_version_date_e,

                BuildInfoUtils.getBuildVersion(), buildDate);



        Intent notificationIntent = new Intent(context, UpdatesActivity.class);

src/org/lineageos/updater/UpdatesActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ public class UpdatesActivity extends UpdatesListActivity { 


        TextView headerTitle = findViewById(R.id.header_title);

        headerTitle.setText(getString(R.string.header_title_text,

                BuildInfoUtils.getBuildVersion()));

                    BuildInfoUtils.getDisplayVersion()));



        updateLastCheckedString();
@@ -330,7 +330,7 @@ public class UpdatesActivity extends UpdatesListActivity { 
            preferences.edit().putLong(Constants.PREF_LAST_UPDATE_CHECK, millis).apply();

            updateLastCheckedString();

            if (json.exists() && Utils.isUpdateCheckEnabled(this) &&

                    Utils.checkForNewUpdates(json, jsonNew)) {

                    Utils.checkForNewUpdates(jsonNew)) {

                UpdatesCheckReceiver.updateRepeatingUpdatesCheck(this);

            }

            // In case we set a one-shot check because of a previous failure
@@ -491,7 +491,7 @@ public class UpdatesActivity extends UpdatesListActivity { 


        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);

        autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this));

        autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false));

        autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true));

        dataWarning.setChecked(prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true));

        abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, false));