Merge pull request #5 from m2049r/features

allow only portrait
This commit is contained in:
m2049r 2017-08-14 10:02:50 +02:00 committed by GitHub
commit 905ee8b8a9
2 changed files with 6 additions and 15 deletions

View File

@ -17,12 +17,16 @@
<activity
android:name=".WalletActivity"
android:configChanges="orientation|keyboardHidden"
android:label="@string/wallet_activity_name"
android:launchMode="singleTop"></activity>
android:launchMode="singleTop"
android:screenOrientation="portrait"></activity>
<activity
android:name=".LoginActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

View File

@ -34,12 +34,6 @@ import com.m2049r.xmrwallet.model.WalletListener;
import com.m2049r.xmrwallet.model.WalletManager;
import com.m2049r.xmrwallet.util.Helper;
// Bind / Unbind
// Activity onCreate() / onDestroy()
// or
// Activity onStart() / onStop()
public class WalletService extends Service {
final static String TAG = "WalletService";
@ -133,16 +127,10 @@ public class WalletService extends Service {
Log.d(TAG, "refreshed() " + wallet.getName() + " " + wallet.getBalance() + " sync=" + wallet.isSynchronized() + " with observer " + observer);
if (updated) {
if (observer != null) {
Log.d(TAG, "refreshed() A");
updateDaemonState(wallet, 0);
Log.d(TAG, "refreshed() B");
TransactionHistory history = wallet.getHistory();
Log.d(TAG, "refreshed() C " + history.getCount());
history.refresh();
Log.d(TAG, "refreshed() D " + history.getCount());
Log.d(TAG, "refreshed() E");
observer.onRefreshed(wallet, true);
Log.d(TAG, "refreshed() D");
updated = false;
}
}
@ -418,4 +406,3 @@ public class WalletService extends Service {
return wallet;
}
}