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

Commit 28bf7c09 authored by Niedermann IT-Dienstleistungen's avatar Niedermann IT-Dienstleistungen
Browse files

Shows correct username@host on first sign-in in drawer

parent fa3c3f4f

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

+11 −6
Original line number Diff line number Diff line
@@ -369,12 +369,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 
        });





        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

        String username = preferences.getString(SettingsActivity.SETTINGS_USERNAME, SettingsActivity.DEFAULT_SETTINGS);

        String url = preferences.getString(SettingsActivity.SETTINGS_URL, SettingsActivity.DEFAULT_SETTINGS).replace("https://", "").replace("http://", "");

        if(!SettingsActivity.DEFAULT_SETTINGS.equals(username) && !SettingsActivity.DEFAULT_SETTINGS.equals(url)) {

            this.account.setText(username + "@" + url.substring(0, url.length() - 1));

        }

        this.updateUsernameInDrawer();

        final NotesListViewActivity that = this;

        this.account.setOnClickListener(new View.OnClickListener() {

            @Override
@@ -595,6 +590,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 
            // Create new Instance with new URL and credentials

            db = NoteSQLiteOpenHelper.getInstance(this);

            if (db.getNoteServerSyncHelper().isSyncPossible()) {

                this.updateUsernameInDrawer();

                adapter.removeAll();

                synchronize();

            } else {
@@ -603,6 +599,15 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 
        }

    }



    private void updateUsernameInDrawer() {

        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

        String username = preferences.getString(SettingsActivity.SETTINGS_USERNAME, SettingsActivity.DEFAULT_SETTINGS);

        String url = preferences.getString(SettingsActivity.SETTINGS_URL, SettingsActivity.DEFAULT_SETTINGS).replace("https://", "").replace("http://", "");

        if(!SettingsActivity.DEFAULT_SETTINGS.equals(username) && !SettingsActivity.DEFAULT_SETTINGS.equals(url)) {

            this.account.setText(username + "@" + url.substring(0, url.length() - 1));

        }

    }



    @Override

    public void onNoteClick(int position, View v) {

        if (mActionMode != null) {