Commit 82a5bfeb authored by Thomas's avatar Thomas
Browse files

Some changes

parent 4c523203

app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.webkit.MimeTypeMap; 
import androidx.appcompat.app.AlertDialog;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;



import com.google.android.exoplayer2.SimpleExoPlayer;

import com.google.android.exoplayer2.ExoPlayer;



import org.jetbrains.annotations.NotNull;
@@ -50,7 +50,7 @@ public class BasePeertubeActivity extends BaseBarActivity { 


    protected ActivityPeertubeBinding binding;

    protected VideoData.Video peertube;

    protected SimpleExoPlayer player;

    protected ExoPlayer player;

    protected String videoURL;

    protected String subtitlesStr;

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

+8 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ import java.util.regex.Pattern; 
import app.fedilab.android.activities.AboutActivity;

import app.fedilab.android.activities.LoginActivity;

import app.fedilab.android.activities.MainActivity;

import app.fedilab.android.activities.PeertubeBaseMainActivity;

import app.fedilab.android.databinding.ActivityMainBinding;

import app.fedilab.android.databinding.NavHeaderMainBinding;

import app.fedilab.android.mastodon.activities.ActionActivity;
@@ -334,6 +335,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
            });

            permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);

        }





        filteredAccounts = new ArrayList<>();

        mamageNewIntent(getIntent());

        filterFetched = false;
@@ -598,6 +601,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                    currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);

                }

                currentAccount = new Account(BaseMainActivity.this).getConnectedAccount();

                if (currentAccount.api == Account.API.PEERTUBE) {

                    startActivity(new Intent(this, PeertubeBaseMainActivity.class));

                    finish();

                }

            } catch (DBException e) {

                e.printStackTrace();

            }
@@ -1006,7 +1013,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
        Bundle extras = intent.getExtras();

        String userIdIntent, instanceIntent, urlOfMessage;

        if (extras != null && extras.containsKey(Helper.INTENT_ACTION)) {

            userIdIntent = extras.getString(Helper.PREF_KEY_ID); //Id of the account in the intent

            userIdIntent = extras.getString(Helper.PREF_USER_ID); //Id of the account in the intent

            instanceIntent = extras.getString(Helper.PREF_INSTANCE);

            urlOfMessage = extras.getString(Helper.PREF_MESSAGE_URL);

            if (extras.getInt(Helper.INTENT_ACTION) == Helper.NOTIFICATION_INTENT) {

app/src/main/java/app/fedilab/android/mastodon/client/entities/app/Account.java

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public class Account extends BaseAccount implements Serializable { 
        if (token.getAccess_token() != null)

            values.put(Sqlite.COL_TOKEN, token.getAccess_token());

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);

        String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);

        String userId = sharedpreferences.getString(Helper.PREF_USER_ID, null);

        String instance = HelperInstance.getLiveInstance(context);

        try {

            return db.update(Sqlite.TABLE_USER_ACCOUNT,

app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java

+2 −3
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ public class Helper { 
    public static final String INSTANCE_SOCIAL_KEY = "jGj9gW3z9ptyIpB8CMGhAlTlslcemMV6AgoiImfw3vPP98birAJTHOWiu5ZWfCkLvcaLsFZw9e3Pb7TIwkbIyrj3z6S7r2oE6uy6EFHvls3YtapP8QKNZ980p9RfzTb4";

    public static final String WEBSITE_VALUE = "https://fedilab.app";



    public static final String OLD_DB_NAME = "mastodon_etalab_db";



    public static final String RECEIVE_TOAST_MESSAGE = "RECEIVE_TOAST_MESSAGE";

    public static final String RECEIVE_TOAST_TYPE = "RECEIVE_TOAST_TYPE";

    public static final String RECEIVE_TOAST_CONTENT = "RECEIVE_TOAST_CONTENT";
@@ -296,15 +294,16 @@ public class Helper { 


    public static final String SCHEDULE_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";





    public static final String PREF_USER_TOKEN = "PREF_USER_TOKEN";

    public static final String PREF_USER_ID = "PREF_USER_ID";

    public static final String PREF_USER_INSTANCE = "PREF_USER_INSTANCE";

    public static final String PREF_IS_MODERATOR = "PREF_IS_MODERATOR";

    public static final String PREF_IS_ADMINISTRATOR = "PREF_IS_ADMINISTRATOR";

    public static final String PREF_KEY_ID = "PREF_KEY_ID";

    public static final String PREF_MESSAGE_URL = "PREF_MESSAGE_URL";

    public static final String PREF_INSTANCE = "PREF_INSTANCE";





    public static final String SET_SECURITY_PROVIDER = "SET_SECURITY_PROVIDER";



    public static final int NOTIFICATION_INTENT = 1;

app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ public class NotificationsHelper { 
                final Intent intent = new Intent(context, MainActivity.class);

                intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);

                intent.putExtra(Helper.INTENT_ACTION, Helper.NOTIFICATION_INTENT);

                intent.putExtra(Helper.PREF_KEY_ID, account.user_id);

                intent.putExtra(Helper.PREF_USER_ID, account.user_id);

                if (targeted_account != null)

                    intent.putExtra(Helper.INTENT_TARGETED_ACCOUNT, targeted_account);

                intent.putExtra(Helper.PREF_INSTANCE, account.instance);