WallyHackenslacker/moasdawiki-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Herbert Reiter
2020-01-04 21:58:03 +01:00
parent cfd30aa14e
commit 55b854b3d9
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/net/moasdawiki/app/SettingsFragment.java
+3 -3
View File
@@ -113,11 +113,11 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
} }
// Port // Port
int serverPort = preferences.getInt(Constants.PREFERENCES_SYNC_SERVER_PORT, 0); String serverPort = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_PORT, null);
EditTextPreference syncServerPort = findPreference("sync_server_port"); EditTextPreference syncServerPort = findPreference("sync_server_port");
if (syncServerPort != null) { if (syncServerPort != null) {
if (serverPort > 0) { if (serverPort != null && !serverPort.isEmpty()) {
syncServerPort.setSummary(Integer.toString(serverPort)); syncServerPort.setSummary(serverPort);
} else { } else {
String summary = getString(R.string.settings_port_summary_empty, settings.getServerPort()); String summary = getString(R.string.settings_port_summary_empty, settings.getServerPort());
syncServerPort.setSummary(summary); syncServerPort.setSummary(summary);
app/src/main/java/net/moasdawiki/app/SynchronizeWikiClient.java
+28 -14
View File
@@ -99,17 +99,14 @@ public class SynchronizeWikiClient {
* weiter verwendet. * weiter verwendet.
*/ */
public boolean createAndCheckSession() { public boolean createAndCheckSession() {
PreferenceManager.getDefaultSharedPreferences(mContext); String serverHostPort = getServerHostPort();
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext); if (serverHostPort == null) {
String host = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_HOST, null);
int port = preferences.getInt(Constants.PREFERENCES_SYNC_SERVER_PORT, settings.getServerPort());
String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
// Host konfiguriert?
if (host == null) {
return false; return false;
} }
String serverHostPort = host + ':' + port;
PreferenceManager.getDefaultSharedPreferences(mContext);
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
try { try {
// Wenn noch keine Session vorhanden ist, eine erzeugen // Wenn noch keine Session vorhanden ist, eine erzeugen
@@ -228,12 +225,12 @@ public class SynchronizeWikiClient {
* @return Anzahl der synchronisierten Dateien. * @return Anzahl der synchronisierten Dateien.
*/ */
public int synchronizeRepository(ProgressFeedback feedback) throws ServiceException { public int synchronizeRepository(ProgressFeedback feedback) throws ServiceException {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext); String serverHostPort = getServerHostPort();
String host = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_HOST, null); if (serverHostPort == null) {
int port = preferences.getInt(Constants.PREFERENCES_SYNC_SERVER_PORT, settings.getServerPort());
if (host == null) {
throw new ServiceException("No wiki server configured"); throw new ServiceException("No wiki server configured");
} }
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null); String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
if (serverSessionId == null) { if (serverSessionId == null) {
throw new ServiceException("Not server session ID found"); throw new ServiceException("Not server session ID found");
@@ -245,7 +242,6 @@ public class SynchronizeWikiClient {
} }
// Aktuelle Session überprüfen // Aktuelle Session überprüfen
String serverHostPort = host + ':' + port;
boolean[] checkResult = checkSession(serverHostPort); boolean[] checkResult = checkSession(serverHostPort);
if (!checkResult[1]) { if (!checkResult[1]) {
throw new ServiceException("Client not authenticated at wiki server"); throw new ServiceException("Client not authenticated at wiki server");
@@ -315,6 +311,24 @@ public class SynchronizeWikiClient {
Log.d(TAG, "File '" + filePath + "' replaced by newer content from server"); Log.d(TAG, "File '" + filePath + "' replaced by newer content from server");
} }
@Nullable
private String getServerHostPort() {
PreferenceManager.getDefaultSharedPreferences(mContext);
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
String host = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_HOST, null);
if (host == null) {
return null;
}
String port = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_PORT, null);
if (port == null || port.trim().isEmpty()) {
port = Integer.toString(settings.getServerPort());
}
return host + ':' + port;
}
/** /**
* Versucht den Wifi-Hostnamen zu ermitteln und gibt ihn zurück. * Versucht den Wifi-Hostnamen zu ermitteln und gibt ihn zurück.
*/ */