vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 04:12:08 +01:00
Code Issues Releases Wiki Activity

Removed unused applogs

Browse source
This commit is contained in:
vanitasvitae 2016-10-27 22:46:21 +02:00
parent 30ca937461
commit 765a96f48b
Signed by: vanitasvitae
GPG key ID: DCCFB3302C9E4615
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,6 @@ import android.preference.Preference;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.support.design.widget.AppBarLayout; import android.support.design.widget.AppBarLayout;
import android.support.v4.app.Fragment;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -25,7 +24,6 @@ import android.widget.Toast;
import com.github.dfa.diaspora_android.App; import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.R; import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.ui.theme.ColorPalette; import com.github.dfa.diaspora_android.ui.theme.ColorPalette;
import com.github.dfa.diaspora_android.ui.theme.CustomFragment;
import com.github.dfa.diaspora_android.ui.theme.ThemeHelper; import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
import com.github.dfa.diaspora_android.ui.theme.ThemedActivity; import com.github.dfa.diaspora_android.ui.theme.ThemedActivity;
import com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceFragment; import com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceFragment;
@ -132,17 +130,13 @@ public class SettingsActivity extends ThemedActivity {
@Override @Override
public void onBackPressed() { public void onBackPressed() {
AppLog.d(this, "onBackPressed");
ThemedPreferenceFragment top = getTopFragment(); ThemedPreferenceFragment top = getTopFragment();
if(top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) { if(top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) {
AppLog.d(this, "top was proxy");
ProxyHandler.ProxySettings newProxySettings = getAppSettings().getProxySettings(); ProxyHandler.ProxySettings newProxySettings = getAppSettings().getProxySettings();
if(oldProxySettings.isEnabled() && !newProxySettings.isEnabled()) { if(oldProxySettings.isEnabled() && !newProxySettings.isEnabled()) {
AppLog.d(this, "proxy disabled");
Toast.makeText(this, R.string.toast__proxy_disabled__restart_required, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.toast__proxy_disabled__restart_required, Toast.LENGTH_LONG).show();
} }
} }
AppLog.d(this, "top is null: "+(top == null));
super.onBackPressed(); super.onBackPressed();
} }