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

Commit 0426e2ea authored by Fs00's avatar Fs00
Browse files

Simplify logic to reload document in settings

parent 6377448f

app/src/main/java/com/gsnathan/pdfviewer/MainActivity.java

+4 −8
Original line number Diff line number Diff line
@@ -118,9 +118,7 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 
        onFirstUpdate();

        handleIntent(getIntent());



        if (Utils.tempBool && getIntent().getStringExtra("uri") != null) {

            uri = Uri.parse(getIntent().getStringExtra("uri"));

        } else if (getIntent().getDataString() == null){

        if (getIntent().getDataString() == null) {

            pickFile();

        }
@@ -271,10 +269,6 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 


    void displayFromUri(Uri uri) {

        pdfFileName = getFileName(uri);

        Utils.tempBool = true;

        SharedPreferences.Editor editor = prefManager.edit();

        editor.putString("uri", uri.toString());

        editor.apply();

        String scheme = uri.getScheme();



        if (scheme != null && scheme.contains("http")) {
@@ -333,7 +327,9 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 
    }



    void navToSettings() {

        startActivity(Utils.navIntent(this, SettingsActivity.class));

        Intent intent = new Intent(this, SettingsActivity.class);

        intent.setData(uri);

        startActivity(intent);

    }



    @OnActivityResult(REQUEST_CODE)

app/src/main/java/com/gsnathan/pdfviewer/SettingsActivity.java

+7 −11
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.net.Uri;

import android.os.Bundle;

import android.preference.Preference;

import android.preference.PreferenceActivity;
@@ -52,20 +53,15 @@ public class SettingsActivity extends AppCompatPreferenceActivity { 
        button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {

            @Override

            public boolean onPreferenceClick(Preference preference) {

                String uriString = "";

                try {

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

                    uriString = prefManager.getString("uri", "");

                    Log.d("Hello", "Uri = " + uriString);

                    if (uriString != null) {

                        Intent intent = new Intent(getApplicationContext(), MainActivity_.class);

                        intent.putExtra("uri", uriString);

                    Uri documentUri = getIntent().getData();

                    Intent intent = new Intent(SettingsActivity.this, MainActivity_.class);

                    if (documentUri != null) {

                        intent.setData(documentUri);

                        startActivity(intent);

                    } else {

                        Intent i = getBaseContext().getPackageManager().

                                getLaunchIntentForPackage(getBaseContext().getPackageName());

                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                        startActivity(i);

                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                        startActivity(intent);

                        finish();

                    }

                } catch (Exception e) {

app/src/main/java/com/gsnathan/pdfviewer/Utils.java

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ import io.github.tonnyl.whatsnew.item.WhatsNewItem; 


public class Utils {



    public static boolean tempBool = false;



    static void showLog(AppCompatActivity context) {

        WhatsNew log = WhatsNew.newInstance(

                new WhatsNewItem("File Manager", "Enable on start of the app", R.drawable.star_icon),