Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prefer injecting preferences instead of using PreferenceManager directly #2073

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Prefer injecting preferences instead of using PreferenceManager directly #2073

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdd860a
Prefer injecting preferences over PreferenceManager
adamszewe Apr 3, 2024
88781c7
Optimize imports
adamszewe Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/main/java/com/nutomic/syncthingandroid/DaggerComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import com.nutomic.syncthingandroid.activities.FolderPickerActivity;
import com.nutomic.syncthingandroid.activities.MainActivity;
import com.nutomic.syncthingandroid.activities.SettingsActivity;
import com.nutomic.syncthingandroid.activities.ShareActivity;
import com.nutomic.syncthingandroid.activities.ThemedAppCompatActivity;
import com.nutomic.syncthingandroid.receiver.AppConfigReceiver;
import com.nutomic.syncthingandroid.service.RunConditionMonitor;
import com.nutomic.syncthingandroid.service.EventProcessor;
Expand Down Expand Up @@ -34,4 +36,6 @@ public interface DaggerComponent {
void inject(AppConfigReceiver appConfigReceiver);
void inject(RestApi restApi);
void inject(SettingsActivity.SettingsFragment fragment);
void inject(ShareActivity activity);
void inject(ThemedAppCompatActivity activity);
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private boolean shouldSkipSlide(Slide slide) {
case API_LEVEL_30:
// Skip if running as root, as that circumvents any Android FS restrictions.
return upgradedToApiLevel30()
|| PreferenceManager.getDefaultSharedPreferences(this).getBoolean(Constants.PREF_USE_ROOT, false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't there now be an unused import for PreferenceManager? Same on all other files.

|| mPreferences.getBoolean(Constants.PREF_USE_ROOT, false);
case NOTIFICATION:
return isNotificationPermissionGranted();

Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
import java.util.Collections;
import java.util.Iterator;

import javax.inject.Inject;

/**
* Activity that allows selecting a directory in the local file system.
*/
Expand All @@ -68,6 +70,9 @@ public class FolderPickerActivity extends SyncthingActivity
*/
private File mLocation;

@Inject
SharedPreferences mPreferences;

public static Intent createIntent(Context context, String initialDirectory, @Nullable String rootDirectory) {
Intent intent = new Intent(context, FolderPickerActivity.class);

Expand Down Expand Up @@ -103,7 +108,7 @@ protected void onCreate(Bundle savedInstanceState) {
displayRoot();
}

Boolean prefUseRoot = PreferenceManager.getDefaultSharedPreferences(this).getBoolean(Constants.PREF_USE_ROOT, false);
Boolean prefUseRoot = mPreferences.getBoolean(Constants.PREF_USE_ROOT, false);
if (!prefUseRoot) {
Toast.makeText(this, R.string.kitkat_external_storage_warning, Toast.LENGTH_LONG)
.show();
Expand Down Expand Up @@ -133,8 +138,7 @@ private void populateRoots() {
roots.add(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS));

// Add paths that might not be accessible to Syncthing.
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
if (sp.getBoolean("advanced_folder_picker", false)) {
if (mPreferences.getBoolean("advanced_folder_picker", false)) {
Collections.addAll(roots, new File("/storage/").listFiles());
roots.add(new File("/"));
}
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ public void onActivityCreated(Bundle savedInstanceState) {
mHttpProxyAddress.setOnPreferenceChangeListener(this);

/* Initialize summaries */
mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
screen.findPreference(Constants.PREF_POWER_SOURCE).setSummary(mPowerSource.getEntry());
String wifiSsidSummary = TextUtils.join(", ", mPreferences.getStringSet(Constants.PREF_WIFI_SSID_WHITELIST, new HashSet<>()));
screen.findPreference(Constants.PREF_WIFI_SSID_WHITELIST).setSummary(TextUtils.isEmpty(wifiSsidSummary) ?
Expand Down
18 changes: 12 additions & 6 deletions app/src/main/java/com/nutomic/syncthingandroid/activities/ShareActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.app.ProgressDialog;
import android.content.ContentResolver;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.net.Uri;
import android.os.AsyncTask;
Expand All @@ -23,6 +24,7 @@

import com.google.common.io.Files;
import com.nutomic.syncthingandroid.R;
import com.nutomic.syncthingandroid.SyncthingApp;
import com.nutomic.syncthingandroid.databinding.ActivityShareBinding;
import com.nutomic.syncthingandroid.model.Folder;
import com.nutomic.syncthingandroid.service.SyncthingService;
Expand All @@ -40,6 +42,8 @@
import java.util.List;
import java.util.Map;

import javax.inject.Inject;

/**
* Shares incoming files to syncthing folders.
* <p>
Expand All @@ -60,6 +64,9 @@ public class ShareActivity extends StateDialogActivity

private ActivityShareBinding binding;

@Inject
SharedPreferences mPreferences;

@Override
public void onServiceStateChange(SyncthingService.State currentState) {
if (currentState != SyncthingService.State.ACTIVE || getApi() == null)
Expand All @@ -69,8 +76,7 @@ public void onServiceStateChange(SyncthingService.State currentState) {

// Get the index of the previously selected folder.
int folderIndex = 0;
String savedFolderId = PreferenceManager.getDefaultSharedPreferences(this)
.getString(PREF_PREVIOUSLY_SELECTED_SYNCTHING_FOLDER, "");
String savedFolderId = mPreferences.getString(PREF_PREVIOUSLY_SELECTED_SYNCTHING_FOLDER, "");
for (Folder folder : folders) {
if (folder.id.equals(savedFolderId)) {
folderIndex = folders.indexOf(folder);
Expand Down Expand Up @@ -102,6 +108,7 @@ protected void onPostCreate(Bundle savedInstanceState) {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
((SyncthingApp) getApplication()).component().inject(this);
binding = ActivityShareBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());

Expand Down Expand Up @@ -266,8 +273,7 @@ private String getSavedSubDirectory() {
String savedSubDirectory = "";

if (selectedFolder != null) {
savedSubDirectory = PreferenceManager.getDefaultSharedPreferences(this)
.getString(PREF_FOLDER_SAVED_SUBDIRECTORY + selectedFolder.id, "");
savedSubDirectory = mPreferences.getString(PREF_FOLDER_SAVED_SUBDIRECTORY + selectedFolder.id, "");
}

return savedSubDirectory;
Expand Down Expand Up @@ -362,7 +368,7 @@ protected void onPause() {
super.onPause();
if (mFoldersSpinner.getSelectedItem() != null) {
Folder selectedFolder = (Folder) mFoldersSpinner.getSelectedItem();
PreferenceManager.getDefaultSharedPreferences(this).edit()
mPreferences.edit()
.putString(PREF_PREVIOUSLY_SELECTED_SYNCTHING_FOLDER, selectedFolder.id)
.apply();
}
Expand All @@ -379,7 +385,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
subDirectory = subDirectory.replace(folderDirectory, "");
mSubDirectoryTextView.setText(subDirectory);

PreferenceManager.getDefaultSharedPreferences(this)
mPreferences
.edit().putString(PREF_FOLDER_SAVED_SUBDIRECTORY + selectedFolder.id, subDirectory)
.apply();
}
Expand Down
10 changes: 8 additions & 2 deletions app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,27 @@
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;

import com.nutomic.syncthingandroid.SyncthingApp;
import com.nutomic.syncthingandroid.service.Constants;

import javax.inject.Inject;

/**
* Provides a themed instance of AppCompatActivity.
*/
public class ThemedAppCompatActivity extends AppCompatActivity {

private static final String FOLLOW_SYSTEM = "-1";

@Inject
SharedPreferences mPreferences;

@Override
protected void onCreate(Bundle savedInstanceState) {
((SyncthingApp) getApplication()).component().inject(this);
// Load theme.
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
//For api level below 28, Follow system fall backs to light mode
Integer prefAppTheme = Integer.parseInt(prefs.getString(Constants.PREF_APP_THEME, FOLLOW_SYSTEM));
Integer prefAppTheme = Integer.parseInt(mPreferences.getString(Constants.PREF_APP_THEME, FOLLOW_SYSTEM));
AppCompatDelegate.setDefaultNightMode(prefAppTheme);
super.onCreate(savedInstanceState);
}
Expand Down
Loading