Skip to content

Commit

Permalink
Resolved master conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@nattyco
nattyco committed Oct 13, 2016
1 parent 385da35 commit 73091eb
Show file tree
Hide file tree
Showing 7 changed files with 126 additions and 78 deletions.
8 changes: 4 additions & 4 deletions ...t-ccp-android-reference-wallet-bitcoin-wallet-bitdubai/src/main/res/values-es/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,13 @@
<string name="wallet_type">Esta cartera permite dos tipos diferentes de usuarios:</string>
<string name="btc_loss">Ingresa la cantidad de BTC que quieres enviar a Loss Protected Wallet</string>
<string name="phone_notifications">Notificaciones de telefono</string>
<string name="middle_name_text" translatable="false">Segundo nombre</string>
<string name="title_activity_account_detail" translatable="false">Detalles de cuenta</string>
<string name="title_activity_accounts" translatable="false">Cuentas</string>
<string name="middle_name_text">Segundo nombre</string>
<string name="title_activity_account_detail">Detalles de cuenta</string>
<string name="title_activity_accounts">Cuentas</string>
<string name="title_activity_activity_main">Principal</string>
<string name="title_activity_balance_available">Balance disponible</string>
<string name="title_activity_contacts">Contactos</string>
<string name="title_activity_daily_discounts" translatable="false">Descuentos diarios</string>
<string name="title_activity_daily_discounts" >Descuentos diarios</string>
<string name="title_activity_edit_personal_profile">Editar perfil personal</string>
<string name="title_activity_main">Cartera Joven</string>
<string name="title_activity_monthly_discounts">Descuentos mensuales</string>
Expand Down
6 changes: 5 additions & 1 deletion ...rc/main/java/com/bitdubai/sub_app/intra_user_community/common/utils/FragmentsCommons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
* @author Modified byJose Manuel De Sousa 08/12/2015
*/
public class FragmentsCommons {

public static final String CONNECTION_RESULT = "connection_result";
public static final int SEARCH_FILTER_OPTION_MENU_ID = 1;
public static final int LOCATION_FILTER_OPTION_MENU_ID = 2;
public static final int HELP_OPTION_MENU_ID = 3;
public static final int CBC_BACKGROUND_TAB_ID = 4;

public static View setUpHeaderScreen(LayoutInflater inflater, Context activity, ReferenceAppFermatSession<IntraUserModuleManager> intraUserSubAppSession,final FermatApplicationCaller applicationsHelper) throws CantGetActiveLoginIdentityException {
/**
Expand Down
15 changes: 11 additions & 4 deletions ...ain/java/com/bitdubai/sub_app/intra_user_community/fragments/ConnectionsListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.bitdubai.fermat_ccp_api.layer.module.intra_user.interfaces.IntraUserInformation;
import com.bitdubai.fermat_ccp_api.layer.module.intra_user.interfaces.IntraUserModuleManager;
import com.bitdubai.fermat_api.layer.all_definition.common.system.interfaces.ErrorManager;
import com.bitdubai.fermat_ccp_api.layer.wallet_module.loss_protected_wallet.interfaces.LossProtectedWallet;
import com.bitdubai.sub_app.intra_user_community.R;
import com.bitdubai.sub_app.intra_user_community.adapters.AppFriendsListAdapter;

Expand Down Expand Up @@ -59,6 +58,7 @@ public class ConnectionsListFragment extends AbstractFermatFragment<ReferenceApp
private IntraUserModuleManager moduleManager;
private ErrorManager errorManager;
private List<IntraUserInformation> lstIntraUserInformations;
private FermatWorker worker;

public static ConnectionsListFragment newInstance() {
return new ConnectionsListFragment();
Expand Down Expand Up @@ -115,7 +115,7 @@ public void onRefresh() {
connectionsProgressDialog.setMessage("Loading Connections");
connectionsProgressDialog.setCancelable(false);
connectionsProgressDialog.show();
FermatWorker worker = new FermatWorker() {
worker = new FermatWorker() {
@Override
protected Object doInBackground() throws Exception {
return getMoreData();
Expand All @@ -141,8 +141,8 @@ public void onPostExecute(Object... result) {
showEmpty(false, emptyView);
}
}
} else
showEmpty(adapter.getSize() < 0, emptyView);
}
// showEmpty(adapter.getSize() < 0, emptyView);
}

@Override
Expand Down Expand Up @@ -204,4 +204,11 @@ public void onItemClickListener(IntraUserInformation data, int position) {
public void onLongItemClickListener(IntraUserInformation data, int position) {

}

@Override
public void onStop() {
if(worker != null)
worker.shutdownNow();
super.onStop();
}
}
46 changes: 23 additions & 23 deletions ...a/com/bitdubai/sub_app/intra_user_identity/fragments/CreateIntraUserIdentityFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,31 +394,31 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (checkCameraPermission()) {
if (checkWriteExternalPermission()) {
if (imageBitmap != null) {
// if (imageBitmap.getWidth() >= 192 && imageBitmap.getHeight() >= 192) {
final DialogCropImage dialogCropImage = new DialogCropImage(getActivity(), appSession, null, imageBitmap);
dialogCropImage.show();
dialogCropImage.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
if (dialogCropImage.getCroppedImage() != null) {
imageBitmap = getResizedBitmap(rotateBitmap(dialogCropImage.getCroppedImage(), ExifInterface.ORIENTATION_NORMAL), dpToPx(), dpToPx());
mBrokerImage.setImageDrawable(ImagesUtils.getRoundedBitmap(getResources(), imageBitmap));
brokerImageByteArray = toByteArray(imageBitmap);
updateProfileImage = true;

BitmapWorkerTask bitmapWorkerTask = new BitmapWorkerTask(mphoto_header,getResources(),false);
bitmapWorkerTask.execute(brokerImageByteArray );
mphoto_header.setAlpha(150);

} else {
imageBitmap = null;
}
// if (imageBitmap.getWidth() >= 192 && imageBitmap.getHeight() >= 192) {
final DialogCropImage dialogCropImage = new DialogCropImage(getActivity(), appSession, null, imageBitmap);
dialogCropImage.show();
dialogCropImage.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
if (dialogCropImage.getCroppedImage() != null) {
imageBitmap = getResizedBitmap(rotateBitmap(dialogCropImage.getCroppedImage(), ExifInterface.ORIENTATION_NORMAL), dpToPx(), dpToPx());
mBrokerImage.setImageDrawable(ImagesUtils.getRoundedBitmap(getResources(), imageBitmap));
brokerImageByteArray = toByteArray(imageBitmap);
updateProfileImage = true;

BitmapWorkerTask bitmapWorkerTask = new BitmapWorkerTask(mphoto_header,getResources(),false);
bitmapWorkerTask.execute(brokerImageByteArray );
mphoto_header.setAlpha(150);

} else {
imageBitmap = null;
}
});
}
});
//} else {
// Toast.makeText(getActivity(), "The image selected is too small. Please select a photo with height and width of at least 192x192", Toast.LENGTH_LONG).show();
//cryptoBrokerBitmap = null;
// Toast.makeText(getActivity(), "", Toast.LENGTH_SHORT).show();
// Toast.makeText(getActivity(), "The image selected is too small. Please select a photo with height and width of at least 192x192", Toast.LENGTH_LONG).show();
//cryptoBrokerBitmap = null;
// Toast.makeText(getActivity(), "", Toast.LENGTH_SHORT).show();
//}
} else {
Toast.makeText(getActivity(), getResources().getString(R.string.upload_image_error), Toast.LENGTH_LONG).show();
Expand Down
4 changes: 2 additions & 2 deletions ...going_extra_user/developer/bitdubai/version_1/OutgoingExtraUserTransactionPluginRoot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class OutgoingExtraUserTransactionPluginRoot extends AbstractPlugin imple
@NeededPluginReference(platform = Platforms.BLOCKCHAINS , layer = Layers.CRYPTO_NETWORK , plugin = Plugins.BITCOIN_NETWORK )
private BlockchainManager bitcoinNetworkManager;

//@NeededPluginReference(platform = Platforms.BLOCKCHAINS , layer = Layers.CRYPTO_NETWORK , plugin = Plugins.FERMAT_NETWORK )
//@NeededPluginReference(platform = Platforms.BLOCKCHAINS , layer = Layers.CRYPTO_NETWORK , plugin = Plugins.FERMAT_NETWORK )
private BlockchainManager fermatNetworkManager;


Expand Down Expand Up @@ -104,7 +104,7 @@ public void start() throws CantStartPluginException {
this.transactionProcessorAgent = new OutgoingExtraUserTransactionProcessorAgent(
cryptoWalletManager,
cryptoVaultManager ,
cryptoFermatVaultManager,
cryptoFermatVaultManager,
bitcoinNetworkManager,
fermatNetworkManager,
getErrorManager() ,
Expand Down
Loading

0 comments on commit 73091eb

Please sign in to comment.