gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-13 05:17:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge From Master

Browse Source 
Resolve conflicts in ReposFragment, downgrade build-tools version
because my computer is stupid.
This commit is contained in:
d8ahazard
2016-09-24 10:12:42 -05:00
parent 2402010d24 8a7df954e5
commit d8a4eaf026
5 changed files with 49 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
View File

@@ -6,6 +6,7 @@ import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.RecyclerView;
@@ -43,7 +44,7 @@ public class ReposFragment extends Fragment {
private boolean alertUpdate;
private boolean ignoreAlertUpdate;
private String alertPackage;
private SharedPreferences prefs;
// private SharedPreferences prefs;
@Nullable
@@ -52,16 +53,16 @@ public class ReposFragment extends Fragment {
View view = inflater.inflate(R.layout.repos_fragment, container, false);
mView = view;
ButterKnife.bind(this, view);
prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
if (prefs.contains("ignoreUpdateAlerts")) {
ignoreAlertUpdate = prefs.getBoolean("ignoreUpdateAlerts", false);
}
swipeRefreshLayout.setOnRefreshListener(() -> {
this.LoadRepo(true);
ignoreAlertUpdate = false;
prefs.edit().putBoolean("ignoreUpdateAlerts", false).apply();
});
// prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
// if (prefs.contains("ignoreUpdateAlerts")) {
// ignoreAlertUpdate = prefs.getBoolean("ignoreUpdateAlerts", false);
// }
// swipeRefreshLayout.setOnRefreshListener(() -> {
// this.LoadRepo(true);
// ignoreAlertUpdate = false;
// prefs.edit().putBoolean("ignoreUpdateAlerts",false).apply();
//
// });
LoadRepo(false);
setHasOptionsMenu(false);
alertUpdate = false;
@@ -76,7 +77,6 @@ public class ReposFragment extends Fragment {
return view;
}
@Override
public void onStart() {
super.onStart();
@@ -99,7 +99,7 @@ public class ReposFragment extends Fragment {
super.onAttachFragment(childFragment);
}
private void LoadRepo(boolean doReload) {
private void LoadRepo (boolean doReload) {
RepoHelper.TaskDelegate taskDelegate = result -> {
if (result.equals("Complete")) {
Log.d("Magisk", "ReposFragment, got delegate");
@@ -137,10 +137,10 @@ public class ReposFragment extends Fragment {
break;
case DialogInterface.BUTTON_NEGATIVE:
ignoreAlertUpdate = true;
SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean("ignoreUpdateAlerts", ignoreAlertUpdate);
editor.apply();
// ignoreAlertUpdate = true;
// SharedPreferences.Editor editor = prefs.edit();
// editor.putBoolean("ignoreUpdateAlerts", ignoreAlertUpdate);
// editor.apply();
break;
}
};
@@ -170,7 +170,7 @@ public class ReposFragment extends Fragment {
}
private void UpdateUI() {
Log.d("Magisk", "ReposFragment: UpdateUI Called, size is " + listRepos().size());
Log.d("Magisk","ReposFragment: UpdateUI Called, size is " + listRepos().size());
if (listRepos().size() == 0) {
emptyTv.setVisibility(View.VISIBLE);
@@ -189,4 +189,9 @@ public class ReposFragment extends Fragment {
}
}