nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-22 20:31:16 +00:00
Code Releases Activity

Fixed crash when opening SettingsActivity

Browse source
This commit is contained in:
Felix Ableitner 2017-10-24 00:01:12 +09:00
parent d6ee33e48e
commit fa49c796ae
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
View file

@ -98,7 +98,6 @@ public class SettingsActivity extends SyncthingActivity {
super.onCreate(savedInstanceState);
((SyncthingApp) getActivity().getApplication()).component().inject(this);
((SyncthingActivity) getActivity()).registerOnServiceConnectedListener(this);
mPreferences.registerOnSharedPreferenceChangeListener(this);
}
/**
@ -297,7 +296,7 @@ public class SettingsActivity extends SyncthingActivity {
}
/**
* Sends the updated value to {@link }RestApi}, and sets it as the summary
* Sends the updated value to {@link RestApi}, and sets it as the summary
* for EditTextPreference.
*/
@Override
@ -408,9 +407,17 @@ public class SettingsActivity extends SyncthingActivity {
}
}
/**
* Update notification after that preference changes. We can't use onPreferenceChange() as
* the preference value isn't persisted there, and the NotificationHandler accesses the
* preference directly.
*
* This function is called when the activity is opened, so we need to make sure the service
* is connected.
*/
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (key.equals(Constants.PREF_NOTIFICATION_TYPE)) {
if (key.equals(Constants.PREF_NOTIFICATION_TYPE) && mSyncthingService != null) {
mNotificationHandler.updatePersistentNotification(mSyncthingService);
}
}

3
src/main/java/com/nutomic/syncthingandroid/service/RestApi.java
View file

@ -146,6 +146,9 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
});
new GetRequest(mContext, mUrl, GetRequest.URI_CONFIG, mApiKey, null, result -> {
mConfig = new Gson().fromJson(result, Config.class);
if (mConfig == null) {
throw new RuntimeException("config is null: " + result);
}
tryIsAvailable();
});
getSystemInfo(info -> {