moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity

unify naming of api package and process

Browse Source
This commit is contained in:
Dominik Schürmann 2013-09-13 10:05:43 +02:00
parent 86c84ddbb3
commit ca8f8e3ff7
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenPGP-Keychain/AndroidManifest.xml
View File

@ -383,29 +383,29 @@
<!-- OpenPGP Remote Service API internal --> <!-- OpenPGP Remote Service API internal -->
<activity <activity
android:name="org.sufficientlysecure.keychain.remote_api.OpenPgpServiceActivity" android:name="org.sufficientlysecure.keychain.openpgp_api.OpenPgpServiceActivity"
android:exported="false" android:exported="false"
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:process=":crypto" android:process=":openpgp_api"
android:taskAffinity=":crypto" /> android:taskAffinity=":openpgp_api" />
<activity <activity
android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity" android:name="org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:exported="false" android:exported="false"
android:label="@string/title_api_registered_apps" /> android:label="@string/title_api_registered_apps" />
<activity <activity
android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsActivity" android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:exported="false" /> android:exported="false" />
<!-- OpenPGP Remote Service API --> <!-- OpenPGP Remote Service API -->
<service <service
android:name="org.sufficientlysecure.keychain.remote_api.OpenPgpService" android:name="org.sufficientlysecure.keychain.openpgp_api.OpenPgpService"
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
android:process=":crypto" > android:process=":openpgp_api" >
<intent-filter> <intent-filter>
<action android:name="org.openintents.crypto.ICryptoService" /> <action android:name="org.openintents.crypto.ICryptoService" />
</intent-filter> </intent-filter>

2
OpenPGP-Keychain/res/layout/api_app_register_activity.xml
View File

@ -16,7 +16,7 @@
<fragment <fragment
android:id="@+id/api_app_settings_fragment" android:id="@+id/api_app_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment" android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:layout="@layout/api_app_settings_fragment" /> tools:layout="@layout/api_app_settings_fragment" />

2
OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
View File

@ -8,7 +8,7 @@
<fragment <fragment
android:id="@+id/api_app_settings_fragment" android:id="@+id/api_app_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment" android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:layout="@layout/api_app_settings_fragment" /> tools:layout="@layout/api_app_settings_fragment" />

2
OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
View File

@ -5,7 +5,7 @@
<fragment <fragment
android:id="@+id/crypto_consumers_list_fragment" android:id="@+id/crypto_consumers_list_fragment"
android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListFragment" android:name="org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettings.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettings.java
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.remote_api; package org.sufficientlysecure.keychain.openpgp_api;
import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.bcpg.HashAlgorithmTags;
import org.spongycastle.openpgp.PGPEncryptedData; import org.spongycastle.openpgp.PGPEncryptedData;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettingsActivity.java
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.remote_api; package org.sufficientlysecure.keychain.openpgp_api;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettingsFragment.java
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.remote_api; package org.sufficientlysecure.keychain.openpgp_api;
import java.util.HashMap; import java.util.HashMap;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpService.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpService.java
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.remote_api; package org.sufficientlysecure.keychain.openpgp_api;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpServiceActivity.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpServiceActivity.java
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.remote_api; package org.sufficientlysecure.keychain.openpgp_api;
import java.util.ArrayList; import java.util.ArrayList;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsAdapter.java
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.remote_api; package org.sufficientlysecure.keychain.openpgp_api;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps; import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsListActivity.java
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.remote_api; package org.sufficientlysecure.keychain.openpgp_api;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.MainActivity; import org.sufficientlysecure.keychain.ui.MainActivity;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsListFragment.java
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.remote_api; package org.sufficientlysecure.keychain.openpgp_api;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@ -32,12 +32,12 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.helper.PgpConversionHelper; import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
import org.sufficientlysecure.keychain.helper.PgpHelper; import org.sufficientlysecure.keychain.helper.PgpHelper;
import org.sufficientlysecure.keychain.helper.PgpMain; import org.sufficientlysecure.keychain.helper.PgpMain;
import org.sufficientlysecure.keychain.openpgp_api.AppSettings;
import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps; import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainContract.Keys; import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds; import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables; import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
import org.sufficientlysecure.keychain.remote_api.AppSettings;
import org.sufficientlysecure.keychain.util.IterableIterator; import org.sufficientlysecure.keychain.util.IterableIterator;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
View File

@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.ui;
import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.Id;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity; import org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListActivity;
import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockActivity; import com.actionbarsherlock.app.SherlockActivity;