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

Commit 35203489 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Migrate to new /e/ Drive URL, update Gradle version

parent a2ddffed

app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java

+12 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 


        if (PreferenceManager.getDefaultSharedPreferences(this)

                .getBoolean(SettingsActivity.SETTINGS_IS_DEVICE_ACCOUNT, false)) {

            migrateUrl();

            if (hasAccountBeenRemoved() || hasAccountPasswordChanged()) {

                Intent settingsIntent = new Intent(this, AccountActivity.class);

                startActivityForResult(settingsIntent, login_account);
@@ -166,6 +167,17 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 
        setupNavigationMenu();

    }



    private void migrateUrl() {

        String syncUrl = PreferenceManager.getDefaultSharedPreferences(this)

                .getString(SettingsActivity.SETTINGS_URL, "");

        if (syncUrl.equals("https://drive.ecloud.global/")) {

            PreferenceManager.getDefaultSharedPreferences(this)

                    .edit()

                    .putString(SettingsActivity.SETTINGS_URL, "https://ecloud.global/")

                    .apply();

        }

    }



    private boolean hasAccountBeenRemoved() {

        AccountManager accountManager = AccountManager.get(this);

        String userName = PreferenceManager.getDefaultSharedPreferences(this)

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ buildscript { 
    }

    dependencies {

        apply plugin: 'maven'

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

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



        // NOTE: Do not place your application dependencies here; they belong

        // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
#Sat Nov 10 14:24:00 IST 2018

#Wed Apr 03 12:44:11 IST 2019

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip