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

Merge branch 'lint-fixes' into 'master'

Browse Source 
lint fixes

This fixes a few lint warnings and promotes them to errors so that CI builds catch them in the future.

See merge request !404
This commit is contained in:
Daniel Martí 2016-10-11 06:35:41 +00:00
commit 43f380b6b6
5 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -202,6 +202,8 @@ android {
// to make CI fail on errors until this is fixed https://github.com/rtyley/spongycastle/issues/7
warning 'InvalidPackage'
error 'AppCompatMethod', 'NestedScrolling', 'StringFormatCount', 'UnsafeProtectedBroadcastReceiver'
}
packagingOptions {

4
app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java
View File

@ -331,7 +331,7 @@ public class SwapService extends Service {
// ==========================================
private void persistAppsToSwap() {
persistence().edit().putString(KEY_APPS_TO_SWAP, serializePackages(appsToSwap)).commit();
persistence().edit().putString(KEY_APPS_TO_SWAP, serializePackages(appsToSwap)).apply();
}
/**
@ -398,7 +398,7 @@ public class SwapService extends Service {
persistence().edit()
.putBoolean(KEY_BLUETOOTH_ENABLED, bluetoothSwap.isConnected())
.putBoolean(KEY_WIFI_ENABLED, wifiSwap.isConnected())
.commit();
.apply();
}
};

8
app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
View File

@ -23,12 +23,18 @@ import android.content.Context;
import android.content.Intent;
import org.fdroid.fdroid.UpdateService;
import org.fdroid.fdroid.Utils;
public class StartupReceiver extends BroadcastReceiver {
private static final String TAG = "StartupReceiver";
@Override
public void onReceive(Context ctx, Intent intent) {
UpdateService.schedule(ctx);
if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
UpdateService.schedule(ctx);
} else {
Utils.debugLog(TAG, "received unsupported Intent " + intent);
}
}
}

11
app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
View File

@ -4,14 +4,21 @@ import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiManager;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.net.WifiStateChangeService;
public class WifiStateChangeReceiver extends BroadcastReceiver {
private static final String TAG = "WifiStateChangeReceiver";
@Override
public void onReceive(Context context, Intent intent) {
intent.setComponent(new ComponentName(context, WifiStateChangeService.class));
context.startService(intent);
if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(intent.getAction())) {
intent.setComponent(new ComponentName(context, WifiStateChangeService.class));
context.startService(intent);
} else {
Utils.debugLog(TAG, "received unsupported Intent: " + intent);
}
}
}

4
app/src/main/res/values-nb/strings.xml
View File

@ -56,7 +56,7 @@
<string name="repo_exists_add_fingerprint">Dette registret er allerede satt opp, dette vil legge til ny informasjon om nøkler.</string>
<string name="repo_exists_enable">Dette registret er allerede satt opp, bekreft at du vil skru det på igjen.</string>
<string name="repo_exists_and_enabled">Oppstrøms-pakkebrønnen er allerede satt opp og påskrudd.</string>
<string name="repo_delete_to_overwrite">Du må først slette denne pakkebrønnen før du kan legge til en med en en annen nøkkel.</string>
<string name="repo_delete_to_overwrite">Du må først slette denne pakkebrønnen før du kan legge til en med en annen nøkkel.</string>
<string name="malformed_repo_uri">Ignorerer ugyldig pakkebrønnsadresse: %s</string>
<string name="menu_update_repo">Oppdater pakkebrønnene</string>
<string name="menu_manage">Pakkebrønner</string>
@ -341,7 +341,7 @@
<string name="keep_forever">For alltid</string>
<string name="install_error_notify_title">Feil ved installasjon av %s</string>
<string name="uninstall_error_notify_title">Feil ved avinstallering</string>
<string name="uninstall_error_notify_title">Feil ved avinstallering av %s</string>
<string name="installing">Installerer…</string>