From 6f80fbd9451a62b8a3672bd06db6b88967835e6a Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Tue, 28 Mar 2017 10:52:57 +1100
Subject: [PATCH] Removed PreferencesActivity.

This is now a top level view inside MainActivity.
---
 .../fdroid/fdroid/PreferencesActivity.java    | 74 -------------------
 .../views/fragments/PreferencesFragment.java  | 14 +---
 2 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 app/src/main/java/org/fdroid/fdroid/PreferencesActivity.java

diff --git a/app/src/main/java/org/fdroid/fdroid/PreferencesActivity.java b/app/src/main/java/org/fdroid/fdroid/PreferencesActivity.java
deleted file mode 100644
index 82a1559c1..000000000
--- a/app/src/main/java/org/fdroid/fdroid/PreferencesActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2010-12  Ciaran Gultnieks, ciaran@ciarang.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-package org.fdroid.fdroid;
-
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.view.MenuItem;
-import android.widget.LinearLayout;
-
-import org.fdroid.fdroid.views.fragments.PreferencesFragment;
-
-public class PreferencesActivity extends AppCompatActivity {
-
-    public static final int RESULT_RESTART = 4;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-
-        ((FDroidApp) getApplication()).applyTheme(this);
-        super.onCreate(savedInstanceState);
-
-        FragmentManager fm = getSupportFragmentManager();
-        if (fm.findFragmentById(android.R.id.content) == null) {
-            // Need to set a dummy view (which will get overridden by the fragment manager
-            // below) so that we can call setContentView(). This is a work around for
-            // a (bug?) thing in 3.0, 3.1 which requires setContentView to be invoked before
-            // the actionbar is played with:
-            // http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
-            if (Build.VERSION.SDK_INT >= 11 && Build.VERSION.SDK_INT <= 13) {
-                setContentView(new LinearLayout(this));
-            }
-
-            PreferencesFragment preferencesFragment = new PreferencesFragment();
-            fm.beginTransaction()
-                    .add(android.R.id.content, preferencesFragment)
-                    .commit();
-        }
-
-        // Actionbar cannot be accessed until after setContentView (on 3.0 and 3.1 devices)
-        // see: http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
-        // for reason why.
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                NavUtils.navigateUpFromSameTask(this);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-}
diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index c190ac645..14b4b7d51 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -17,7 +17,6 @@ import org.fdroid.fdroid.AppDetails2;
 import org.fdroid.fdroid.CleanCacheService;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
-import org.fdroid.fdroid.PreferencesActivity;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.installer.InstallHistoryService;
@@ -83,8 +82,6 @@ public class PreferencesFragment extends PreferenceFragment
 
     private void updateSummary(String key, boolean changing) {
 
-        int result = 0;
-
         switch (key) {
             case Preferences.PREF_UPD_INTERVAL:
                 ListPreference listPref = (ListPreference) findPreference(
@@ -114,10 +111,7 @@ public class PreferencesFragment extends PreferenceFragment
 
             case Preferences.PREF_THEME:
                 entrySummary(key);
-                if (changing) {
-                    result |= PreferencesActivity.RESULT_RESTART;
-                    getActivity().setResult(result);
-                }
+                // TODO: Ask MainActivity to restart itself.
                 break;
 
             case Preferences.PREF_INCOMP_VER:
@@ -147,10 +141,8 @@ public class PreferencesFragment extends PreferenceFragment
             case Preferences.PREF_LANGUAGE:
                 entrySummary(key);
                 if (changing) {
-                    result |= PreferencesActivity.RESULT_RESTART;
-                    Activity activity = getActivity();
-                    activity.setResult(result);
-                    ((FDroidApp) activity.getApplication()).updateLanguage();
+                    // TODO: Ask MainActivity to restart itself.
+                    ((FDroidApp) getActivity().getApplication()).updateLanguage();
                 }
                 break;