do not show crash report setting if not available.

refactor-toolbar
Floens 8 years ago
parent f022269b6f
commit 94f3cbee96
  1. 9
      Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java
  2. 14
      Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
  3. 2
      Clover/app/src/release/java/org/floens/chan/ChanApplication.java

@ -21,6 +21,7 @@ import android.content.SharedPreferences;
import android.os.Environment;
import android.text.TextUtils;
import org.floens.chan.BuildConfig;
import org.floens.chan.R;
import org.floens.chan.core.manager.WatchManager;
import org.floens.chan.core.update.UpdateManager;
@ -253,6 +254,14 @@ public class ChanSettings {
// counter_reply_open
}
public static boolean isCrashReportingAvailable() {
return !BuildConfig.CRASH_REPORT_ENDPOINT.isEmpty();
}
public static boolean isCrashReportingEnabled() {
return isCrashReportingAvailable() && crashReporting.get();
}
public static ThemeColor getThemeAndColor() {
String themeRaw = ChanSettings.theme.get();

@ -164,10 +164,7 @@ public class MainSettingsController extends SettingsController implements Settin
setupUpdateSetting(about);
crashReportSetting = about.add(new BooleanSettingView(this,
ChanSettings.crashReporting,
R.string.settings_crash_reporting,
R.string.settings_crash_reporting_description));
setupCrashReportingSetting(about);
setupExtraAboutSettings(about, version);
@ -274,4 +271,13 @@ public class MainSettingsController extends SettingsController implements Settin
v -> ((StartActivity) context).getVersionHandler().manualUpdateCheck()));
}
}
private void setupCrashReportingSetting(SettingsGroup about) {
if (ChanSettings.isCrashReportingAvailable()) {
crashReportSetting = about.add(new BooleanSettingView(this,
ChanSettings.crashReporting,
R.string.settings_crash_reporting,
R.string.settings_crash_reporting_description));
}
}
}

@ -116,6 +116,6 @@ public class ChanApplication extends Chan {
}
private boolean enableAcra() {
return !BuildConfig.CRASH_REPORT_ENDPOINT.isEmpty() && ChanSettings.crashReporting.get();
return ChanSettings.isCrashReportingEnabled();
}
}

Loading…
Cancel
Save