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

checkstyle: Check comment indentation too

Browse Source
This commit is contained in:
Daniel Martí 2015-12-29 22:10:19 +01:00
parent 9efe173380
commit c1d4248723
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
F-Droid/src/org/fdroid/fdroid/AppDetails.java
View File

@ -1553,10 +1553,10 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
if (activity.downloadHandler != null) {
btMain.setText(R.string.downloading);
btMain.setEnabled(false);
// Check count > 0 due to incompatible apps resulting in an empty list.
// If App isn't installed
} else if (!app.isInstalled() && app.suggestedVercode > 0 &&
activity.adapter.getCount() > 0) {
// Check count > 0 due to incompatible apps resulting in an empty list.
// If App isn't installed
installed = false;
statusView.setText(R.string.details_notinstalled);
NfcHelper.disableAndroidBeam(activity);
@ -1564,8 +1564,8 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
btMain.setText(R.string.menu_install);
btMain.setOnClickListener(mOnClickListener);
btMain.setEnabled(true);
// If App is installed
} else if (app.isInstalled()) {
// If App is installed
installed = true;
statusView.setText(getString(R.string.details_installed, app.installedVersionName));
NfcHelper.setAndroidBeam(activity, app.packageName);
@ -1607,16 +1607,16 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
return;
}
}
// If installed
if (installed) {
// If "launchable", launch
// If installed
if (activity.mPm.getLaunchIntentForPackage(app.packageName) != null) {
// If "launchable", launch
activity.launchApk(app.packageName);
} else {
activity.removeApk(app.packageName);
}
// If not installed, install
} else if (app.suggestedVercode > 0) {
// If not installed, install
btMain.setEnabled(false);
btMain.setText(R.string.system_install_installing);
final Apk apkToInstall = ApkProvider.Helper.find(activity, app.packageName, app.suggestedVercode);

2
F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
View File

@ -165,8 +165,8 @@ public final class LocalRepoKeyStore {
};
} catch (UnrecoverableKeyException | KeyStoreException | NoSuchAlgorithmException | CertificateException | OperatorCreationException | IOException e) {
Log.e(TAG, "Error loading keystore", e);
// TODO: Remove once we have a proper fix for #334
} catch (IllegalArgumentException e) {
// TODO: Remove once we have a proper fix for #334
Log.e(TAG, "Error loading keystore", e);
Log.e(TAG, "See https://gitlab.com/fdroid/fdroidclient/issues/334");
}

1
config/checkstyle/checkstyle.xml
View File

@ -49,6 +49,7 @@
<property name="lineWrappingIndentation" value="8"/>
<property name="arrayInitIndent" value="4"/>
</module>
<module name="CommentsIndentation"/>
<module name="EmptyLineSeparator">
<property name="allowNoEmptyLineBetweenFields" value="true" />
<property name="allowMultipleEmptyLines" value="false" />