Less intrusive asking for help

This commit is contained in:
M66B
2019-05-11 17:02:11 +02:00
parent d159989066
commit 8fbbb64684
4 changed files with 68 additions and 50 deletions

View File

@@ -47,8 +47,6 @@ import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.Toast;
@@ -69,7 +67,6 @@ import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bugsnag.android.Bugsnag;
import com.google.android.material.snackbar.Snackbar;
import org.json.JSONArray;
@@ -415,7 +412,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new Handler().post(checkIntent);
checkFirst();
checkBugsnag();
checkCrash();
pgpService = new OpenPgpServiceConnection(this, "org.sufficientlysecure.keychain");
@@ -674,52 +670,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
}
private void checkBugsnag() {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
if (prefs.getBoolean("first", true) ||
prefs.getBoolean("crash_reports", false) ||
prefs.getBoolean("crash_reports_confirmed", false))
return;
final View dview = LayoutInflater.from(this).inflate(R.layout.dialog_error_reporting, null);
final Button btnInfo = dview.findViewById(R.id.btnInfo);
final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
final Intent info = new Intent(Intent.ACTION_VIEW);
info.setData(Uri.parse(Helper.FAQ_URI + "#user-content-faq104"));
info.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
btnInfo.setVisibility(
info.resolveActivity(getPackageManager()) == null ? View.GONE : View.VISIBLE);
btnInfo.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(info);
}
});
new DialogBuilderLifecycle(this, this)
.setView(dview)
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
prefs.edit().putBoolean("crash_reports", true).apply();
if (cbNotAgain.isChecked())
prefs.edit().putBoolean("crash_reports_confirmed", true).apply();
Bugsnag.startSession();
}
})
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (cbNotAgain.isChecked())
prefs.edit().putBoolean("crash_reports_confirmed", true).apply();
}
})
.show();
}
private void checkCrash() {
new SimpleTask<Long>() {
@Override