Commit 7119c124 authored by Thomas's avatar Thomas
Browse files

Remove context dependency

parent 3d1d9534

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ dependencies { 
    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'

    implementation 'com.google.android.exoplayer:extension-mediasession:2.18.1'

    implementation "com.github.mabbas007:TagsEditText:1.0.5"

    implementation "net.gotev:uploadservice:4.5.1"

    implementation "net.gotev:uploadservice-okhttp:4.5.1"

    implementation "net.gotev:uploadservice:4.7.0"

    implementation "net.gotev:uploadservice-okhttp:4.7.0"

    implementation 'androidx.media:media:1.6.0'

    implementation 'com.github.mancj:MaterialSearchBar:0.8.5'

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

+25 −6
Original line number Diff line number Diff line
@@ -15,8 +15,11 @@ package app.fedilab.android; 
 * see <http://www.gnu.org/licenses>. */





import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.content.Context;

import android.content.SharedPreferences;

import android.os.Build;

import android.os.StrictMode;

import android.webkit.WebView;
@@ -26,6 +29,9 @@ import androidx.preference.PreferenceManager; 


import com.google.android.material.color.DynamicColors;



import net.gotev.uploadservice.UploadServiceConfig;

import net.gotev.uploadservice.observer.request.GlobalRequestObserver;



import org.acra.ACRA;

import org.acra.ReportField;

import org.acra.config.CoreConfigurationBuilder;
@@ -33,24 +39,21 @@ import org.acra.config.DialogConfigurationBuilder; 
import org.acra.config.MailSenderConfigurationBuilder;

import org.acra.data.StringFormat;



import java.util.Objects;



import app.fedilab.android.mastodon.helper.ThemeHelper;

import app.fedilab.android.peertube.services.GlobalUploadObserver;

import es.dmoral.toasty.Toasty;





public class MainApplication extends MultiDexApplication {



    public static String UPLOAD_CHANNEL_ID = "upload_info_peertube";

    private static MainApplication app;

    private WebView webView;



    public static MainApplication getApp() {

        return app;

    }



    @Override

    public void onCreate() {

        super.onCreate();

        app = this;

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MainApplication.this);

        try {

            webView = new WebView(this);
@@ -69,6 +72,11 @@ public class MainApplication extends MultiDexApplication { 
            } catch (Exception ignored) {

            }

        }



        createNotificationChannel();

        UploadServiceConfig.initialize(MainApplication.this, UPLOAD_CHANNEL_ID, true);



        new GlobalRequestObserver(this, new GlobalUploadObserver());

    }
@@ -111,4 +119,15 @@ public class MainApplication extends MultiDexApplication { 
            );

        }

    }





    private void createNotificationChannel() {

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

            NotificationChannel channel = new NotificationChannel(UPLOAD_CHANNEL_ID,

                    getString(R.string.notification_channel_name),

                    NotificationManager.IMPORTANCE_LOW);

            channel.setSound(null, null);

            ((NotificationManager) Objects.requireNonNull(getSystemService(Context.NOTIFICATION_SERVICE))).createNotificationChannel(channel);

        }

    }

}

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

+16 −2
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ import androidx.preference.PreferenceManager; 
import com.vanniktech.emoji.EmojiManager;

import com.vanniktech.emoji.one.EmojiOneProvider;



import org.conscrypt.Conscrypt;



import java.security.Security;



import app.fedilab.android.R;

import app.fedilab.android.mastodon.helper.Helper;

import app.fedilab.android.mastodon.helper.ThemeHelper;
@@ -44,14 +48,24 @@ public class BaseActivity extends AppCompatActivity { 
    public static int currentThemeId;



    static {

        Helper.installProvider();

        EmojiManager.install(new EmojiOneProvider());

    }



    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {



        boolean patch_provider = true;

        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);

        try {

            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);

        } catch (Exception ignored) {

        }

        if (patch_provider) {

            try {

                Security.insertProviderAt(Conscrypt.newProvider(), 1);

            } catch (Exception ignored) {

            }

        }



        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));

        //Default automatic switch

        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {

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

+16 −2
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ import androidx.preference.PreferenceManager; 
import com.vanniktech.emoji.EmojiManager;

import com.vanniktech.emoji.one.EmojiOneProvider;



import org.conscrypt.Conscrypt;



import java.security.Security;



import app.fedilab.android.R;

import app.fedilab.android.mastodon.helper.Helper;

import app.fedilab.android.mastodon.helper.ThemeHelper;
@@ -42,14 +46,24 @@ import app.fedilab.android.mastodon.helper.ThemeHelper; 
public class BaseAlertDialogActivity extends AppCompatActivity {



    static {

        Helper.installProvider();

        EmojiManager.install(new EmojiOneProvider());

    }



    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {



        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);

        boolean patch_provider = true;

        try {

            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);

        } catch (Exception ignored) {

        }

        if (patch_provider) {

            try {

                Security.insertProviderAt(Conscrypt.newProvider(), 1);

            } catch (Exception ignored) {

            }

        }



        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));

        //Default automatic switch

        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {

app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java

+15 −1
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ import androidx.preference.PreferenceManager; 
import com.vanniktech.emoji.EmojiManager;

import com.vanniktech.emoji.one.EmojiOneProvider;



import org.conscrypt.Conscrypt;



import java.security.Security;



import app.fedilab.android.R;

import app.fedilab.android.mastodon.helper.Helper;

import app.fedilab.android.mastodon.helper.ThemeHelper;
@@ -42,13 +46,23 @@ import app.fedilab.android.mastodon.helper.ThemeHelper; 
public class BaseBarActivity extends AppCompatActivity {



    static {

        Helper.installProvider();

        EmojiManager.install(new EmojiOneProvider());

    }



    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {

        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);

        boolean patch_provider = true;

        try {

            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);

        } catch (Exception ignored) {

        }

        if (patch_provider) {

            try {

                Security.insertProviderAt(Conscrypt.newProvider(), 1);

            } catch (Exception ignored) {

            }

        }

        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));

        //Default automatic switch

        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {