cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing license headers, cleanup

Browse Source
This commit is contained in:
Dominik Schürmann
2016-12-05 12:55:16 +01:00
parent f8f7fb7d14
commit 7fa2c97cdc
46 changed files with 309 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/KeychainExternalProvider.java
View File

@@ -17,7 +17,6 @@
package org.sufficientlysecure.keychain.remote;
import java.security.AccessControlException;
import java.util.Arrays;
import java.util.HashMap;
@@ -49,7 +48,6 @@ import org.sufficientlysecure.keychain.provider.KeychainExternalContract.EmailSt
import org.sufficientlysecure.keychain.provider.SimpleContentResolverInterface;
import org.sufficientlysecure.keychain.util.Log;
public class KeychainExternalProvider extends ContentProvider implements SimpleContentResolverInterface {
private static final int EMAIL_STATUS = 101;
private static final int API_APPS = 301;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectPublicKeyFragment.java
View File

@@ -48,7 +48,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
import org.sufficientlysecure.keychain.remote.ui.adapter.SelectEncryptKeyAdapter;
import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
import org.sufficientlysecure.keychain.ui.util.recyclerview.RecyclerFragment;
import org.sufficientlysecure.keychain.ui.base.RecyclerFragment;
public class SelectPublicKeyFragment extends RecyclerFragment<SelectEncryptKeyAdapter>
implements TextWatcher, LoaderManager.LoaderCallbacks<Cursor> {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdListFragment.java
View File

@@ -39,7 +39,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.remote.ui.adapter.SelectSignKeyAdapter;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity;
import org.sufficientlysecure.keychain.ui.util.adapter.CursorAdapter;
import org.sufficientlysecure.keychain.ui.util.recyclerview.RecyclerFragment;
import org.sufficientlysecure.keychain.ui.base.RecyclerFragment;
import org.sufficientlysecure.keychain.util.Log;
public class SelectSignKeyIdListFragment extends RecyclerFragment<SelectSignKeyAdapter>

49
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectEncryptKeyAdapter.java
View File

@@ -1,3 +1,21 @@
/*
* Copyright (C) 2016 Tobias Erthal
* Copyright (C) 2014-2016 Dominik Schürmann <dominik@dominikschuermann.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote.ui.adapter;
import android.content.Context;
@@ -40,7 +58,7 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
}
private void select(int position) {
if(!isSelected(position)) {
if (!isSelected(position)) {
mSelected.add(position);
notifyItemChanged(position);
}
@@ -48,7 +66,7 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
private void switchSelected(int position) {
int index = mSelected.indexOf(position);
if(index < 0) {
if (index < 0) {
mSelected.add(position);
} else {
mSelected.remove(index);
@@ -59,9 +77,9 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
public long[] getMasterKeyIds() {
long[] selected = new long[mSelected.size()];
for(int i = 0; i < selected.length; i++) {
for (int i = 0; i < selected.length; i++) {
int position = mSelected.get(i);
if(!moveCursor(position)) {
if (!moveCursor(position)) {
return selected;
}
@@ -72,22 +90,23 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
}
public void preselectMasterKeyIds(long[] keyIds) {
if(keyIds != null) {
if (keyIds != null) {
int count = 0;
for(int i = 0; i < getItemCount(); i++) {
if(!moveCursor(i)) {
for (int i = 0; i < getItemCount(); i++) {
if (!moveCursor(i)) {
continue;
}
long id = getCursor().getKeyId();
for(int l = 0; l < keyIds.length; l++) {
if(id == keyIds[l]) {
select(i); count ++;
for (long keyId : keyIds) {
if (id == keyId) {
select(i);
count++;
break;
}
}
if(count >= keyIds.length) {
if (count >= keyIds.length) {
return;
}
}
@@ -96,9 +115,9 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
public String[] getRawUserIds() {
String[] selected = new String[mSelected.size()];
for(int i = 0; i < selected.length; i++) {
for (int i = 0; i < selected.length; i++) {
int position = mSelected.get(i);
if(!moveCursor(position)) {
if (!moveCursor(position)) {
return selected;
}
@@ -110,9 +129,9 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
public OpenPgpUtils.UserId[] getUserIds() {
OpenPgpUtils.UserId[] selected = new OpenPgpUtils.UserId[mSelected.size()];
for(int i = 0; i < selected.length; i++) {
for (int i = 0; i < selected.length; i++) {
int position = mSelected.get(i);
if(!moveCursor(position)) {
if (!moveCursor(position)) {
return selected;
}

27
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectSignKeyAdapter.java
View File

@@ -1,3 +1,21 @@
/*
* Copyright (C) 2016 Tobias Erthal
* Copyright (C) 2014-2016 Dominik Schürmann <dominik@dominikschuermann.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote.ui.adapter;
import android.content.Context;
@@ -40,7 +58,7 @@ public class SelectSignKeyAdapter extends KeyCursorAdapter<CursorAdapter.KeyCurs
@Override
public long getItemId(int pos) {
if(pos < super.getItemCount()) {
if (pos < super.getItemCount()) {
return super.getItemId(pos);
} else {
return RecyclerView.NO_ID;
@@ -72,18 +90,18 @@ public class SelectSignKeyAdapter extends KeyCursorAdapter<CursorAdapter.KeyCurs
@Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
if(holder.getItemViewType() == VIEW_TYPE_KEY) {
if (holder.getItemViewType() == VIEW_TYPE_KEY) {
super.onBindViewHolder(holder, position);
}
}
@Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, KeyCursor cursor, String query) {
((SignKeyItemHolder)holder).bind(cursor, query);
((SignKeyItemHolder) holder).bind(cursor, query);
}
private class DummyViewHolder extends RecyclerView.ViewHolder
implements View.OnClickListener{
implements View.OnClickListener {
public DummyViewHolder(View itemView) {
super(itemView);
@@ -200,6 +218,7 @@ public class SelectSignKeyAdapter extends KeyCursorAdapter<CursorAdapter.KeyCurs
public interface SelectSignKeyListener {
void onCreateKeyDummyClicked();
void onSelectKeyItemClicked(long masterKeyId);
}
}