qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove Xamarin Insights

Browse Source
This commit is contained in:
Philipp Crocoll
2017-09-18 11:25:17 +02:00
parent 1c9fab9c9c
commit c2a6fd1dfc
7 changed files with 1 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/KeePassLib2Android/KeePassLib2Android.csproj
View File

@@ -55,9 +55,6 @@
<Reference Include="Mono.Android" />
<Reference Include="OpenTK-1.0" />
<Reference Include="Mono.Security" />
<Reference Include="Xamarin.Insights">
<HintPath>..\packages\Xamarin.Insights.1.11.3\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Collections\ProtectedBinarySet.cs" />

37
src/keepass2android/KeePass.cs
View File

@@ -185,47 +185,10 @@ namespace keepass2android
}
else
{
#if !NoNet
var pref = PreferenceManager.GetDefaultSharedPreferences(this);
if ((pref.GetBoolean(App.PrefHaspendingerrorreport, false)
&& (App.GetErrorReportMode(this) == App.ErrorReportMode.AskAgain))
)
{
ShowErrorReportQuestion(LaunchNextActivity);
}
else
LaunchNextActivity();
#else
LaunchNextActivity();
#endif
}
}
#if !NoNet
private void ShowErrorReportQuestion(Action launchNextActivity)
{
AlertDialog.Builder b = new AlertDialog.Builder(this);
b.SetTitle(Resource.String.ErrorReportTitle);
b.SetMessage(GetString(Resource.String.ErrorReportText) + " " + GetString(Resource.String.ErrorReportPromise));
b.SetPositiveButton(Resource.String.ErrorReportEnable, (sender, args) =>
{
App.SetErrorReportMode(this, App.ErrorReportMode.Enabled);
launchNextActivity();
});
b.SetNegativeButton(Resource.String.ErrorReportDisable, (sender, args) =>
{
App.SetErrorReportMode(this, App.ErrorReportMode.Disabled);
launchNextActivity();
});
var dialog = b.Create();
dialog.SetOnDismissListener(this);
dialog.Show();
}
#endif
private static String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib";
private static String LIB_DALVIK = "libdvm.so";
private static String LIB_ART = "libart.so";

4
src/keepass2android/Resources/xml/preferences.xml
View File

@@ -511,10 +511,6 @@
android:key="@string/TrayTotp_SettingsField_key" />
</PreferenceScreen>
<ListPreference
android:key="pref_ErrorReportMode"
android:title="@string/ErrorReportPrefTitle"
android:summary="@string/ErrorReportPromise"/>
</PreferenceScreen>

69
src/keepass2android/app/App.cs
View File

@@ -843,8 +843,6 @@ namespace keepass2android
#endif
#endif
public class App : Application {
public const string PrefErrorreportmode = "pref_ErrorReportMode";
public const string PrefHaspendingerrorreport = "pref_hasPendingErrorReport";
public App (IntPtr javaReference, JniHandleOwnership transfer)
: base(javaReference, transfer)
@@ -852,13 +850,6 @@ namespace keepass2android
}
public static readonly Kp2aApp Kp2a = new Kp2aApp();
public enum ErrorReportMode
{
AskAgain=0,
Disabled=1,
Enabled=2
}
public override void OnCreate() {
base.OnCreate();
@@ -867,33 +858,6 @@ namespace keepass2android
Kp2a.OnCreate(this);
AndroidEnvironment.UnhandledExceptionRaiser += MyApp_UnhandledExceptionHandler;
#if !NoNet
Kp2aLog.OnUnexpectedError += (sender, exception) =>
{
var currentErrorReportMode = GetErrorReportMode(ApplicationContext);
if (currentErrorReportMode != ErrorReportMode.Disabled)
{
Xamarin.Insights.Report(exception);
if (Xamarin.Insights.DisableDataTransmission)
{
PreferenceManager.GetDefaultSharedPreferences(ApplicationContext)
.Edit().PutBoolean(PrefHaspendingerrorreport, true).Commit();
}
}
};
Xamarin.Insights.Initialize("fed2b273ed2a964d0ba6acc3743e68f7a04da957", ApplicationContext);
Xamarin.Insights.DisableExceptionCatching = true;
var errorReportMode = GetErrorReportMode(ApplicationContext);
SetErrorReportMode(ApplicationContext, errorReportMode);
#endif
}
public static ErrorReportMode GetErrorReportMode(Context ctx)
{
ErrorReportMode errorReportMode;
Enum.TryParse(PreferenceManager.GetDefaultSharedPreferences(ctx)
.GetString(PrefErrorreportmode, ErrorReportMode.AskAgain.ToString()), out errorReportMode);
return errorReportMode;
}
@@ -905,42 +869,11 @@ namespace keepass2android
Kp2a.OnTerminate();
}
#if !NoNet
void MyApp_UnhandledExceptionHandler(object sender, RaiseThrowableEventArgs e)
{
Kp2aLog.LogUnexpectedError(e.Exception);
Xamarin.Insights.Save();
// Do your error handling here.
//throw e.Exception;
}
protected override void Dispose(bool disposing)
{
AndroidEnvironment.UnhandledExceptionRaiser -= MyApp_UnhandledExceptionHandler;
base.Dispose(disposing);
}
public static void SetErrorReportMode(Context ctx, ErrorReportMode mode)
{
Xamarin.Insights.DisableCollection = (mode == ErrorReportMode.Disabled);
Xamarin.Insights.DisableDataTransmission = mode != ErrorReportMode.Enabled;
var pref = PreferenceManager.GetDefaultSharedPreferences(ctx);
var edit = pref.Edit();
if (mode != ErrorReportMode.AskAgain)
{
edit.PutBoolean(PrefHaspendingerrorreport, false);
}
edit.PutString(PrefErrorreportmode, mode.ToString());
edit.Commit();
}
#else
private void MyApp_UnhandledExceptionHandler(object sender, RaiseThrowableEventArgs e)
{
Kp2aLog.LogUnexpectedError(e.Exception);
}
#endif
}
}

3
src/keepass2android/keepass2android.csproj
View File

@@ -125,9 +125,6 @@
<HintPath>..\packages\Xamarin.GooglePlayServices.Drive.27.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Drive.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Insights">
<HintPath>..\packages\Xamarin.Insights.1.11.3\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ActivateAutoFillActivity.cs" />

1
src/keepass2android/packages.config
View File

@@ -10,5 +10,4 @@
<package id="Xamarin.GooglePlayServices.Base" version="27.0.0.0" targetFramework="MonoAndroid50" />
<package id="Xamarin.GooglePlayServices.Basement" version="27.0.0.0" targetFramework="MonoAndroid50" />
<package id="Xamarin.GooglePlayServices.Drive" version="27.0.0.0" targetFramework="MonoAndroid50" />
<package id="Xamarin.Insights" version="1.11.3" targetFramework="MonoAndroid60" />
</packages>

45
src/keepass2android/settings/DatabaseSettingsActivity.cs
View File

@@ -444,23 +444,6 @@ namespace keepass2android
Preference cachingPreference = FindPreference(GetString(Resource.String.UseOfflineCache_key));
cachingPreference.PreferenceChange += OnUseOfflineCacheChanged;
try
{
var errorReportModePref = (ListPreference)FindPreference(App.PrefErrorreportmode);
#if NoNet
((PreferenceScreen)FindPreference(GetString(Resource.String.app_key))).RemovePreference(errorReportModePref);
#else
SetupErrorReportModePref(errorReportModePref);
#endif
}
catch (Exception ex)
{
Kp2aLog.LogUnexpectedError(ex);
}
}
@@ -567,34 +550,6 @@ namespace keepass2android
}
#if !NoNet
private void SetupErrorReportModePref(ListPreference errorReportModePref)
{
errorReportModePref.SetEntries(new string[]
{
GetString(Resource.String.ErrorReportEnable),
GetString(Resource.String.ErrorReportAsk),
GetString(Resource.String.ErrorReportDisable)
});
var entryValues = new string[]
{
App.ErrorReportMode.Enabled.ToString(),
App.ErrorReportMode.AskAgain.ToString(),
App.ErrorReportMode.Disabled.ToString(),
};
errorReportModePref.SetEntryValues(entryValues);
errorReportModePref.SetDefaultValue(App.ErrorReportMode.Disabled.ToString());
string currentValue = PreferenceManager.GetDefaultSharedPreferences(Activity)
.GetString(App.PrefErrorreportmode, App.ErrorReportMode.Disabled.ToString());
errorReportModePref.SetValueIndex(entryValues.Select((v, index) => new {value = v, index}).First(el => el.value == currentValue).index);
errorReportModePref.PreferenceChange += (sender, args) =>
{
App.ErrorReportMode mode;
Enum.TryParse((string) args.NewValue, out mode);
App.SetErrorReportMode(Activity, mode);
};
}
#endif
private void PrepareTemplates(Database db)
{
Preference pref = FindPreference("AddTemplates_pref_key");