Skip to content

Commit

Permalink
Add user search from steem api, remove unused steemj library (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
bxute authored and singhpratyush committed Jul 5, 2018
1 parent 912391f commit dd73e5a
Show file tree
Hide file tree
Showing 251 changed files with 1,644 additions and 1,645 deletions.
4 changes: 3 additions & 1 deletion .idea/DtonatorPreferences.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
1 change: 0 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ dependencies {
implementation 'com.github.bxute:ProgressDots:v1.0.3'
implementation 'com.github.hapramp:steemconnect4j:v1.211'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':steem')
implementation project(':search')
implementation project(':hapramp-editor')
implementation project(':youtube_player')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
import com.hapramp.utils.HashGenerator;
import com.hapramp.utils.MomentsUtils;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;

/**
* Created by Ankit on 5/15/2017.
*/
Expand Down Expand Up @@ -206,4 +210,16 @@ public void setLastPostCreatedAt(long timeMillis) {
public long getLastPostCreatedAt() {
return preferences.getLong("last_created_at", 0);
}

public void saveCurrentUserFollowings(ArrayList<String> follower) {
Set<String> set = new HashSet<String>();
set.addAll(follower);
editor.putStringSet("followings",set);
editor.apply();
}

public Set<String> getFollowingsSet() {
return preferences.getStringSet("followings",null);
}

}
37 changes: 0 additions & 37 deletions app/src/main/java/com/hapramp/steem/FollowApiObjectWrapper.java

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/java/com/hapramp/steem/SteemCommentCreator.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,8 @@
import com.hapramp.steemconnect4j.SteemConnectCallback;
import com.hapramp.steemconnect4j.SteemConnectException;
import com.hapramp.utils.StringUtils;

import java.util.ArrayList;
import java.util.List;

import eu.bittrade.libs.steemj.SteemJ;
import eu.bittrade.libs.steemj.base.models.AccountName;
import eu.bittrade.libs.steemj.base.models.Permlink;
import eu.bittrade.libs.steemj.base.models.operations.CommentOperation;
import eu.bittrade.libs.steemj.exceptions.SteemCommunicationException;
import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
import eu.bittrade.libs.steemj.exceptions.SteemResponseException;

/**
* Created by Ankit on 4/15/2018.
*/
Expand Down
90 changes: 41 additions & 49 deletions app/src/main/java/com/hapramp/steem/SteemHelper.java
Original file line number Diff line number Diff line change
@@ -1,62 +1,54 @@
package com.hapramp.steem;

import android.util.Log;
import com.hapramp.preferences.HaprampPreferenceManager;
import org.apache.commons.lang3.tuple.ImmutablePair;
import java.util.ArrayList;
import java.util.List;
import eu.bittrade.libs.steemj.SteemJ;
import eu.bittrade.libs.steemj.base.models.AccountName;
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
import eu.bittrade.libs.steemj.enums.PrivateKeyType;
import eu.bittrade.libs.steemj.exceptions.SteemCommunicationException;
import eu.bittrade.libs.steemj.exceptions.SteemResponseException;

/**
* Created by Ankit on 2/18/2018.
*/

public class SteemHelper {
//
// public static SteemJ getSteemInstance(String username,String ppk) {
//
// SteemJ steemJ = null;
// SteemJConfig myConfig = SteemJConfig.getInstance();
// myConfig.setResponseTimeout(100000);
// myConfig.setDefaultAccount(new AccountName(username));
// List<ImmutablePair<PrivateKeyType, String>> privateKeys = new ArrayList<>();
// privateKeys.add(new ImmutablePair<>(PrivateKeyType.POSTING, ppk));
// myConfig.getPrivateKeyStorage().addAccount(myConfig.getDefaultAccount(), privateKeys);
// try {
// steemJ = new SteemJ();
// } catch (SteemCommunicationException e) {
// e.printStackTrace();
// } catch (SteemResponseException e) {
// e.printStackTrace();
// }
// return steemJ;
// }

public static SteemJ getSteemInstance(String username,String ppk) {

SteemJ steemJ = null;
SteemJConfig myConfig = SteemJConfig.getInstance();
myConfig.setResponseTimeout(100000);
myConfig.setDefaultAccount(new AccountName(username));
List<ImmutablePair<PrivateKeyType, String>> privateKeys = new ArrayList<>();
privateKeys.add(new ImmutablePair<>(PrivateKeyType.POSTING, ppk));
myConfig.getPrivateKeyStorage().addAccount(myConfig.getDefaultAccount(), privateKeys);
try {
steemJ = new SteemJ();
} catch (SteemCommunicationException e) {
e.printStackTrace();
} catch (SteemResponseException e) {
e.printStackTrace();
}
return steemJ;
}

public static SteemJ getSteemInstance(){

SteemJ steemJ = null;
String username = HaprampPreferenceManager.getInstance().getCurrentSteemUsername();
String ppk = HaprampPreferenceManager.getInstance().getPPK();
if(ppk.length()==0)
return steemJ;
SteemJConfig myConfig = SteemJConfig.getInstance();
myConfig.setResponseTimeout(100000);
myConfig.setDefaultAccount(new AccountName(username));
List<ImmutablePair<PrivateKeyType, String>> privateKeys = new ArrayList<>();
privateKeys.add(new ImmutablePair<>(PrivateKeyType.POSTING, ppk));
myConfig.getPrivateKeyStorage().addAccount(myConfig.getDefaultAccount(), privateKeys);
try {
steemJ = new SteemJ();
} catch (SteemCommunicationException e) {
e.printStackTrace();
} catch (SteemResponseException e) {
e.printStackTrace();
}
return steemJ;
}
// public static SteemJ getSteemInstance(){
//
// SteemJ steemJ = null;
// String username = HaprampPreferenceManager.getInstance().getCurrentSteemUsername();
// String ppk = HaprampPreferenceManager.getInstance().getPPK();
// if(ppk.length()==0)
// return steemJ;
// SteemJConfig myConfig = SteemJConfig.getInstance();
// myConfig.setResponseTimeout(100000);
// myConfig.setDefaultAccount(new AccountName(username));
// List<ImmutablePair<PrivateKeyType, String>> privateKeys = new ArrayList<>();
// privateKeys.add(new ImmutablePair<>(PrivateKeyType.POSTING, ppk));
// myConfig.getPrivateKeyStorage().addAccount(myConfig.getDefaultAccount(), privateKeys);
// try {
// steemJ = new SteemJ();
// } catch (SteemCommunicationException e) {
// e.printStackTrace();
// } catch (SteemResponseException e) {
// e.printStackTrace();
// }
// return steemJ;
// }
}
17 changes: 0 additions & 17 deletions app/src/main/java/com/hapramp/steem/SteemPostCreator.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,6 @@
import java.util.ArrayList;
import java.util.List;

import eu.bittrade.libs.steemj.SteemJ;
import eu.bittrade.libs.steemj.base.models.AccountName;
import eu.bittrade.libs.steemj.base.models.Asset;
import eu.bittrade.libs.steemj.base.models.BeneficiaryRouteType;
import eu.bittrade.libs.steemj.base.models.CommentOptionsExtension;
import eu.bittrade.libs.steemj.base.models.CommentPayoutBeneficiaries;
import eu.bittrade.libs.steemj.base.models.DynamicGlobalProperty;
import eu.bittrade.libs.steemj.base.models.Permlink;
import eu.bittrade.libs.steemj.base.models.SignedTransaction;
import eu.bittrade.libs.steemj.base.models.operations.CommentOperation;
import eu.bittrade.libs.steemj.base.models.operations.CommentOptionsOperation;
import eu.bittrade.libs.steemj.base.models.operations.Operation;
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
import eu.bittrade.libs.steemj.exceptions.SteemCommunicationException;
import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
import eu.bittrade.libs.steemj.exceptions.SteemResponseException;

/**
* Created by Ankit on 2/21/2018.
*/
Expand Down
72 changes: 32 additions & 40 deletions app/src/main/java/com/hapramp/steem/SteemPowerHelper.java
Original file line number Diff line number Diff line change
@@ -1,56 +1,48 @@
package com.hapramp.steem;

import android.util.Log;

import com.hapramp.preferences.HaprampPreferenceManager;

import eu.bittrade.libs.steemj.SteemJ;
import eu.bittrade.libs.steemj.base.models.DynamicGlobalProperty;
import eu.bittrade.libs.steemj.base.models.ExtendedAccount;
import eu.bittrade.libs.steemj.exceptions.SteemCommunicationException;
import eu.bittrade.libs.steemj.exceptions.SteemResponseException;

public class SteemPowerHelper {

public static void requestSteemUserEarningInfo(final SteemPowerCallback steemPowerCallback) {
new Thread() {
@Override
public void run() {
SteemJ steemJ = SteemHelper.getSteemInstance();
try {
DynamicGlobalProperty dynamicGlobalProperty = steemJ.getDynamicGlobalProperties();
requestVestingShares(steemPowerCallback, dynamicGlobalProperty);
} catch (SteemCommunicationException e) {
e.printStackTrace();
steemPowerCallback.onSteemPowerFetchFailed();
} catch (SteemResponseException e) {
steemPowerCallback.onSteemPowerFetchFailed();
e.printStackTrace();
}
super.run();
// SteemJ steemJ = SteemHelper.getSteemInstance();
// try {
// DynamicGlobalProperty dynamicGlobalProperty = steemJ.getDynamicGlobalProperties();
// requestVestingShares(steemPowerCallback, dynamicGlobalProperty);
// } catch (SteemCommunicationException e) {
// e.printStackTrace();
// steemPowerCallback.onSteemPowerFetchFailed();
// } catch (SteemResponseException e) {
// steemPowerCallback.onSteemPowerFetchFailed();
// e.printStackTrace();
// }
// super.run();
}
}.start();
}

private static void requestVestingShares(SteemPowerCallback steemPowerCallback, DynamicGlobalProperty dynamicGlobalProperty) {
SteemJ steemJ = SteemHelper.getSteemInstance();
try {
ExtendedAccount extendedAccount = steemJ.getUserAccount(HaprampPreferenceManager.getInstance().getCurrentSteemUsername());
steemPowerCallback.onSteemPowerFetched(calculateSteemPower(dynamicGlobalProperty, extendedAccount));
steemPowerCallback.onSteemBalance(extendedAccount.getSbdBalance().getAmount());
} catch (SteemCommunicationException e) {
e.printStackTrace();
} catch (SteemResponseException e) {
e.printStackTrace();
}
}

private static float calculateSteemPower(DynamicGlobalProperty dynamicGlobalProperty, ExtendedAccount extendedAccount) {
float totalVestingShares = dynamicGlobalProperty.getTotalVestingShares().getAmount();
float totalVestingFundSteem = dynamicGlobalProperty.getTotalVestingFundSteem().getAmount();
float userVestingShare = extendedAccount.getVestingShares().getAmount();
return ((totalVestingFundSteem * userVestingShare) / totalVestingShares)/1000;
}
//
// private static void requestVestingShares(SteemPowerCallback steemPowerCallback, DynamicGlobalProperty dynamicGlobalProperty) {
// SteemJ steemJ = SteemHelper.getSteemInstance();
// try {
// ExtendedAccount extendedAccount = steemJ.getUserAccount(HaprampPreferenceManager.getInstance().getCurrentSteemUsername());
// steemPowerCallback.onSteemPowerFetched(calculateSteemPower(dynamicGlobalProperty, extendedAccount));
// steemPowerCallback.onSteemBalance(extendedAccount.getSbdBalance().getAmount());
// } catch (SteemCommunicationException e) {
// e.printStackTrace();
// } catch (SteemResponseException e) {
// e.printStackTrace();
// }
// }
//
// private static float calculateSteemPower(DynamicGlobalProperty dynamicGlobalProperty, ExtendedAccount extendedAccount) {
// float totalVestingShares = dynamicGlobalProperty.getTotalVestingShares().getAmount();
// float totalVestingFundSteem = dynamicGlobalProperty.getTotalVestingFundSteem().getAmount();
// float userVestingShare = extendedAccount.getVestingShares().getAmount();
// return ((totalVestingFundSteem * userVestingShare) / totalVestingShares)/1000;
// }

public interface SteemPowerCallback {
void onSteemPowerFetched(float steemPower);
Expand Down

0 comments on commit dd73e5a

Please sign in to comment.