vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-15 00:31:11 +01:00
Code Issues Releases Wiki Activity

Added some more preference summaries

Browse source
This commit is contained in:
vanitasvitae 2016-06-20 10:51:20 +02:00
parent 28bc94da44
commit f5e2aef90f
7 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -109,7 +109,7 @@ public class MainActivity extends AppCompatActivity
private static final int REQUEST_CODE_ASK_PERMISSIONS = 123;
public static final int REQUEST_CODE_ASK_PERMISSIONS_SAVE_IMAGE = 124;
public static final int REQUEST_CODE_SETTINGS = 125;
public static final int RESULT_CODE_CHANGE_POD = 130;
public static final int RESULT_CODE_CHANGE_ACCOUNT = 130;
public static final String URL_MESSAGE = "URL_MESSAGE";
private App app;
@ -412,7 +412,7 @@ public class MainActivity extends AppCompatActivity
if(resultCode == Activity.RESULT_OK) {
String url = data.getStringExtra(URL_MESSAGE);
webView.loadUrl(url);
} else if(resultCode == RESULT_CODE_CHANGE_POD) {
} else if(resultCode == RESULT_CODE_CHANGE_ACCOUNT) {
app.resetPodData(webView);
Helpers.animateToActivity(MainActivity.this, PodSelectionActivity.class, true);
}

11
app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
View file

@ -5,21 +5,16 @@ import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.data.AppSettings;
import com.github.dfa.diaspora_android.util.Helpers;
/**
* @author vanitas
@ -85,15 +80,15 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
results.putExtra(MainActivity.URL_MESSAGE, "https://" + podDomain + "/contacts");
setResult(Activity.RESULT_OK, results);
finish();
case "pref_key_change_pod":
case "pref_key_change_account":
new AlertDialog.Builder(SettingsActivity.this)
.setTitle(getString(R.string.confirmation))
.setMessage(getString(R.string.change_pod_warning))
.setMessage(getString(R.string.pref_warning_change_account))
.setNegativeButton(android.R.string.no, null)
.setPositiveButton(android.R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
setResult(MainActivity.RESULT_CODE_CHANGE_POD);
setResult(MainActivity.RESULT_CODE_CHANGE_ACCOUNT);
finish();
}
})