Commit 12981dea authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop'

parents 002bc488 0772f47b

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ android { 
    defaultConfig {

        minSdk 21

        targetSdk 32

        versionCode 443

        versionName "3.10.0"

        versionCode 446

        versionName "3.11.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

app/src/main/assets/release_notes/notes.json

+15 −0
Original line number Diff line number Diff line 
[

  {

    "version": "3.11.0",

    "code": "446",

    "note": "Added:\n- Display all messages in threads from remote instances (when possible)\n- Allow to unmute/unfollow/unpin a tag from tag timelines\n- Display most used accounts in header menu for an easy switch\n- Automatically add the tag when composing from a tag timeline\n- Add a translate button at the bottom of messages (default: disabled)\n- Add account role in profiles\n- Translate morse\n\nChanged:\n- Disable animations after a refresh\n\nFixed:\n- Contact not working when composing\n- Status bar for black theme\n- Message duplicated in conversations when edited\n- Color issue on Android 5\n- Several crashes"

  },

  {

    "version": "3.10.2",

    "code": "445",

    "note": "Added:\n- Allow to unmute/unfollow/unpin a tag from tag timelines\n- Automatically add the tag when composing from a tag timeline\n- Add a translate button at the bottom of messages (default: disabled)\n- Add account role in profiles\n\nFixed:\n- Contact not working when composing\n- Status bar for black theme\n- Message duplicated in conversations when edited\n- Color issue on Android 5"

  },

  {

    "version": "3.10.1",

    "code": "444",

    "note": "Added:\n- Display all messages in threads from remote instances (when possible)\n* Only public messages for instances using the Mastodon API\n* A dedicated button is displayed at the top right when conditions are filled."

  },

  {

    "version": "3.10.0",

    "code": "443",

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+52 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                new ViewModelProvider(BaseMainActivity.this).get(AccountsVM.class).getConnectedAccount(currentInstance, currentToken)

                        .observe(BaseMainActivity.this, mastodonAccount -> {

                            //Initialize static var

                            if (mastodonAccount != null) {

                            if (mastodonAccount != null && currentAccount != null) {

                                currentAccount.mastodon_account = mastodonAccount;

                                displayReleaseNotesIfNeeded(BaseMainActivity.this, false);

                                new Thread(() -> {
@@ -758,6 +758,57 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                }

            }).start();

        }

        //Fetch recent used accounts

        new Thread(() -> {

            try {

                List<BaseAccount> accounts = new Account(BaseMainActivity.this).getLastUsedAccounts();

                Handler mainHandler = new Handler(Looper.getMainLooper());

                Runnable myRunnable = () -> {

                    if (accounts != null && accounts.size() > 0) {

                        Helper.loadPP(this, headerMainBinding.otherAccount1, accounts.get(0));

                        headerMainBinding.otherAccount1.setVisibility(View.VISIBLE);

                        headerMainBinding.otherAccount1.setOnClickListener(v -> {

                            headerMenuOpen = false;

                            Toasty.info(BaseMainActivity.this, getString(R.string.toast_account_changed, "@" + accounts.get(0).mastodon_account.acct + "@" + accounts.get(0).instance), Toasty.LENGTH_LONG).show();

                            BaseMainActivity.currentToken = accounts.get(0).token;

                            BaseMainActivity.currentUserID = accounts.get(0).user_id;

                            api = accounts.get(0).api;

                            SharedPreferences.Editor editor = sharedpreferences.edit();

                            editor.putString(PREF_USER_TOKEN, accounts.get(0).token);

                            editor.commit();

                            //The user is now aut

                            //The user is now authenticated, it will be redirected to MainActivity

                            Intent mainActivity = new Intent(this, MainActivity.class);

                            startActivity(mainActivity);

                            finish();

                        });

                        if (accounts.size() > 1) {

                            Helper.loadPP(this, headerMainBinding.otherAccount2, accounts.get(1));

                            headerMainBinding.otherAccount2.setVisibility(View.VISIBLE);

                            headerMainBinding.otherAccount2.setOnClickListener(v -> {

                                headerMenuOpen = false;

                                Toasty.info(BaseMainActivity.this, getString(R.string.toast_account_changed, "@" + accounts.get(1).mastodon_account.acct + "@" + accounts.get(1).instance), Toasty.LENGTH_LONG).show();

                                BaseMainActivity.currentToken = accounts.get(1).token;

                                BaseMainActivity.currentUserID = accounts.get(1).user_id;

                                api = accounts.get(1).api;

                                SharedPreferences.Editor editor = sharedpreferences.edit();

                                editor.putString(PREF_USER_TOKEN, accounts.get(1).token);

                                editor.commit();

                                //The user is now aut

                                //The user is now authenticated, it will be redirected to MainActivity

                                Intent mainActivity = new Intent(this, MainActivity.class);

                                startActivity(mainActivity);

                                finish();

                            });

                        }

                    }

                };

                mainHandler.post(myRunnable);



            } catch (DBException e) {

                e.printStackTrace();

            }

        }).start();

    }



    protected abstract void rateThisApp();

app/src/main/java/app/fedilab/android/activities/BaseActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AppCompatActivity;
@@ -81,6 +84,9 @@ public class BaseActivity extends AppCompatActivity { 
                            break;

                        case "BLACK":

                            setTheme(R.style.BlackAppTheme);

                            Window window = getWindow();

                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                            window.setStatusBarColor(Color.BLACK);

                            currentThemeId = R.style.BlackAppTheme;

                            break;

                        case "DRACULA":
@@ -115,6 +121,9 @@ public class BaseActivity extends AppCompatActivity { 
                case "BLACK":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.BlackAppTheme);

                    Window window = getWindow();

                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                    window.setStatusBarColor(Color.BLACK);

                    currentThemeId = R.style.BlackAppTheme;

                    break;

                case "DRACULA":

app/src/main/java/app/fedilab/android/activities/BaseAlertDialogActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AppCompatActivity;
@@ -74,6 +77,9 @@ public class BaseAlertDialogActivity extends AppCompatActivity { 
                            setTheme(R.style.SolarizedAlertDialog);

                            break;

                        case "BLACK":

                            Window window = getWindow();

                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                            window.setStatusBarColor(Color.BLACK);

                            setTheme(R.style.BlackAlertDialog);

                            break;

                        case "DRACULA":
@@ -102,6 +108,9 @@ public class BaseAlertDialogActivity extends AppCompatActivity { 
                    break;

                case "BLACK":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    Window window = getWindow();

                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                    window.setStatusBarColor(Color.BLACK);

                    setTheme(R.style.BlackAlertDialog);

                    break;

                case "DRACULA":