Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only log installer messages on debug builds

Browse Source 
This is stabilized, so we can tone down the logging.
This commit is contained in:
Hans-Christoph Steiner 2018-03-21 12:07:50 +01:00
parent 35471db83c
commit df65905d19
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/fdroid/fdroid/installer/Installer.java
View File

@ -30,7 +30,6 @@ import android.os.Build;
import android.os.PatternMatcher; import android.os.PatternMatcher;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.ApkProvider;
@ -257,7 +256,7 @@ public abstract class Installer {
try { try {
sanitizedUri = ApkFileProvider.getSafeUri(context, localApkUri, apk); sanitizedUri = ApkFileProvider.getSafeUri(context, localApkUri, apk);
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, e.getMessage(), e); Utils.debugLog(TAG, e.getMessage(), e);
sendBroadcastInstall(downloadUri, Installer.ACTION_INSTALL_INTERRUPTED, e.getMessage()); sendBroadcastInstall(downloadUri, Installer.ACTION_INSTALL_INTERRUPTED, e.getMessage());
return; return;
} }
@ -267,7 +266,7 @@ public abstract class Installer {
ApkVerifier apkVerifier = new ApkVerifier(context, localApkUri, apk); ApkVerifier apkVerifier = new ApkVerifier(context, localApkUri, apk);
apkVerifier.verifyApk(); apkVerifier.verifyApk();
} catch (ApkVerifier.ApkVerificationException e) { } catch (ApkVerifier.ApkVerificationException e) {
Log.e(TAG, e.getMessage(), e); Utils.debugLog(TAG, e.getMessage(), e);
sendBroadcastInstall(downloadUri, Installer.ACTION_INSTALL_INTERRUPTED, e.getMessage()); sendBroadcastInstall(downloadUri, Installer.ACTION_INSTALL_INTERRUPTED, e.getMessage());
return; return;
} catch (ApkVerifier.ApkPermissionUnequalException e) { } catch (ApkVerifier.ApkPermissionUnequalException e) {
@ -275,8 +274,8 @@ public abstract class Installer {
// and an unattended installer is used, a wrong permission screen // and an unattended installer is used, a wrong permission screen
// has been shown, thus fallback to AOSP DefaultInstaller! // has been shown, thus fallback to AOSP DefaultInstaller!
if (isUnattended()) { if (isUnattended()) {
Log.e(TAG, e.getMessage(), e); Utils.debugLog(TAG, e.getMessage(), e);
Log.e(TAG, "Falling back to AOSP DefaultInstaller!"); Utils.debugLog(TAG, "Falling back to AOSP DefaultInstaller!");
DefaultInstaller defaultInstaller = new DefaultInstaller(context, apk); DefaultInstaller defaultInstaller = new DefaultInstaller(context, apk);
defaultInstaller.installPackageInternal(sanitizedUri, downloadUri); defaultInstaller.installPackageInternal(sanitizedUri, downloadUri);
return; return;